From 1440114cfae626c192ef59775e9d7829db634c1c Mon Sep 17 00:00:00 2001 From: wangxinhui <wangxinhui@hnkhzn.com> Date: 星期一, 07 七月 2025 20:20:20 +0800 Subject: [PATCH] 上传 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 116 insertions(+), 0 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" index 5e86d4c..bb5a54d 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_CheckService/CheckOrderResultService.cs" @@ -10,6 +10,7 @@ using WIDESEA_Core.BaseServices; using WIDESEA_Core.Enums; using WIDESEA_Core.Helper; +using WIDESEA_External.Model; using WIDESEA_IApprovalRepository; using WIDESEA_ICheckRepository; using WIDESEA_ICheckService; @@ -166,6 +167,121 @@ } return content; } + public WebResponseContent CommitCheckResult(ERPCheckModel checkModel) + { + WebResponseContent content = new WebResponseContent(); + try + { + Dt_CheckOrder checkOrder = _checkOrderRepository.QueryFirst(x => x.CheckOrderNo == checkModel.Code); + //鑾峰彇璐ㄦ鍗曞搴旂殑鏀惰揣鍗� + if (checkOrder == null) + { + return content.Error($"鏈壘鍒拌璐ㄦ鍗�"); + } + Dt_ReceiveOrder receiveOrder = _receiveOrderRepository.Db.Queryable<Dt_ReceiveOrder>().Where(x => x.ReceiveOrderNo == checkOrder.ReceiveOrderNo).Includes(x => x.Details).First(); + if (receiveOrder.ReceiveOrderStatus != ReceiveOrderStatusEnum.Completed.ObjToInt()) + { + return content.Error($"{receiveOrder.ReceiveOrderNo}鏀惰揣鍗曟湭瀹屾垚鏃犳硶璐ㄦ"); + } + if (checkOrder.CheckOrderStatus == CheckOrderStatusEnum.Checked.ObjToInt()) + { + return content.Error($"璇ュ崟鎹凡缁忔楠屽畬鎴�"); + } + Dt_CheckOrderResult? checkOrderResult = null; + Dt_PurchaseOrder? purchaseOrder = null; + Dt_PurchaseOrderDetail? purchaseOrderDetail = null; + if (checkModel.Details.Count>0) + { + + ERPCheckResult eRPCheckResult = checkModel.Details.FirstOrDefault(); + if (eRPCheckResult.Result == CheckResultEnum.Return.ToString())//閫�璐� + { + checkOrder.DefectedNote = eRPCheckResult.Result; + checkOrder.ReturnQuantity += (float)Convert.ToDecimal(eRPCheckResult.Quantity); + } + else + { + return content.Error($"鏈壘鍒扮己闄风被鍨�"); + } + checkOrderResult = new Dt_CheckOrderResult() + { + Quantity = (float)Convert.ToDecimal(eRPCheckResult.Quantity), + CheckOrderId = checkOrder.CheckOrderId, + DefectCode = eRPCheckResult.DefectCode, + Result = eRPCheckResult.Result, + Note = eRPCheckResult.Note, + SampleCount = 0, + }; + //鑾峰彇瀵瑰簲閲囪喘鍗� + Dt_ReceiveOrderDetail receiveOrderDetail = receiveOrder.Details.First(x => x.RowNo == checkOrder.ReceiveDetailRowNo); + purchaseOrder = _purchaseOrderRepository.Db.Queryable<Dt_PurchaseOrder>().Where(x => x.PurchaseOrderNo == receiveOrderDetail.PurchaseOrderNo).Includes(x => x.Details).Where(x => x.Details.Any(v => v.RowNo == receiveOrderDetail.PurchaseOrderDetailRowNo)).First(); + if (purchaseOrder == null) + { + return content.Error("鏈壘鍒板搴旀敹璐ч噰璐崟"); + } + purchaseOrderDetail = purchaseOrder.Details.FirstOrDefault(); + if (purchaseOrderDetail == null) + { + return content.Error("鏈壘鍒伴��璐у搴旂殑閲囪喘鍗曟槑缁�"); + } + purchaseOrderDetail.PurchaseDetailReceiveQty -= (float)Convert.ToDecimal(eRPCheckResult.Quantity); + } + if (checkModel.Result == CheckAcceptEnum.Accept.ToString()) + { + checkOrder.Result = CheckAcceptEnum.Accept.ToString(); + } + else if (checkModel.Result == CheckAcceptEnum.UnAccept.ToString()) + { + checkOrder.Result = CheckAcceptEnum.UnAccept.ToString(); + } + else + { + return content.Error("鏈壘鍒版楠岀被鍨�"); + } + checkOrder.CheckOrderStatus = CheckOrderStatusEnum.Checked.ObjToInt(); + if (checkOrderResult != null) + { + checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity - checkOrderResult.Quantity; + } + else + { + checkOrder.QualifiedQuantity = checkOrder.ReceivedQuantity; + } + checkOrder.CheckUserName = App.User.UserName; + _unitOfWorkManage.BeginTran(); + + if (checkOrderResult != null && purchaseOrder != null && purchaseOrderDetail != null) + { + BaseDal.AddData(checkOrderResult); + if (purchaseOrder.PurchaseOrderStatus >= PurchaseOrderStatusEnum.Received.ObjToInt()) + { + purchaseOrder.PurchaseOrderStatus = PurchaseOrderStatusEnum.Receiving.ObjToInt(); + _purchaseOrderRepository.UpdateData(purchaseOrder); + } + if (purchaseOrderDetail.PurchaseDetailStatus == PurchaseOrderDetailStatusEnum.Received.ObjToInt()) + { + purchaseOrderDetail.PurchaseDetailStatus = PurchaseOrderDetailStatusEnum.Receiving.ObjToInt(); + } + _purchaseOrderDetailRepository.UpdateData(purchaseOrderDetail); + } + //ERP涓婃姤 + WebResponseContent responseContent = _checkOrderService.FeedbackCheckResult(checkOrder, checkOrderResult != null ? new List<Dt_CheckOrderResult> { checkOrderResult } : new List<Dt_CheckOrderResult>()); + if (!responseContent.Status) + { + throw new Exception(responseContent.Message); + } + checkOrder.UploadStatus = CheckUploadEnum.UploadOk.ObjToInt(); + _checkOrderRepository.UpdateData(checkOrder); + _unitOfWorkManage.CommitTran(); + content.OK(); + } + catch (Exception ex) + { + _unitOfWorkManage.RollbackTran(); + return content.Error($"{ex.Message}"); + } + return content; + } /// <summary> /// 鎻愪氦閫佹纭缁撴灉 /// </summary> -- Gitblit v1.9.3