出库操作 后台代码优化

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/SapOutTaskRecordController.cs

@@ -78,6 +78,14 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             return SUCCESS(response);
         }
 
+        [HttpPost("QuerySapOutTaskListForMaterialSpec")]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListForMaterialSpec")]
+        public IActionResult QuerySapOutTaskListForMaterialSpec(string outTaskNo, string materialSpecCode)
+        {
+            var response = _SapOutTaskRecordService.GetSapOutTaskRecordList(outTaskNo, materialSpecCode);
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 查询详情
         /// </summary>

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",

ZrAdminNetCore-net7.0/ZR.Model/Dto/OutStore/SapOutTaskRecordDto.cs

@@ -62,7 +62,7 @@ namespace ZR.Model.Dto.OutStore
         [Required(ErrorMessage = "生产令号不能为空")]
         public string BomNo { get; set; }
 
-        [Required(ErrorMessage = "物料类型（外协件，外购件）不能为空")]
+        //[Required(ErrorMessage = "物料类型（外协件，外购件）不能为空")]
         public string Category { get; set; }
 
         [Required(ErrorMessage = "物料编码不能为空")]

ZrAdminNetCore-net7.0/ZR.Service/Business/Balance/StkBalanceDtlService.cs

@@ -178,7 +178,7 @@ namespace ZR.Service.Business.Balance
             #region 按照 bom号、物料号、Bn\Sn码 的条件查找库存
             //开始拼装查询条件
             var predicate = Expressionable.Create<StkBalanceDtl>();
-            predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode);
+            predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode || x.MaterialSpec == parm.MaterialCode);
             predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BomNo), x => x.BomNo == parm.BomNo);
             predicate.AndIF(parm != null && !string.IsNullOrEmpty(parm.BnSnCode), x => x.BnSnCode == parm.BnSnCode);
             predicate.AndIF(parm.IsForAssemble, x => x.Status == 88);
@@ -199,7 +199,7 @@ namespace ZR.Service.Business.Balance
 
             #region 按照物料号、Bn\Sn码 的条件查找库存
             var predicate1 = Expressionable.Create<StkBalanceDtl>();
-            predicate1.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode);
+            predicate1.AndIF(parm != null && !string.IsNullOrEmpty(parm.MaterialCode), x => x.MaterialCode == parm.MaterialCode || x.MaterialSpec == parm.MaterialCode);
             predicate1.AndIF(parm != null && !string.IsNullOrEmpty(parm.BnSnCode), x => x.BnSnCode == parm.BnSnCode);
             predicate1.AndIF(parm.IsForAssemble, x => x.Status == 88);
             predicate1.AndIF(!parm.IsForAssemble, x => x.Status == 55);

ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/OutStore/ISapOutTaskRecordService.cs

@@ -24,7 +24,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
         
         void TruncateSapOutTaskRecord();
         List<SapOutTaskDto> GetSapOutTaskList(SapOutTaskQueryNoPageDto parm);
-        List<SapOutTaskRecordDto> GetSapOutTaskRecordList(string outTaskNo);
+        List<SapOutTaskRecordDto> GetSapOutTaskRecordList(string outTaskNo, string materialSpecCode = null);
 
         string ImportDatas(List<SapOutTaskRecord> list);
 

ZrAdminNetCore-net7.0/ZR.Service/Business/OutStore/SapOutTaskRecordService.cs

@@ -73,11 +73,12 @@ namespace ZR.Service.Business.OutStore
             return response.Adapt<List<SapOutTaskDto>>();
         }
 
-        public List<SapOutTaskRecordDto> GetSapOutTaskRecordList(string outTaskNo)
+        public List<SapOutTaskRecordDto> GetSapOutTaskRecordList(string outTaskNo, string materialSpecCode = null)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<SapOutTaskRecord>();
             predicate.And(x => x.OutTaskNo == outTaskNo);
+            predicate.AndIF(!string.IsNullOrEmpty(materialSpecCode), x => x.MaterialSpec == materialSpecCode);
             //predicate.And(x => x.Qty > x.CheckQty);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()