From 9baffa8a8a5c9fbdda690544132b95db9196cc88 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 16 12月 2024 15:22:08 +0800 Subject: [PATCH] 22 --- LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs index 9d0bbd7..a3a26bf 100644 --- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs +++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOperationTask/WmsOperationTaskService.cs @@ -115,6 +115,10 @@ packageObj.UpiStatus = UpiStatusEnum.宸蹭笅绾�; await _mesPackageGatherRep.UpdateAsync(packageObj); + + //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep + await UpdateOrderGather(packageObj); + foreach (var quan in quanList) { //娓呯悊 闃熷垪琛� @@ -422,6 +426,11 @@ throw Oops.Oh($"娌℃湁鎵惧埌鍖呭彿{input.PackageCode}鐨勬眹鎬绘暟鎹�"); } + if (singlePackage.UpiStatus == UpiStatusEnum.宸蹭笅绾�) + { + throw Oops.Oh($"鍖呭彿{input.PackageCode}宸茬粡涓嬬嚎"); + } + singlePackage.UpiFlag = UpiFlagEnum.NG; singlePackage.UpdateTime = DateTime.Now; singlePackage.UpiStatus = UpiStatusEnum.宸蹭笅绾�; @@ -482,6 +491,9 @@ } + //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep + await UpdateOrderGather(singlePackage); + WmsRecordPackageProcess wmsRecordPackage = new WmsRecordPackageProcess(); wmsRecordPackage = singlePackage.Adapt<WmsRecordPackageProcess>(); @@ -499,6 +511,45 @@ } /// <summary> + /// 涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� + /// </summary> + /// <param name="singlePackage"></param> + /// <returns></returns> + private async Task UpdateOrderGather(Mes_Package_Gather singlePackage) + { + //涓嬬嚎鏇存柊 璁㈠崟琛ㄦ暟鎹� _mesOrderGatherRep + bool isAdd = false; + var order = await _mesOrderGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).FirstAsync(); + if (order == null) + { + isAdd = true; + order = new Mes_Order_Gather() + { + Info5 = singlePackage.Info5, + OrderId = singlePackage.OrderId, + PlanNo = singlePackage.PlanNo, + }; + } + var packageList = await _mesPackageGatherRep.AsQueryable().Where(x => x.Info5 == singlePackage.Info5).ToListAsync(); + order.PackageNum = packageList.Count(); + order.UnLinePackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾�).Count() + 1; + order.NgPackageNum = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == UpiFlagEnum.NG).Count() + 1; + order.NoUnLinePackageNum = order.PackageNum - order.UnLinePackageNum; + + order.AllPackageArea = packageList.Sum(x => Convert.ToDecimal(x.Info13)); + order.ScanPackageArea = packageList.Where(x => x.UpiStatus == UpiStatusEnum.宸蹭笅绾� && x.UpiFlag == (int)UpiFlagEnum.姝e父).Sum(x => Convert.ToDecimal(x.Info13)); + order.NoScanPackageArea = order.AllPackageArea - order.ScanPackageArea; + if (isAdd) + { + await _mesOrderGatherRep.InsertAsync(order); + } + else + { + await _mesOrderGatherRep.UpdateAsync(order); + } + } + + /// <summary> /// 鏍囪NG-鎵弿浠跺彿 /// </summary> /// <param name="input"></param> -- Gitblit v1.9.3