From 7af31afc6df4ca90c4d6e5c561313b9758ccc4aa Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期四, 22 一月 2026 09:31:23 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
index 93af907..28bdeab 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/NewPartialTaskService_Outbound.cs
@@ -65,6 +65,7 @@
}
List<int> orderId = newOutboundOrderDetails.Select(x => x.OrderId).Distinct().ToList();
List<Dt_NewOutboundOrder> outboundOrders = _outboundService.NewOutboundOrderService.Repository.QueryData(x => orderId.Contains(x.Id));
+ _unitOfWorkManage.BeginTran();
var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutProduct);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
List<string> palletcodelpn = new List<string>();
@@ -103,7 +104,7 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
@@ -143,7 +144,7 @@
{
throw new Exception("鏈壘鍒板簱瀛樹俊鎭�,鎴栧簱瀛樼姸鎬佷笉涓哄叆搴撳畬鎴�");
}
-
+ _unitOfWorkManage.BeginTran();
var Newtasks = GetTasks(stockInfos, TaskTypeEnum.OutSyncretism);
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Repository.QueryData(x => stockInfos.Select(x => x.Id).Contains(x.StockId));
foreach (var item in stockInfos)
@@ -157,7 +158,7 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
@@ -199,10 +200,16 @@
throw new Exception("鎵�閫夊嚭搴撳崟鏄庣粏瀛樺湪鍑哄簱涓垨宸插畬鎴�");
}
List<Dt_StockInfo> stockInfos = new List<Dt_StockInfo>();
+ _unitOfWorkManage.BeginTran();
foreach (var takeStock in takeStockOrderCPs)
{
+ takeStock.TakeStockStatus = TakeStockStatusEnum.鐩樼偣涓�.ObjToInt();
List<Dt_TakeStockOrderDetailCP> takeStockOrderDetailCPs = _takeStockOrderDetailCPRepository.QueryData(x => x.TakeStockId == takeStock.Id);
-
+ foreach (var item in takeStockOrderDetailCPs)
+ {
+ item.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱涓�.ObjToInt();
+ _takeStockOrderDetailCPRepository.UpdateData(item);
+ }
var lpngroup = takeStockOrderDetailCPs.GroupBy(x => x.TakePalletCode);
foreach (var lpngroups in lpngroup)
{
@@ -233,11 +240,12 @@
}
locationInfos.AddRange(_basicService.LocationInfoService.Repository.GetLocationInfos(stockInfos.Select(x => x.LocationCode).ToList()));
- _unitOfWorkManage.BeginTran();
+
BaseDal.AddData(tasks);
_stockService.StockInfoService.Repository.UpdateData(stockInfos);
_stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetails);
+ _takeStockOrderCPRepository.UpdateData(takeStockOrderCPs);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfos, LocationStatusEnum.Lock.ObjToInt(), StockChangeType.Outbound.ObjToInt(), "", tasks?.Select(x => x.TaskNum).ToList());
_basicService.LocationInfoService.Repository.UpdateLocationStatus(locationInfos, LocationStatusEnum.Lock);
@@ -262,19 +270,25 @@
WebResponseContent responseContent = new WebResponseContent();
try
{
+ if (houseAdjustment.DetailList.Count == 0)
+ {
+ return WebResponseContent.Instance.Error("鏃犳槑缁嗕俊鎭�");
+ }
+ List<Dt_StockInfoDetail> stockdetail = new List<Dt_StockInfoDetail>();
foreach (var item in houseAdjustment.DetailList)
{
- Dt_StockInfoDetail dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
- .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.MaterielName == item.MaterielName && stockdetail.LinId == item.LinId && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
- if (dt_StockInfo == null)
+ var dt_StockInfo = BaseDal.Db.Queryable<Dt_StockInfoDetail>().LeftJoin<Dt_StockInfo>((stockdetail, stock) => stockdetail.StockId == stock.Id)
+ .Where((stockdetail, stock) => stockdetail.MaterielCode == item.MaterielCode && stockdetail.BatchNo == item.BatchNo && stock.PalletCode == item.LPNNo).Select((stockdetail, stock) => stockdetail).First();
+ if (dt_StockInfo != null)
{
- return WebResponseContent.Instance.Error("鏈壘鍒版搴撳瓨鏁版嵁");
+ dt_StockInfo.StockQuantity = item.OrderQuantity;
+ stockdetail.Add(dt_StockInfo);
}
- dt_StockInfo.StockQuantity = item.OrderQuantity;
- _unitOfWorkManage.BeginTran();
- _stockInfoDetailRepository.UpdateData(dt_StockInfo);
- _unitOfWorkManage.CommitTran();
+
}
+ _unitOfWorkManage.BeginTran();
+ _stockInfoDetailRepository.UpdateData(stockdetail);
+ _unitOfWorkManage.CommitTran();
}
catch (Exception ex)
{
--
Gitblit v1.9.3