diff --git a/.gitignore b/.gitignore index ebd2d09c..68ed2423 100644 --- a/.gitignore +++ b/.gitignore @@ -259,16 +259,5 @@ paket-files/ # Python Tools for Visual Studio (PTVS) __pycache__/ *.pyc -/ZR.Admin.WebApi/appsettings.Development.json -/CodeGenerate -/ZR.Admin.WebApi/appsettings.Production.json -/ZR.Admin.WebApi/wwwroot/uploads -/ZR.Admin.WebApi/wwwroot/Generatecode -/ZR.Admin.WebApi/wwwroot/export -/ZR.Vue/src/views/business/Gendemo.vue -/ZR.Admin.WebApi/Properties/launchSettings.json -/ZR.Admin.WebApi/ZRAdmin.xml -/ZR.Admin.WebApi/DataProtection -/Quartz.NET.WindowsService -/ZRAdmin-vue -/ZR.Admin.WebApi/ZRModel.xml + + diff --git a/ZR.Admin.WebApi/DataProtection/key-7938b439-f03f-4cb7-8ebb-f95dbf99963f.xml b/ZR.Admin.WebApi/DataProtection/key-7938b439-f03f-4cb7-8ebb-f95dbf99963f.xml new file mode 100644 index 00000000..361fc73b --- /dev/null +++ b/ZR.Admin.WebApi/DataProtection/key-7938b439-f03f-4cb7-8ebb-f95dbf99963f.xml @@ -0,0 +1,16 @@ + + + 2023-11-13T06:55:43.0272889Z + 2023-11-13T06:55:42.9821683Z + 2024-02-11T06:55:42.9821683Z + + + + + + + 0Bwy2cWCxCrVswqmZZYy0/Nf6EtV7l8MPeD71p6a2ie8zSmuc+Yuxikg5Y4k9UWiiWtku+BB+fuPksITeMQT4g== + + + + \ No newline at end of file diff --git a/ZR.Admin.WebApi/DataProtection/key-ccc4efea-49d3-40cb-89b3-a82e1e035298.xml b/ZR.Admin.WebApi/DataProtection/key-ccc4efea-49d3-40cb-89b3-a82e1e035298.xml new file mode 100644 index 00000000..0ba322a3 --- /dev/null +++ b/ZR.Admin.WebApi/DataProtection/key-ccc4efea-49d3-40cb-89b3-a82e1e035298.xml @@ -0,0 +1,16 @@ + + + 2024-02-14T08:12:02.2296228Z + 2024-02-14T08:12:02.1706772Z + 2024-05-14T08:12:02.1706772Z + + + + + + + jiZhUm8RV0KKeB/42643hxPcrlPkbfB+sjeZ+8St6Vn1tcsDZq+n2ERtMX/D8tIstFPe88rq5Mpg0ZwueJte1A== + + + + \ No newline at end of file diff --git a/ZR.Admin.WebApi/appsettings.development.json b/ZR.Admin.WebApi/appsettings.development.json new file mode 100644 index 00000000..fb1d0635 --- /dev/null +++ b/ZR.Admin.WebApi/appsettings.development.json @@ -0,0 +1,147 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "urls": "http://localhost:8888", //（app会默认去读）项目启动url，如果改动端口前端对应devServer也需要进行修改 + "dbConfigs": [ + { + + //外网连接服务器 + "Conn": "Data Source=47.116.122.230;Port=3307;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + //内网连接服务器 + // "Conn": "Data Source=127.0.0.1;Port=3306;User ID=root;Password=123456;Initial Catalog=ZrAdmin;", + "Type": 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/appsettings.production.json b/ZR.Admin.WebApi/appsettings.production.json new file mode 100644 index 00000000..4edb71a5 --- /dev/null +++ b/ZR.Admin.WebApi/appsettings.production.json @@ -0,0 +1,144 @@ +{ + "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=127.0.0.1;Port=3306;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/export/2024年3周1日计划-01-20-142515.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142515.xlsx new file mode 100644 index 00000000..e69de29b diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx new file mode 100644 index 00000000..76cd3f72 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142552.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx new file mode 100644 index 00000000..e6a341ff Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-142652.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx new file mode 100644 index 00000000..43357bee Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年3周1日计划-01-20-143429.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx new file mode 100644 index 00000000..627bd0c7 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-01-20-143630.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx new file mode 100644 index 00000000..5906a062 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年3周计划-02-04-140700.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx new file mode 100644 index 00000000..65226062 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年4周2日计划-02-02-151006.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx new file mode 100644 index 00000000..ef9260a6 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-110534.xlsx differ diff --git a/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx new file mode 100644 index 00000000..c3db50d8 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/export/2024年6周7日计划-02-04-111434.xlsx differ diff --git a/ZR.Service/mes/qc/FirstFQCService.cs b/ZR.Service/mes/qc/FirstFQCService.cs index 34a3c02c..8373564c 100644 --- a/ZR.Service/mes/qc/FirstFQCService.cs +++ b/ZR.Service/mes/qc/FirstFQCService.cs @@ -1444,10 +1444,84 @@ namespace ZR.Service.mes.qc first.DeviceShuiban = firstrecordList[i].Counter; } + if (firstrecordList[i].FKInpectionId == "212") + { + first.DeviceZandian = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "213") + { + first.DeviceBianxing = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "214") + { + first.DeviceYouzhu = firstrecordList[i].Counter; + } - - + if (firstrecordList[i].FKInpectionId == "215") + { + first.DeviceTuoluo = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "216") + { + first.DeviceZhuangshang = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "217") + { + first.DeviceOther = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "217") + { + first.DeviceOther = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "311") + { + first.BlankMaoci = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "312") + { + first.BlankSuoyin = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "313") + { + first.BlankCanshuang = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "314") + { + first.BlankShaying = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "315") + { + first.BlankZangdian = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "316") + { + first.BlankDamo = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "411") + { + first.ProgramLiuguang = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "412") + { + first.ProgramSeqiqueqi = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "413") + { + first.ProgramQingqiqueqi = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "414") + { + first.ProgramJupi = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "415") + { + first.ProgramOther = firstrecordList[i].Counter; + } + if (firstrecordList[i].FKInpectionId == "415") + { + first.ProgramOther = firstrecordList[i].Counter; + } } } @@ -1455,24 +1529,11 @@ namespace ZR.Service.mes.qc - first.DeviceShuiban = 0; - first.DeviceZandian = 0; - first.DeviceBianxing = 0; - first.DeviceYouzhu = 0; - first.DeviceTuoluo = 0; - first.DeviceZhuangshang = 0; - first.DeviceOther = 0; - first.BlankMaoci = 0; - first.BlankSuoyin = 0; - first.BlankCanshuang = 0; - first.BlankShaying = 0; - first.BlankZangdian = 0; - first.BlankDamo = 0; - first.ProgramLiuguang = 0; - first.ProgramSeqiqueqi = 0; - first.ProgramQingqiqueqi = 0; - first.ProgramJupi = 0; - first.ProgramOther = 0; + + + + + first.TeamTuoluocanshuang = 0; first.TeamQingqiqikuai = 0; first.TeamSeqiqikuai = 0;