From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码,ERP接口,MES接口优化,WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
index bfaba6f..fe77850 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_InboundService/ReturnBSTOrderService.cs"
@@ -6,6 +6,7 @@
using System.Threading.Tasks;
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Common.WareHouseEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
@@ -96,6 +97,19 @@
List<Dt_ReturnBSTOrderDetail> bSTOrderDetails = item.BstPaperWreturnDetails.Select(x => _mapper.Map<Dt_ReturnBSTOrderDetail>(x)).ToList();
Dt_ReturnBSTOrder returnBSTOrder = _mapper.Map<Dt_ReturnBSTOrder>(item);
returnBSTOrder.Details = bSTOrderDetails;
+ foreach (var detail in bSTOrderDetails)
+ {
+ Dt_StockInfo stockReturn = stockInfosUpdate.FirstOrDefault(x => x.PalletCode == detail.Barcode);
+ stockReturn.MaterielId = detail.MaterialId;
+ stockReturn.MaterielCode = detail.MaterialNo;
+ stockReturn.MaterielWide=detail.MaterialWide;
+ stockReturn.MaterielThickness = detail.MaterialThick;
+ stockReturn.MaterielWeight = detail.Qty;
+ stockReturn.StockLength = detail.ProcurementLength;
+ stockReturn.StockOutLength = 0;
+ stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�搴�.ObjToInt();
+ stockInfosUpdate.Add(stockReturn);
+ }
returnAddBSTOrders.Add(returnBSTOrder);
}
}
@@ -135,6 +149,19 @@
List<Dt_ReturnBSTOrderDetail> bSTOrderDetails = item.BstPaperWreturnDetails.Select(x => _mapper.Map<Dt_ReturnBSTOrderDetail>(x)).ToList();
Dt_ReturnBSTOrder returnBSTOrder = _mapper.Map<Dt_ReturnBSTOrder>(item);
returnBSTOrder.Details = bSTOrderDetails;
+ foreach (var detail in bSTOrderDetails)
+ {
+ Dt_StockInfo stockReturn = stockInfosUpdate.FirstOrDefault(x => x.PalletCode == detail.Barcode);
+ stockReturn.MaterielId = detail.MaterialId;
+ stockReturn.MaterielCode = detail.MaterialNo;
+ stockReturn.MaterielWide = detail.MaterialWide;
+ stockReturn.MaterielThickness = detail.MaterialThick;
+ stockReturn.MaterielWeight = detail.Qty;
+ stockReturn.StockLength = detail.ProcurementLength;
+ stockReturn.StockOutLength = 0;
+ stockReturn.StockStatus = StockStatusEmun.鑰佸巶閫�搴�.ObjToInt();
+ stockInfosUpdate.Add(stockReturn);
+ }
returnAddBSTOrders.Add(returnBSTOrder);
}
}
@@ -148,6 +175,7 @@
//鏇存柊鏁版嵁
_unitOfWorkManage.BeginTran();
BaseDal.Db.InsertNav(returnAddBSTOrders).Include(x => x.Details).ExecuteCommand();
+ _stockInfoRepository.UpdateData(stockInfosUpdate);
_returnBSTOrderDetailRepository.DeleteData(returnBSTOrderDetailsDel);
BaseDal.Db.UpdateNav(returnUpdateBSTOrders).Include(x => x.Details).ExecuteCommand();
_unitOfWorkManage.CommitTran();
--
Gitblit v1.9.3