Bläddra i källkod

修改PDA后端代码。新增入库操作界面,实现可查询未入库物料;出库操作界面实现可查询未出库完成的物料、增加关键件标识、出库数量默认等于需求数量;

SunYaLong 1 år sedan
förälder
incheckning
7d253baba5

+ 2 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/InStore/InInstoreRecordController.cs

@@ -198,6 +198,8 @@ namespace ZR.Admin.WebApi.Controllers.InStore
             {
                 qaInspectRecordMd.InstoreResult = 99;
             }
+            qaInspectRecordMd.UpdateTime = DateTime.Now;
+
             inInstoreRecordMd.InStoreNo = parm.DeliverNo;
             inInstoreRecordMd.Result = 99;
             inInstoreRecordMd.CreateBy = HttpContext.GetName();

+ 7 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/QaInspectRecordController.cs

@@ -233,6 +233,13 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             return SUCCESS(response);
         }
 
+        [HttpPost("QueryNotInstoreData")]
+        public IActionResult QueryNotInstoreData([FromBody] NotInstoreDataRecordDto parm)
+        {
+            var response = _QaInspectRecordService.GetNotinstoreDataList(parm);
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 添加质检记录,并更新对应的交验单明细
         /// </summary>

+ 1 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/OutOutstoreRecordController.cs

@@ -182,6 +182,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             {
                 sapOutTaskRecordMd.Result = 99;
             }
+            sapOutTaskRecordMd.UpdateTime = DateTime.Now;
 
             OutOutstoreRecord outOutstoreMd = parm.Adapt<OutOutstoreRecord>();
             outOutstoreMd.OutSotreNo = sapOutTaskRecordMd.OutTaskNo;

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

@@ -86,6 +86,14 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             return SUCCESS(response);
         }
 
+        [HttpPost("QuerySapOutTaskListUnfinished")]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:QuerySapOutTaskListUnfinished")]
+        public IActionResult QuerySapOutTaskListUnfinished([FromBody] UnfinishedSapOutTaskRecordDto parm)
+        {
+            var response = _SapOutTaskRecordService.GetUnFinishedSapOutTaskRecordList(parm);
+            return SUCCESS(response);
+        }
+
         /// <summary>
         /// 查询详情
         /// </summary>
@@ -283,6 +291,5 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             return SUCCESS(msg);
         }
 
-
     }
 }

BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/OutAssemblePicture/20240308/BME22-01010-13__20240307-11.jpg


+ 4 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/QaInspectRecordDto.cs

@@ -133,4 +133,8 @@ namespace ZR.Model.Dto.Inspect
         public int? SumAssQty { get; set; }
         #endregion
     }
+    public class NotInstoreDataRecordDto : PagerInfo
+    {
+        public string DeliverNo { get; set; }
+    }
 }

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

@@ -100,4 +100,8 @@ namespace ZR.Model.Dto.OutStore
 
         public string Remark { get; set; }
     }
+    public class UnfinishedSapOutTaskRecordDto : PagerInfo
+    {
+        public string OutTaskNo { get; set; }
+    }
 }

+ 1 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/Inspect/IQaInspectRecordService.cs

@@ -33,6 +33,7 @@ namespace ZR.Service.Business.IBusinessService.Inspect
         #region 2023 0524 孙亚龙 新增
         List<SapDeliverDto> GetCheckedDeliverData(QaInspectRecordQueryNoPageDto parm);
         List<QaInspectRecordDto> GetCheckedSapDeliverRecordList(string deliverNo, string materialSpecCode = null);
+        PagedInfo<QaInspectRecordDto> GetNotinstoreDataList(NotInstoreDataRecordDto parm);
         #endregion
     }
 }

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

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

+ 15 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/QaInspectRecordService.cs

@@ -295,6 +295,21 @@ namespace ZR.Service.Business.Inspect
 
             return response.Adapt<List<QaInspectRecordDto>>();
         }
+        public PagedInfo<QaInspectRecordDto> GetNotinstoreDataList(NotInstoreDataRecordDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<QaInspectRecord>();
+            predicate.And(x => x.DeliverNo == parm.DeliverNo);
+            predicate.And(x => x.InstoreQty < x.CheckQty);
+            predicate.And(x => x.InstoreResult < 99);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(x => x.InspectId)
+                .ToPage(parm);
+
+            return response.Adapt<PagedInfo<QaInspectRecordDto>>();
+        }
         #endregion
     }
 }

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

@@ -88,6 +88,22 @@ namespace ZR.Service.Business.OutStore
             return response.Adapt<List<SapOutTaskRecordDto>>();
         }
 
+        public PagedInfo<SapOutTaskRecordDto> GetUnFinishedSapOutTaskRecordList(UnfinishedSapOutTaskRecordDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<SapOutTaskRecord>();
+            predicate.And(x => x.OutTaskNo == parm.OutTaskNo);
+            predicate.And(x => x.Qty > x.OutQty);
+            predicate.And(x => x.Result < 99);
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .OrderByDescending(x => x.UpdateTime)
+                .ToPage(parm);
+
+            return response.Adapt<PagedInfo<SapOutTaskRecordDto>>();
+        }
+
         /// <summary>
         /// 添加
         /// </summary>