Prechádzať zdrojové kódy

质检后台增加对质检完成的判断,IsComplate ==true时筛选sumQty>sumCheckQty

zhaoyaxiong 1 rok pred
rodič
commit
101abc69a3

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

@@ -8,8 +8,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=192.168.0.1;port=3306;User ID=sa;Password=123456;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=192.168.0.1;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", //项目启动url,如果改动端口前端对应devServer也需要进行修改
@@ -46,8 +46,8 @@
   },
   "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=192.168.0.1;port=3306;User ID=sa;Password=123456;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=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "dbType": 0, //MySql = 0, SqlServer = 1
     "autoPre": true, //自动去除表前缀
     "author": "admin",

+ 2 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/SapDeliverRecordDto.cs

@@ -146,5 +146,7 @@ namespace ZR.Model.Dto.Inspect
     {
         public string DeliverNo { get; set; }
         public string MaterialSpec { get; set; }
+
+        public bool? IsComplate { get; set; }
     }
 }

+ 4 - 2
ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/SapDeliverRecordService.cs

@@ -11,6 +11,7 @@ using ZR.Model.Dto.Inspect;
 using ZR.Model.Models.Inspect;
 using Mapster;
 using Aliyun.OSS;
+using System.Transactions;
 
 namespace ZR.Service.Business.Inspect
 {
@@ -220,7 +221,7 @@ namespace ZR.Service.Business.Inspect
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<SapDeliverRecord>();
-            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), x => x.MaterialSpec == parm.MaterialSpec);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), x => x.MaterialSpec == parm.MaterialSpec.Trim());
             predicate.And(x => x.DeliverNo == parm.DeliverNo);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
@@ -233,7 +234,8 @@ namespace ZR.Service.Business.Inspect
                     MaterialSpec = x.MaterialSpec,
                     SumQty = SqlFunc.AggregateSum(x.Qty),
                     SumCheckQty = (int)SqlFunc.AggregateSum(x.CheckQty),
-                }).ToPage(parm);
+                })
+                .HavingIF(parm.IsComplate==true,x=>x.SumQty>x.SumCheckQty).ToPage(parm);
             return response;
         }
         public bool GetSapDeliverIsAllChecked(string deliverNo)