From 3571d8b2231e06e46774af86be502014d6974e1d Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 07 四月 2026 16:16:53 +0800
Subject: [PATCH] 优化ERP接收单据逻辑，一期领料变更逻辑修改
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs | 100 ++++++++++++++++++++++++++++++++------------------
1 files changed, 64 insertions(+), 36 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
index ee38920..bef080a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs"
@@ -93,6 +93,10 @@
{
return content.Error("閲囪喘淇℃伅涓嶈兘浼犲叆涓虹┖");
}
+ if (eRPPurchaseOrderDTO.PurchaseInDetail == null || eRPPurchaseOrderDTO.PurchaseInDetail.Count <= 0)
+ {
+ return content.Error("閲囪喘鏄庣粏淇℃伅涓嶈兘浼犲叆涓虹┖");
+ }
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseCode==eRPPurchaseOrderDTO.WarehouseCode);
if (warehouse==null)
{
@@ -129,14 +133,18 @@
Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
purchaseOrderDetails.ForEach(x =>
{
- Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
- if (materielInfo != null)
+ if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.PurchaseDetailThickness <= 0)
{
-
+ throw new Exception($"鐗╂枡{x.MaterialCode}鏉＄爜{x.BarCode}鐩村緞闇�澶т簬0");
}
+ if (purchaseOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null)
+ {
+ throw new Exception($"閲囪喘鍗曞崟鍙穥purchaseOrder.PurchaseOrderNo}鏉＄爜{x.BarCode}宸插瓨鍦�");
+ }
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
x.MaterielName = materielInfo?.MaterielName;
x.Unit = materielInfo?.MaterielUnit;
- x.MaterielSpec= materielInfo?.MaterielSpec;
+ x.MaterielSpec = materielInfo?.MaterielSpec;
});
purchaseOrder.Details = purchaseOrderDetails;
purchaseOrder.WarehouseId = warehouse.WarehouseId;
@@ -144,37 +152,57 @@
BaseDal.Db.InsertNav(purchaseOrder).Include(x=>x.Details).ExecuteCommand();
}
- //else if (eRPPurchaseOrderDTO.OperateType == 2)
- //{
- // //鍒ゆ柇鏄惁瀛樺湪
- // Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
- // if (userInfoOld == null)
- // {
- // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
- // }
- // Dt_UserInfo userInfo = _mapper.Map<Dt_UserInfo>(eRPUserInfoDTO);
- // userInfo.Id = userInfoOld.Id;
- // Sys_User user = _userRepository.QueryFirst(x => x.UserName == userInfo.Code);
- // if (userInfoOld == null)
- // {
- // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}锛學MS璐﹀彿涓嶅瓨鍦�");
- // }
- // user.Enable = (byte)userInfo.State;
- // user.UserTrueName = userInfo.Name;
- // //鏇存柊
- // BaseDal.UpdateData(userInfo);
- // _userRepository.UpdateData(user);
- //}
- //else if (eRPPurchaseOrderDTO.OperateType == 3)
- //{
- // //鍒ゆ柇鏄惁瀛樺湪
- // Dt_UserInfo? userInfoOld = OlduserInfos.FirstOrDefault(x => x.Code == eRPUserInfoDTO.StaffCode);
- // if (userInfoOld == null)
- // {
- // return content.Error($"鏇存柊宸ュ彿{eRPUserInfoDTO.StaffCode}锛屽憳宸eRPUserInfoDTO.StaffName}涓嶅瓨鍦�");
- // }
- // BaseDal.DeleteData(userInfoOld);
- //}
+ else if (eRPPurchaseOrderDTO.OperateType == 2)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_PurchaseOrder? purchaseOrderOld = purchaseOrdersOld.FirstOrDefault(x => x.PurchaseOrderNo == eRPPurchaseOrderDTO.PurchaseInCode);
+ if (purchaseOrderOld == null)
+ {
+ return content.Error($"閲囪喘鍗曞崟鍙穥eRPPurchaseOrderDTO.PurchaseInCode}淇℃伅涓嶅瓨鍦�");
+ }
+ if (purchaseOrderOld.PurchaseOrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return content.Error($"閲囪喘鍗曞崟鍙穥purchaseOrderOld.PurchaseOrderNo}鐘舵�佷负{(InOrderStatusEnum)purchaseOrderOld.PurchaseOrderStatus}");
+ }
+ List<string> barCodesOld = purchaseOrderOld.Details.Select(x => x.BarCode).ToList();
+ List<Dt_PurchaseOrderDetail> purchaseOrderDetails = eRPPurchaseOrderDTO.PurchaseInDetail.Select(x => _mapper.Map<Dt_PurchaseOrderDetail>(x)).ToList();
+ Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
+ purchaseOrder.Id = purchaseOrderOld.Id;
+ purchaseOrderDetails.ForEach(x =>
+ {
+ if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.PurchaseDetailThickness <= 0)
+ {
+ throw new Exception($"鐗╂枡{x.MaterialCode}鏉＄爜{x.BarCode}鐩村緞闇�澶т簬0");
+ }
+ if (purchaseOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null && !barCodesOld.Contains(x.BarCode))
+ {
+ throw new Exception($"閲囪喘鍗曞崟鍙穥purchaseOrder.PurchaseOrderNo}鏉＄爜{x.BarCode}宸插瓨鍦�");
+ }
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ x.MaterielName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ x.MaterielSpec = materielInfo?.MaterielSpec;
+ });
+ purchaseOrder.Details = purchaseOrderDetails;
+ purchaseOrder.WarehouseId = warehouse.WarehouseId;
+ //鏇存柊
+ BaseDal.Db.UpdateNav(purchaseOrder).Include(x => x.Details).ExecuteCommand();
+ }
+ else if (eRPPurchaseOrderDTO.OperateType == 3)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_PurchaseOrder? purchaseOrderOld = purchaseOrdersOld.FirstOrDefault(x => x.PurchaseOrderNo == eRPPurchaseOrderDTO.PurchaseInCode);
+ if (purchaseOrderOld == null)
+ {
+ return content.Error($"閲囪喘鍗曞崟鍙穥eRPPurchaseOrderDTO.PurchaseInCode}淇℃伅涓嶅瓨鍦�");
+ }
+ if (purchaseOrderOld.PurchaseOrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return content.Error($"閲囪喘鍗曞崟鍙穥purchaseOrderOld.PurchaseOrderNo}鐘舵�佷负{(InOrderStatusEnum)purchaseOrderOld.PurchaseOrderStatus}");
+ }
+ //鍒犻櫎
+ BaseDal.Db.DeleteNav(purchaseOrderOld).Include(x => x.Details).ExecuteCommand();
+ }
else
{
return content.Error("鏈壘鍒版搷浣滅被鍨�");
@@ -223,7 +251,7 @@
Dt_ReturnOutOrder? returnOutOrderOld = returnOutOrdersOld.FirstOrDefault(x => x.ReturnNo == eRPReturnOrderDTO.ReturnCode);
if (returnOutOrderOld != null)
{
- return content.Error($"閫�璐� 鍗曞彿{returnOutOrderOld.ReturnNo}淇℃伅宸插瓨鍦�");
+ return content.Error($"閫�璐у崟鍙穥returnOutOrderOld.ReturnNo}淇℃伅宸插瓨鍦�");
}
List<Dt_ReturnOutOrderDetail> returnOutOrderDetails = eRPReturnOrderDTO.ReturnDetail.Select(x => _mapper.Map<Dt_ReturnOutOrderDetail>(x)).ToList();
Dt_ReturnOutOrder returnOutOrderAdd = _mapper.Map<Dt_ReturnOutOrder>(eRPReturnOrderDTO);
--
Gitblit v1.9.3