更改交验单导入关键件判定条件

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/SapDeliverRecordController.cs

@@ -222,7 +222,15 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
                     sapDeliverRecord.MaterialSpec = dataSet.Tables[1].Rows[i][19].ToString().Trim();//*
 
                 sapDeliverRecord.Category = category;//*
-                sapDeliverRecord.KeyFlag = i % 2 > 0;//*//非空 模拟数据
+                if (category == "外协件")//所有外协件默认都是关键件
+                {
+                    sapDeliverRecord.KeyFlag = true;//*//非空
+
+                }
+                else 
+                {
+                    sapDeliverRecord.KeyFlag = true;//此处应读取交验单中的关键件列数据。
+                }
 
                 if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][21].ToString().Trim()))
                 {
@@ -248,7 +256,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
                 sapDeliverRecord.UpdateBy = HttpContext.GetName();
                 sapDeliverRecord.UpdateTime = DateTime.Now;
                 sapDeliverRecord.Remark = "导入数据";
-                string v = sapDeliverRecord.SpotCheckQty > 0 ? ((sapDeliverRecord.CheckQty < sapDeliverRecord.SpotCheckQty) ? (sapDeliverRecord.CheckQty > 0 ? "PartOK" : "NG") : "OK") : "Wait";
+                //string v = sapDeliverRecord.SpotCheckQty > 0 ? ((sapDeliverRecord.CheckQty < sapDeliverRecord.SpotCheckQty) ? (sapDeliverRecord.CheckQty > 0 ? "PartOK" : "NG") : "OK") : "Wait";
                 //sapDeliverRecord.CheckResult = v;//计算质检结果，抽检数量为0是未质检Wait，合格数为0则NG，大于零小于抽检数则PartOK，合格数量等于抽检数量则全合格OK
                 sapDeliverRecord.CheckResult = "Wait";
                 sapDeliverRecords.Add(sapDeliverRecord);
@@ -341,7 +349,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         [HttpPost("GetSapDeliverRecordSum")]
         public IActionResult GetSapDeliverRecordSum(string materialSpecCode, string deliverNo)
         {
-            var response = _SapDeliverRecordService.GetSapDeliverRecordSum(materialSpecCode,deliverNo);
+            var response = _SapDeliverRecordService.GetSapDeliverRecordSum(materialSpecCode, deliverNo);
             return SUCCESS(response);
         }
 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/appsettings.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    "conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    //"conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db_type": "0" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },
   "urls": "http://localhost:8888;http://192.168.137.1:8888", //项目启动url，如果改动端口前端对应devServer也需要进行修改
@@ -44,8 +44,8 @@
     "SendUser": "@all"
   },
   "gen": {
-    "conn": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    //"conn": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "dbType": 0, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "admin",