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/InboundOrderService.cs | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 67 insertions(+), 34 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
index f4cc385..26620b4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/InboundOrderService.cs"
@@ -16,6 +16,7 @@
using WIDESEA_DTO.ERP;
using WIDESEA_Core.Helper;
using System.Security.Cryptography;
+using WIDESEA_Common.WareHouseEnum;
namespace WIDESEA_InboundService
{
@@ -42,6 +43,10 @@
{
return content.Error("鍏ュ簱淇℃伅涓嶈兘浼犲叆涓虹┖");
}
+ if (eRPInboundOrderDTO.InboundDetail == null || eRPInboundOrderDTO.InboundDetail.Count <= 0)
+ {
+ return content.Error("鍏ュ簱鏄庣粏淇℃伅涓嶈兘浼犲叆涓虹┖");
+ }
Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == eRPInboundOrderDTO.WarehouseCode);
if (warehouse == null)
{
@@ -55,9 +60,10 @@
{
return content.Error($"鍏ュ簱鏉＄爜{nameof(inboundDetailItem.BarCode)}:{inboundDetailItem.BarCode}鐗╂枡:{inboundDetailItem.MaterialCode}涓嶅瓨鍦�");
}
- //鑾峰彇鎵�鏈夐噰璐俊鎭�
+ //鑾峰彇鎵�鏈夊叆搴撲俊鎭�
List<Dt_InboundOrder> inboundOrdersOld = BaseDal.Db.Queryable<Dt_InboundOrder>().Includes(x => x.Details).ToList();
-
+ //鑾峰彇鎵�鏈夊叆搴撴槑缁嗕俊鎭�
+ List<Dt_InboundOrderDetail> inboundOrderDetailsOld = inboundOrdersOld.SelectMany(x=>x.Details).ToList();
if (eRPInboundOrderDTO.OperateType == 1)
{
//鍒ゆ柇閲嶅鎻掑叆
@@ -71,46 +77,73 @@
inboundOrderDetails.ForEach(x =>
{
Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ if (warehouse.WarehouseCode==WarehouseEnum.LLDYL.ToString() && x.MaterialThick<= 0)
+ {
+ throw new Exception($"鐗╂枡{x.MaterialCode}鏉＄爜{x.BarCode}鐩村緞闇�澶т簬0");
+ }
+ if (inboundOrderDetailsOld.FirstOrDefault(t=>t.BarCode==x.BarCode)!=null)
+ {
+ throw new Exception($"鍏ュ簱鍗晎inboundOrder.UpperOrderNo}鏉＄爜{x.BarCode}宸插瓨鍦�");
+ }
x.MaterialName = materielInfo?.MaterielName;
x.Unit = materielInfo?.MaterielUnit;
+ x.MaterialSpec = materielInfo.MaterielSpec;
});
inboundOrder.Details = inboundOrderDetails;
inboundOrder.WarehouseId = warehouse.WarehouseId;
//鏂板
BaseDal.Db.InsertNav(inboundOrder).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 (eRPInboundOrderDTO.OperateType == 2)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_InboundOrder? inboundOrderOld = inboundOrdersOld.FirstOrDefault(x => x.UpperOrderNo == eRPInboundOrderDTO.InboundCode);
+ if (inboundOrderOld == null)
+ {
+ return content.Error($"鍏ュ簱鍗曞崟鍙穥eRPInboundOrderDTO.InboundCode}淇℃伅涓嶅瓨鍦�");
+ }
+ if (inboundOrderOld.InboundOrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return content.Error($"鍏ュ簱鍗曞崟鍙穥inboundOrderOld.InboundOrderNo}鐘舵�佷负{(InOrderStatusEnum)inboundOrderOld.InboundOrderStatus}");
+ }
+ List<string> barCodesOld = inboundOrderOld.Details.Select(x => x.BarCode).ToList();
+ List<Dt_InboundOrderDetail> inboundOrderDetails = eRPInboundOrderDTO.InboundDetail.Select(x => _mapper.Map<Dt_InboundOrderDetail>(x)).ToList();
+ Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(eRPInboundOrderDTO);
+ inboundOrderDetails.ForEach(x =>
+ {
+ Dt_MaterielInfo? materielInfo = materielInfos.FirstOrDefault(t => t.MaterielCode == x.MaterialCode);
+ if (warehouse.WarehouseCode == WarehouseEnum.LLDYL.ToString() && x.MaterialThick <= 0)
+ {
+ throw new Exception($"鐗╂枡{x.MaterialCode}鏉＄爜{x.BarCode}鐩村緞闇�澶т簬0");
+ }
+ if (inboundOrderDetailsOld.FirstOrDefault(t => t.BarCode == x.BarCode) != null && !barCodesOld.Contains(x.BarCode))
+ {
+ throw new Exception($"鍏ュ簱鍗晎inboundOrder.UpperOrderNo}鏉＄爜{x.BarCode}宸插瓨鍦�");
+ }
+ x.MaterialName = materielInfo?.MaterielName;
+ x.Unit = materielInfo?.MaterielUnit;
+ x.MaterialSpec = materielInfo.MaterielSpec;
+ });
+ inboundOrder.Details = inboundOrderDetails;
+ inboundOrder.WarehouseId = warehouse.WarehouseId;
+ //鏇存柊
+ BaseDal.Db.UpdateNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
+ }
+ else if (eRPInboundOrderDTO.OperateType == 3)
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ Dt_InboundOrder? inboundOrderOld = inboundOrdersOld.FirstOrDefault(x => x.UpperOrderNo == eRPInboundOrderDTO.InboundCode);
+ if (inboundOrderOld == null)
+ {
+ return content.Error($"鍏ュ簱鍗曞崟鍙穥eRPInboundOrderDTO.InboundCode}淇℃伅涓嶅瓨鍦�");
+ }
+ if (inboundOrderOld.InboundOrderStatus != InOrderStatusEnum.鏈紑濮�.ObjToInt())
+ {
+ return content.Error($"鍏ュ簱鍗曞崟鍙穥inboundOrderOld.InboundOrderNo}鐘舵�佷负{(InOrderStatusEnum)inboundOrderOld.InboundOrderStatus}");
+ }
+ //鍒犻櫎
+ BaseDal.Db.DeleteNav(inboundOrderOld).Include(x => x.Details).ExecuteCommand();
+ }
else
{
return content.Error("鏈壘鍒版搷浣滅被鍨�");
--
Gitblit v1.9.3