diff --git a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
index 3c720a89..a61e32c3 100644
--- a/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/ZR.Admin.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
@@ -18,6 +18,6 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
e5497bb4-b0c1-4794-9fae-163f626ec399
true
win-x64
- production
+ production
\ No newline at end of file
diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index 5b0baab5..558ed367 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -16,6 +16,7 @@
True
False
+
diff --git a/ZR.Admin.WebApi/appsettings.production.development.json b/ZR.Admin.WebApi/appsettings.production.development.json
deleted file mode 100644
index d0519716..00000000
--- a/ZR.Admin.WebApi/appsettings.production.development.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
- "Logging": {
- "LogLevel": {
- "Default": "Information",
- "Microsoft": "Warning",
- "Microsoft.Hosting.Lifetime": "Information"
- }
- },
- "urls": "http://localhost:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改
- "dbConfigs": [
- {
- //"Conn": "Data Source=147.116.122.230;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
- "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;",
- "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3，PgSql = 4
- "ConfigId": "0", //多租户唯一标识
- "IsAutoCloseConnection": true
- }
- //...下面添加更多的数据库源
- ],
- //代码生成数据库配置
- "CodeGenDbConfig": {
- //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
- "Conn": "Data Source=47.116.122.230;User ID=root;Password=123456;Initial Catalog={dbName};",
- "DbType": 0,
- "IsAutoCloseConnection": true,
- "DbName": "ZrAdmin" //代码生成默认连接数据库
- },
-
- "corsUrls": [ "http://localhost:8887", "http://localhost:8886" ], //跨域地址（前端启动项目，前后端分离单独部署需要设置），多个用","隔开
- "JwtSettings": {
- "Issuer": "ZRAdmin.NET", //即token的签发者。
- "Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的（群体范围）
- "SecretKey": "SecretKey-ZRADMIN.NET-20210101",
- "Expire": 1440 //jwt登录过期时间（分）
- },
- "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks" ], //自动注入类
- "ShowDbLog": true,//是否打印db日志
- "InitDb": false, //是否初始化db
- "DemoMode": false, //是否演示模式
- "Upload": {
- "uploadUrl": "http://localhost:8888", //本地存储资源访问路径
- "localSavePath": "", //本地上传默认文件存储目录 wwwroot
- "maxSize": 15, //上传文件大小限制 15M
- "notAllowedExt": [ ".bat", ".exe", ".jar", ".js" ]
- },
- //阿里云存储配置
- "ALIYUN_OSS": {
- "REGIONID": "", //eg：cn-hangzhou
- "KEY": "XX",
- "SECRET": "XX",
- "bucketName": "bucketName",
- "domainUrl": "http://xxx.xxx.com", //访问资源域名
- "maxSize": 100 //上传文件大小限制 100M
- },
- //企业微信通知配置
- "WxCorp": {
- "AgentID": "1",
- "CorpID": "1",
- "CorpSecret": "1",
- "SendUser": "@all"
- },
- //微信公众号设置
- "WxOpen": {
- "AppID": "",
- "AppSecret": ""
- },
- //代码生成配置
- "gen": {
- //是否显示移动端代码生成
- "showApp": false,
- //自动去除表前缀
- "autoPre": true,
- "author": "admin",
- "tablePrefix": "sys_", //"表前缀（生成类名不会包含表前缀，多个用逗号分隔）",
- "vuePath": "", //前端代码存储路径eg：D:\Work\ZRAdmin-Vue3
- "csharpTypeArr": {
- "string": [ "varchar", "nvarchar", "text", "longtext" ],
- "int": [ "int", "integer", "smallint", "int4", "int8", "int2" ],
- "long": [ "bigint", "number" ],
- "float": [ "numeric", "real", "float" ],
- "decimal": [ "money", "decimal", "smallmoney" ],
- "dateTime": [ "date", "datetime", "datetime2", "smalldatetime", "timestamp" ],
- "byte": [ "tinyint" ],
- "bool": [ "bit" ]
- }
- },
- //邮箱配置信息
- "MailOptions": {
- //发件人名称
- "FromName": "system",
- //发送人邮箱
- "FromEmail": "", //eg：xxxx@qq.com
- //发送人邮箱密码
- "Password": "",
- //协议
- "Smtp": "smtp.qq.com",
- "Port": 587,
- "Signature": "系统邮件，请勿回复！",
- "UseSsl": true
- },
- //redis服务配置
- "RedisServer": {
- "open": 0, //是否启用redis
- "Cache": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=cache:",
- "Session": "127.0.0.1:6379,defaultDatabase=0,poolsize=50,ssl=false,writeBuffer=10240,prefix=session:"
- },
- //接口请求限制
- "IpRateLimiting": {
- "EnableEndpointRateLimiting": true,
- "StackBlockedRequests": false,
- "RealIpHeader": "X-Real-IP",
- "ClientIdHeader": "X-ClientId",
- "HttpStatusCode": 429,
- "EndpointWhitelist": [ "post:/system/dict/data/types", "*:/msghub/negotiate", "*:/LogOut", "*:/common/uploadfile" ],
- "QuotaExceededResponse": {
- "Content": "{{\"code\":429,\"msg\":\"访问过于频繁，请稍后重试\"}}",
- "ContentType": "application/json",
- "StatusCode": 429
- },
- //通用规则，api规则,结尾一定要带*
- "GeneralRules": [
- {
- "Endpoint": "*:/captchaImage",
- //时间段，格式：{数字}{单位}；可使用单位：s, m, h, d
- "Period": "3s",
- "Limit": 5
- },
- {
- "Endpoint": "((post)|(put)):*",
- "Period": "3s",
- "Limit": 1
- }
- ],
- "IpRateLimitPolicies": {
- //ip规则
- "IpRules": [
- ]
- }
- },
- //验证码配置
- "CaptchaOptions": {
- "IgnoreCase": true // 比较时是否忽略大小写
- }
-}
diff --git a/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板1.xlsx b/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板1.xlsx
index 3dc3c964..3cb2b841 100644
Binary files a/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板1.xlsx and b/ZR.Admin.WebApi/wwwroot/ImportTemplate/日生产计划模板1.xlsx differ
diff --git a/ZR.Admin.WebApi/wwwroot/workorder/20240130160521周2生产计划.xlsx b/ZR.Admin.WebApi/wwwroot/workorder/20240130160521周2生产计划.xlsx
deleted file mode 100644
index 748da8f7..00000000
Binary files a/ZR.Admin.WebApi/wwwroot/workorder/20240130160521周2生产计划.xlsx and /dev/null differ
diff --git a/ZR.Service/mes/qc/FirstFQCService.cs b/ZR.Service/mes/qc/FirstFQCService.cs
index 29f5e3ee..34662cd7 100644
--- a/ZR.Service/mes/qc/FirstFQCService.cs
+++ b/ZR.Service/mes/qc/FirstFQCService.cs
@@ -643,7 +643,7 @@ namespace ZR.Service.mes.qc
FinishedPartNumber = item.FinishedPartNumber,
Specifications = item.Specifications,
Colour = item.Colour,
- Team = "",
+ Team = "A",
PreviousNumber = item.PreviousNumber,
FirstPassNumber = 0,
FirstPassRate = 0.0,