From 011ca316e6ec2ed93e31c45a9ebd9d3c66664871 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 17 四月 2026 11:47:03 +0800
Subject: [PATCH] 代码更新
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/PurchaseOrderService.cs | 208 ++++++++++++++++-----------------------------------
1 files changed, 66 insertions(+), 142 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 60b96be..0255a3e 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)
{
@@ -116,7 +120,7 @@
}
//鑾峰彇鎵�鏈夐噰璐俊鎭�
List<Dt_PurchaseOrder> purchaseOrdersOld = BaseDal.Db.Queryable<Dt_PurchaseOrder>().Includes(x=>x.Details).ToList();
-
+ List<Dt_PurchaseOrderDetail> purchaseOrderDetailsOld = purchaseOrdersOld.SelectMany(x => x.Details).ToList();
if (eRPPurchaseOrderDTO.OperateType == 1)
{
//鍒ゆ柇閲嶅鎻掑叆
@@ -129,10 +133,18 @@
Dt_PurchaseOrder purchaseOrder = _mapper.Map<Dt_PurchaseOrder>(eRPPurchaseOrderDTO);
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)
+ {
+ 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;
@@ -140,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("鏈壘鍒版搷浣滅被鍨�");
@@ -219,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);
@@ -233,114 +265,6 @@
returnOutOrderAdd.WarehouseId = warehouse.WarehouseId;
//鏂板
BaseDal.Db.InsertNav(returnOutOrderAdd).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
- {
- return content.Error("鏈壘鍒版搷浣滅被鍨�");
- }
- //鏇存柊鏁版嵁
- return content.OK("鎺ユ敹鎴愬姛");
- }
- catch (Exception ex)
- {
- content.Error(ex.Message);
- }
- return content;
- }
- /// <summary>
- /// 鎺ユ敹ERP鎴愬搧閿�鍞嚭搴撲俊鎭�
- /// </summary>
- /// <returns></returns>
- public WebResponseContent ReceiveProDeliveryOrder(ERPProDeliveryDTO eRPProDeliveryDTO)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (eRPProDeliveryDTO == null)
- {
- return content.Error("閿�鍞嚭搴撲俊鎭笉鑳戒负绌�");
- }
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPProDeliveryDTO.WarehouseCode);
- if (warehouse == null)
- {
- return content.Error($"浠撳簱淇℃伅涓嶅瓨鍦▄eRPProDeliveryDTO.WarehouseCode}");
- }
- //鑾峰彇鎵�鏈夌墿鏂�
- List<Dt_MaterielInfo> materielInfos = _basicRepository.MaterielInfoRepository.QueryData(x => x.WarehouseId == warehouse.WarehouseId && x.MaterielInvOrgId == MaterielInvOrgEnum.鏂板巶.ObjToInt());
-
- //鑾峰彇鎵�鏈夊鎴�
- List<Dt_CustomerInfo> customerInfos = _basicRepository.CustomerInfoRepository.QueryData();
-
- //鍒ゆ柇鏄惁瀛樺湪鐗╂枡
- DeliveryDetailItem? deliveryDetailItem = eRPProDeliveryDTO.DeliveryDetail.FirstOrDefault(x => !materielInfos.Select(x => x.MaterielCode).Contains(x.MaterialCode));
- if (deliveryDetailItem != null)
- {
- return content.Error($"鐗╂枡淇℃伅{deliveryDetailItem.MaterialCode}涓嶅瓨鍦�");
- }
-
- //鍒ゆ柇鏄惁瀛樺湪瀹㈡埛
- DeliveryDetailItem? deliveryDetailCustom = eRPProDeliveryDTO.DeliveryDetail.FirstOrDefault(x => !customerInfos.Select(x => x.CustomerCode).Contains(x.Customer));
-
- if (deliveryDetailCustom != null)
- {
- return content.Error($"瀹㈡埛淇℃伅{deliveryDetailCustom.Customer}涓嶅瓨鍦�");
- }
-
- //鑾峰彇鎵�鏈夐攢鍞嚭搴撲俊鎭�
- List<Dt_ProDeliveryOrder> proDeliveryOrdersOld = BaseDal.Db.Queryable<Dt_ProDeliveryOrder>().Includes(x => x.Details).ToList();
-
- if (eRPProDeliveryDTO.OperateType == 1)
- {
- //鍒ゆ柇閲嶅鎻掑叆
- Dt_ProDeliveryOrder? proDeliveryOrderOld = proDeliveryOrdersOld.FirstOrDefault(x => x.DeliveryCode == eRPProDeliveryDTO.DeliveryCode);
- if (proDeliveryOrderOld != null)
- {
- return content.Error($"閿�鍞嚭搴撳崟鍙穥proDeliveryOrderOld.DeliveryCode}淇℃伅宸插瓨鍦�");
- }
- List<Dt_ProDeliveryOrderDetail> proDeliveryOrderDetails = eRPProDeliveryDTO.DeliveryDetail.Select(x => _mapper.Map<Dt_ProDeliveryOrderDetail>(x)).ToList();
- Dt_ProDeliveryOrder proDeliveryOrderAdd = _mapper.Map<Dt_ProDeliveryOrder>(eRPProDeliveryDTO);
- proDeliveryOrderDetails.ForEach(x =>
- {
- Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
- x.MaterielName = materielInfo?.MaterielName;
- x.Unit = materielInfo?.MaterielUnit;
- });
- proDeliveryOrderAdd.Details = proDeliveryOrderDetails;
- proDeliveryOrderAdd.WarehouseId = warehouse.WarehouseId;
- //鏂板
- BaseDal.Db.InsertNav(proDeliveryOrderAdd).Include(x => x.Details).ExecuteCommand();
}
//else if (eRPPurchaseOrderDTO.OperateType == 2)
--
Gitblit v1.9.3