From ce3b28cdcdb2b6a912413cd9e744d0ecadcb78a0 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 13 一月 2026 17:47:30 +0800
Subject: [PATCH] 优化成品出入库流程代码
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 868 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 484 insertions(+), 384 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 86d454a..5f2ea4b 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -526,7 +526,14 @@
if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
{
- return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == dt_StockInfo.PalletCode);
+ if (returnOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板洖搴撳崟淇℃伅");
+ }
+ return SurplusReturnInbound(task, dt_StockInfo, dt_LocationInfo, lastStatus, returnOrder);
}
// 1. 鑾峰彇鍏ュ簱鍗曚俊鎭�
Dt_InboundOrder? inboundOrder = null;
@@ -680,6 +687,10 @@
if (allCompleted)
{
inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ foreach (var item in inboundOrderDetails)
+ {
+ BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
+ }
}
else
{
@@ -738,45 +749,54 @@
InoutType = inboundOrder.OrderType,
OrderType = inboundOrder.InoutType,
// 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
- DetailList = StockInfos.Select(d => new data.data1.Inbound
- {
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.Details.FirstOrDefault()?.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode,
- LabelList= d.Details
- .Where(detail => detail.StockDetails != null)
- .SelectMany(detail => detail.StockDetails)
- .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
- .Select(stockDetail => stockDetail.BoxCode )
- .ToList()
- }).ToList()
+ DetailList = StockInfos
+ .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
+ .GroupBy(x => new
+ {
+ x.Pallet.PalletCode,
+ x.Detail.MaterielCode,
+ x.Detail.BatchNo,
+ x.Detail.LinId
+ })
+ .Select(g => new data.data1.Inbound
+ {
+ LinId = g.Key.LinId ?? "",
+ MaterielCode = g.Key.MaterielCode ?? "",
+ OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
+ BatchNo = g.Key.BatchNo,
+ LPNNo = g.Key.PalletCode,
+ FinishQty = g.Sum(x => x.Detail.StockQuantity),
+ LocationName = g.First().Pallet.LocationCode,
+ LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
+ .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
+ .Select(sd => sd.BoxCode)
+ .Distinct()
+ .ToList()
+ })
+ .ToList()
}
}
}
}
};
- //var authResult = AuthenticateWithWMS();
- //if (authResult.IsSuccess)
- //{
- // houseInboundPassBack.Context = new Dictionary<string, string>
- // {
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- // };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ houseInboundPassBack.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // // 鍒ゆ柇Success鐨勫��
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // 鍒ゆ柇Success鐨勫��
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
- //}
+ }
}
else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
@@ -806,44 +826,54 @@
InoutType = inboundOrder.OrderType,
OrderType = inboundOrder.InoutType,
ActiveType=1,
- DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
- {
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.Details.FirstOrDefault()?.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode,
- OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
- LabelList= d.Details
- .Where(detail => detail.StockDetails != null)
- .SelectMany(detail => detail.StockDetails)
- .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
- .Select(stockDetail => stockDetail.BoxCode )
- .ToList()
- }).ToList()
+
+ DetailList = StockInfos
+ .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
+ .GroupBy(x => new
+ {
+ x.Pallet.PalletCode,
+ x.Detail.MaterielCode,
+ x.Detail.BatchNo,
+ x.Detail.LinId
+ })
+ .Select(g => new Allocate.data1.Inventory
+ {
+ LinId = g.Key.LinId ?? "",
+ MaterielCode = g.Key.MaterielCode ?? "",
+ OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
+ BatchNo = g.Key.BatchNo,
+ LPNNo = g.Key.PalletCode,
+ FinishQty = g.Sum(x => x.Detail.StockQuantity),
+ LocationName = g.First().Pallet.LocationCode,
+ OrinalLocation = g.First().Detail?.OrinalLocation,
+ LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
+ .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
+ .Select(sd => sd.BoxCode)
+ .Distinct()
+ .ToList()
+ })
+ .ToList()
}
}
}
}
};
- //var authResult = AuthenticateWithWMS();
- //if (authResult.IsSuccess)
- //{
- // inventoryAllocate.Context = new Dictionary<string, string>
- // {
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- // };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ inventoryAllocate.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
- //}
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+ }
}
_unitOfWorkManage.CommitTran();
@@ -1493,104 +1523,152 @@
{
try
{
- Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
- .First();
+ Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>()
+ .Where(x => x.OrderNo == task.OrderNo)
+ .Includes(x => x.Details)
+ .First();
- Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
- .Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode&&x.LPNNo==stockInfo.PalletCode)
- .First();
- //List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
- //foreach (var item in stockInfoDetail)
- //{
- // outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
- // .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
- // .First();
+ List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id &&
+ x.LocationName == stockInfo.LocationCode &&
+ x.LPNNo == stockInfo.PalletCode)
+ .ToList();
- // item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
- //}
+ if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
+ {
+ throw new Exception($"鏈壘鍒版墭鐩� {stockInfo.PalletCode} 鍦ㄨ揣浣� {stockInfo.LocationCode} 涓婄殑鍑哄簱鍗曟槑缁�");
+ }
+
+ // 鑾峰彇搴撳瓨鏄庣粏
+ var stockInfoDetails = stockInfo.Details.ToList();
int overCount = outboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
- foreach (var item in stockInfo.Details)
+ foreach (var stockDetail in stockInfoDetails)
{
- if (outboundOrderDetails == null) continue;
+ var matchingOrderDetails = outboundOrderDetails
+ .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
+ x.BatchNo == stockDetail.BatchNo)
+ .ToList();
- outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;
-
- if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
+ if (matchingOrderDetails.Count == 0)
{
- outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
+ continue;
+ }
+
+ // 璁＄畻闇�瑕佸垎閰嶇殑鏁伴噺
+ decimal remainingStock = stockDetail.OutboundQuantity;
+
+ foreach (var orderDetail in matchingOrderDetails)
+ {
+ if (remainingStock <= 0) break;
+
+ if (orderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt())
+ continue;
+
+ // 璁＄畻鏈鍙互鍒嗛厤鐨勬暟閲�
+ decimal availableOrderQty = orderDetail.OrderQuantity - orderDetail.OverOutQuantity;
+ decimal allocateQty = Math.Min(remainingStock, availableOrderQty);
+
+ if (allocateQty > 0)
+ {
+ orderDetail.OverOutQuantity += allocateQty;
+ remainingStock -= allocateQty;
+
+ // 妫�鏌ユ槸鍚﹀畬鎴�
+ if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
+ {
+ orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ }
}
}
+ // 鏇存柊璁㈠崟鐘舵��
if (outboundOrder.Details.Count == overCount)
{
outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
-
_unitOfWorkManage.BeginTran();
- ///鏇存柊鍑哄簱鍗�
- _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
- // 鏇存柊鍑哄簱璁㈠崟璇︽儏
- _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- // 鏇存柊搴撳瓨鐘舵��
- AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
-
- // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
- if (outboundOrder.System == null)
+ try
{
- return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
- }
- if (!outboundOrder.System.Equals("SMOM"))
- {
- UpdateLocationStatus(locationInfo);
- }
- // 澶勭悊浠诲姟瀹屾垚
- CompleteTask(task);
+ // 鏇存柊鍑哄簱鍗�
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
- // 娣诲姞鐘舵�佸彉鏇磋褰�
- AddStatusChangeRecord(task, stockInfo, locationInfo);
-
- string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
- string fullPath = AppDomain.CurrentDomain.BaseDirectory;
- var url = Path.Combine(fullPath, "wwwroot", "Reports");
- string savePath = Path.Combine(url, "鏈鍑哄簱.pdf");
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
- {
- FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
- DownloadReport(path, savePath, outboundOrderDetails.Id);
- }
- ///鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
- if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.System.Equals("SMOM"))
- {
- var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
- List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+ AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
- if (outStockLockInfo.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
- //閲囪喘鍑哄簱
- if (outboundOrder.OrderType == 1)
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (outboundOrder.System == null)
{
- var passBack = new HouseoutboundPassBack
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
+ }
+
+ if (!outboundOrder.System.Equals("SMOM"))
+ {
+ UpdateLocationStatus(locationInfo);
+ }
+
+ // 澶勭悊浠诲姟瀹屾垚
+ CompleteTask(task);
+
+ // 娣诲姞鐘舵�佸彉鏇磋褰�
+ AddStatusChangeRecord(task, stockInfo, locationInfo);
+
+ string path = "http://fr.mankun.com:8080/webroot/decision/view/report?viewlet=fr-report\\SMOM/Product/Produce/OutBoundDetileReport.cpt&op=write&format=pdf";
+ string fullPath = AppDomain.CurrentDomain.BaseDirectory;
+ var url = Path.Combine(fullPath, "wwwroot", "Reports");
+ string savePath = Path.Combine(url, "鏈鍑哄簱.pdf");
+
+ // ERP绯荤粺鍙嶉
+ if (outboundOrder.System.Equals("ERP"))
+ {
+ // 涓烘瘡涓畬鎴愮殑鏄庣粏鍙嶉ERP
+ foreach (var orderDetail in outboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
{
- ApiType = "ShippingOrderController",
- Method = "AsrsOutboundSO",
- Parameters = new List<HouseoutboundPassBack.datas>
+ FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
+ }
+
+ // 濡傛灉鏈夊畬鎴愮殑鏄庣粏锛屼笅杞芥姤琛�
+ if (outboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
+ {
+ DownloadReport(path, savePath, outboundOrderDetails.First().Id);
+ }
+ }
+
+ // 鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
+ if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.System.Equals("SMOM"))
+ {
+ var outStockLockInfoList = _outboundService.OutboundStockLockInfoService.Repository
+ .QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+
+ if (outStockLockInfoList.Count == 0)
+ throw new Exception($"璁㈠崟 {outboundOrder.OrderNo} 鎵樼洏 {stockInfo.PalletCode} 鏈壘鍒板簱瀛橀攣瀹氫俊鎭�");
+
+ // 閲囪喘鍑哄簱
+ if (outboundOrder.OrderType == 1)
+ {
+ var passBack = new HouseoutboundPassBack
{
- new HouseoutboundPassBack.datas
- {
- Value = new List<HouseoutboundPassBack.datas.data1>
- {
- new HouseoutboundPassBack.datas.data1
- {
- No = outboundOrder.OrderNo,
- OutWareHouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- DetailList = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
+ {
+ new HouseoutboundPassBack.datas
+ {
+ Value = new List<HouseoutboundPassBack.datas.data1>
+ {
+ new HouseoutboundPassBack.datas.data1
+ {
+ No = outboundOrder.OrderNo,
+ OutWareHouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ DetailList = outStockLockInfoList.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
{
LinId = d.LinId?? "",
LPN_No = d.PalletCode,
@@ -1601,98 +1679,104 @@
LocationName = d.LocationCode
})
.ToList()
+ }
+ }
+ }
+ }
+ };
- }
+ //璋冪敤SMOM鎺ュ彛...
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ passBack.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
}
}
- }
- };
+ }
- // var authResult = AuthenticateWithWMS();
- // if (authResult.IsSuccess)
- // {
- // passBack.Context = new Dictionary<string, string>
- //{
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- //};
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskout, passBack, "绔嬪簱鍑哄簱鏁伴噺鍥炰紶WMS");
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
- // }
- }
- //璋冩嫧鍑哄簱
- if (outboundOrder.OrderType == 2)
- {
- var allocate = new InventoryAllocate
+ // 璋冩嫧鍑哄簱
+ if (outboundOrder.OrderType == 2)
{
- ApiType = "InventoryAllocateController",
- Method = "AsrsFinishedStockCount",
- Parameters = new List<Allocate>
+ var allocate = new InventoryAllocate
{
- new Allocate
- {
- Value = new List<Allocate.data1>
- {
- new Allocate.data1
- {
- No = outboundOrder.OrderNo,
- InWarehouse = task.Roadway,
- TransactionCode = outboundOrder.TransactionCode,
- InoutType = outboundOrder.OrderType,
- OrderType = outboundOrder.InoutType,
- ActiveType=2,
- DetailList = outStockLockInfo.Select(item =>
+ ApiType = "InventoryAllocateController",
+ Method = "AsrsFinishedStockCount",
+ Parameters = new List<Allocate>
+ {
+ new Allocate
+ {
+ Value = new List<Allocate.data1>
+ {
+ new Allocate.data1
+ {
+ No = outboundOrder.OrderNo,
+ InWarehouse = task.Roadway,
+ TransactionCode = outboundOrder.TransactionCode,
+ InoutType = outboundOrder.OrderType,
+ OrderType = outboundOrder.InoutType,
+ ActiveType = 2,
+ DetailList = outStockLockInfoList.Select(item =>
{
return new Allocate.data1.Inventory
{
- LinId = outboundOrderDetails.LinId,
+ LinId = item.LinId,
LPNNo = item.PalletCode,
- MaterielCode = outboundOrderDetails.MaterielCode,
- OrderQuantity = outboundOrderDetails.OrderQuantity,
- BatchNo = outboundOrderDetails.BatchNo,
- FinishQty = outboundOrderDetails.OrderQuantity,
- OrinalLocation=outboundOrderDetails.OrinalLocation,
+ MaterielCode = item.MaterielCode,
+ OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ FinishQty = item.OrderQuantity,
LocationName = task.SourceAddress
};
}).ToList()
- }
- }
- }
- }
- };
-
- //var authResult = AuthenticateWithWMS();
- //if (authResult.IsSuccess)
- //{
- // allocate.Context = new Dictionary<string, string>
- //{
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- //};
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
- //}
+ }
}
}
-
- if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
- {
- // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
- }
-
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
}
- catch
+ };
+
+ // 璋冪敤SMOM鎺ュ彛...
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ allocate.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, allocate, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+ }
+ }
+ }
+
+ if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
+ {
+ // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
+ catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
- throw;
+ return WebResponseContent.Instance.Error($"澶勭悊澶辫触: {ex.Message}");
}
}
else
@@ -2202,7 +2286,7 @@
}
//鎴愬搧鍥炲簱鍗�
- private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
+ private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, List<Dt_NewOutboundOrderDetail> outboundOrderDetails)
{
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.Where(x => x.StockId == stockInfo.Id)
@@ -2212,202 +2296,218 @@
{
throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
}
-
- // 鎵惧埌涓庡綋鍓嶅嚭搴撳崟鏄庣粏鍖归厤鐨勫簱瀛樻槑缁�
- var matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
- x.MaterielCode == outboundOrderDetail.MaterielCode &&
- x.BatchNo == outboundOrderDetail.BatchNo);
-
- if (matchedStockDetail == null)
+ _unitOfWorkManage.BeginTran();
+ try
{
- throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outboundOrderDetail.MaterielCode}, 鎵规:{outboundOrderDetail.BatchNo}");
- }
-
- if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
- {
- Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
- x.LPNNo == stockInfo.PalletCode &&
- x.LocationCode == stockInfo.LocationCode &&
- x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
-
- if (returnOrder == null)
+ if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
{
- throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
- }
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
+ x.LPNNo == stockInfo.PalletCode &&
+ x.LocationCode == stockInfo.LocationCode &&
+ x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
- // 鍙噺鍘诲崟鎹槑缁嗕腑鐨勬暟閲�
- matchedStockDetail.OutboundQuantity = 0;
- matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OrderNo = returnOrder.OrderNo;
-
- // 鏇存柊搴撳瓨鐘舵��
- stockInfo.LocationCode = "";
- stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
- stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
-
- // 鏇存柊鍖归厤鐨勬槑缁�
- _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
- }
- else
- {
- // 璁＄畻褰撳墠鎵规鐨勫墿浣欐暟閲�
- decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;
-
- _unitOfWorkManage.BeginTran();
-
- try
- {
- if (remainingQuantity > 0)
+ if (returnOrder == null)
{
- // 涓哄綋鍓嶆壒娆″垱寤鸿繑搴撳崟
- Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
+ }
+ foreach (var outDetail in outboundOrderDetails)
+ {
+ var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
+ if (matchedStockDetail == null)
{
- MaterielCode = matchedStockDetail.MaterielCode,
- MaterielName = matchedStockDetail.MaterielName,
- BatchNo = matchedStockDetail.BatchNo,
- OrderQuantity = remainingQuantity,
- ReceiptQuantity = remainingQuantity,
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
+ x.MaterielCode == outDetail.MaterielCode);
+
+ if (matchedStockDetail == null)
+ {
+ throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outDetail.MaterielCode}, 鎵规:{outDetail.BatchNo}");
+ }
+ }
+ // 鍙噺鍘诲崟鎹槑缁嗕腑鐨勬暟閲�
+ matchedStockDetail.OutboundQuantity = 0;
+ matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
+ matchedStockDetail.OrderNo = returnOrder.OrderNo;
+ // 鏇存柊鍖归厤鐨勬槑缁�
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+ }
+
+
+ // 鏇存柊搴撳瓨鐘舵��
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ }
+ else
+ {
+ var groupedDetails = outboundOrderDetails
+ .GroupBy(d => new { d.MaterielCode, d.BatchNo })
+ .ToList();
+ List<Dt_StockInfoDetail> processedStockDetails = new List<Dt_StockInfoDetail>();
+ List<Dt_ReturnOrder> returnOrders = new List<Dt_ReturnOrder>();
+
+ decimal totalOutboundQuantity = outboundOrderDetails.Sum(x => x.OrderQuantity);
+ decimal totalStockQuantity = stockInfoDetails.Sum(x => x.StockQuantity);
+
+ foreach (var groupeDetail in groupedDetails)
+ {
+ var outboundDetail = groupeDetail.First();
+ decimal totalOrderQuantity = groupeDetail.Sum(x => x.OrderQuantity);
+ var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
+ if (matchedStockDetail == null)
+ {
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
+ x.MaterielCode == outboundDetail.MaterielCode);
+
+ if (matchedStockDetail == null)
+ {
+ throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outboundDetail.MaterielCode}, 鎵规:{outboundDetail.BatchNo}");
+ }
+ }
+ // 璁＄畻褰撳墠鎵规鐨勫墿浣欐暟閲�
+ decimal remainingQuantity = matchedStockDetail.StockQuantity - totalOrderQuantity;
+
+ if (remainingQuantity > 0)
+ {
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = matchedStockDetail.MaterielCode,
+ MaterielName = matchedStockDetail.MaterielName,
+ BatchNo = matchedStockDetail.BatchNo,
+ OrderQuantity = remainingQuantity,
+ ReceiptQuantity = remainingQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = matchedStockDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS",
+ Remark = "澶氭壒娆¤繑搴�" // 娣诲姞澶囨敞鏍囪瘑
+ };
+
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ returnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+ // 娣诲姞杩斿簱鍗�
+ returnOrders.Add(returnOrder);
+
+ // 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
+ matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
+ //matchedStockDetail.OrderNo = returnOrder.OrderNo;
+ }
+ else if (remainingQuantity == 0)
+ {
+ // 褰撳墠鎵规姝ｅソ鍑哄畬
+ matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
+ if (matchedStockDetail.StockQuantity == totalOrderQuantity)
+ {
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(
+ matchedStockDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ matchedStockDetail.StockQuantity = 0;
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+ }
+ }
+ else
+ {
+ throw new Exception($"鍑哄簱鏁伴噺 {outboundDetail.OrderQuantity} 澶т簬搴撳瓨鏁伴噺 {matchedStockDetail.StockQuantity}");
+ }
+ processedStockDetails.Add(matchedStockDetail);
+ }
+
+ // 澶勭悊鍏朵粬鎵规鐨勫簱瀛樻槑缁嗭紙鍏ㄩ儴杩斿簱锛�
+ var otherBatchDetails = stockInfoDetails
+ .Where(x => !processedStockDetails.Contains(x) && x.StockQuantity > 0)
+ .ToList();
+
+ if (otherBatchDetails.Count > 0)
+ {
+ decimal totalOtherQuantity = otherBatchDetails.Sum(x => x.StockQuantity);
+
+ // 涓哄叾浠栨壒娆″垱寤鸿繑搴撳崟锛堝彧鍒涘缓涓�涓紝鍖呭惈鎵�鏈夋壒娆★級
+ var firstOtherDetail = otherBatchDetails.First();
+ Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = firstOtherDetail.MaterielCode,
+ MaterielName = firstOtherDetail.MaterielName,
+ BatchNo = firstOtherDetail.BatchNo,
+ OrderQuantity = totalOtherQuantity,
+ ReceiptQuantity = totalOtherQuantity,
OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = matchedStockDetail.LinId,
+ LinId = firstOtherDetail.LinId,
LPNNo = stockInfo.PalletCode,
Creater = "LK",
CreateDate = DateTime.Now,
OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
+ System = "WMS",
+ Remark = $"澶氭壒娆¤繑搴擄紝鍏眥otherBatchDetails.Count}涓壒娆�"
};
+ if (outboundOrder.System == "SMOM" && !string.IsNullOrEmpty(stockInfo.LocationCode))
+ {
+ otherReturnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+
+ returnOrders.Add(otherReturnOrder);
+ }
+
+ // 鎵归噺鏇存柊宸插鐞嗙殑搴撳瓨鏄庣粏
+ var updateDetails = processedStockDetails.Where(x => x.StockQuantity > 0).ToList();
+ if (updateDetails.Any())
+ {
+ _stockService.StockInfoDetailService.Repository.UpdateData(updateDetails);
+ }
+
+ // 娣诲姞杩斿簱鍗�
+ if (returnOrders.Any())
+ {
+ _returnOrderRepository.AddData(returnOrders);
+ }
+
+ // 鏇存柊搴撳瓨涓昏〃鐘舵��
+ decimal returnQuantity = totalStockQuantity - totalOutboundQuantity;
+ if (returnQuantity == 0)
+ {
if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
{
- returnOrder.LocationCode = stockInfo.LocationCode;
+ Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicRepository.LocationInfoRepository.UpdateData(dt_LocationInfo);
}
-
- // 娣诲姞杩斿簱鍗�
- _returnOrderRepository.AddData(returnOrder);
-
- // 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OutboundQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OrderNo = returnOrder.OrderNo;
-
- _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
-
- // 澶勭悊鍏朵粬鎵规鐨勫簱瀛樻槑缁嗭紙鍏ㄩ儴杩斿簱锛�
- var otherBatchDetails = stockInfoDetails
- .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
- .ToList();
-
- foreach (var otherDetail in otherBatchDetails)
+ // 鍏ㄩ儴鍑哄簱锛屽垹闄ゅ簱瀛�
+ DeleteAndMoveIntoHtStockStatus(stockInfo);
+ foreach (var item in stockInfo.Details)
{
- if (otherDetail.StockQuantity > 0)
- {
- // 涓哄叾浠栨壒娆″垱寤鸿繑搴撳崟
- Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
- {
- MaterielCode = otherDetail.MaterielCode,
- MaterielName = otherDetail.MaterielName,
- BatchNo = otherDetail.BatchNo,
- OrderQuantity = otherDetail.StockQuantity,
- ReceiptQuantity = otherDetail.StockQuantity,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = otherDetail.LinId,
- LPNNo = stockInfo.PalletCode,
- Creater = "LK",
- CreateDate = DateTime.Now,
- OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
- };
-
- if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
- {
- otherReturnOrder.LocationCode = stockInfo.LocationCode;
- }
-
- _returnOrderRepository.AddData(otherReturnOrder);
-
- // 鍏朵粬鎵规鍏ㄩ儴杩斿簱锛屽簱瀛樻竻闆�
- otherDetail.StockQuantity = 0;
- otherDetail.OutboundQuantity = 0;
- otherDetail.OrderNo = otherReturnOrder.OrderNo;
-
- _stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
- }
+ BaseDal.Db.Deleteable(item.StockDetails).ExecuteCommand();
}
-
- // 鏇存柊搴撳瓨涓昏〃鐘舵��
+ }
+ else if (returnQuantity > 0)
+ {
+ // 鏈変綑鏂欒繑搴�
stockInfo.LocationCode = "";
stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
- stockInfo.Remark = "浣欐枡閫�搴�";
+ stockInfo.Remark = $"浣欐枡閫�搴擄紝鍏眥returnOrders.Count}涓繑搴撳崟";
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
}
- else if (remainingQuantity == 0)
- {
- // 褰撳墠鎵规姝ｅソ鍑哄畬
- matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
- _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // 鍏朵粬鎵规鍏ㄩ儴杩斿簱
- var otherBatchDetails = stockInfoDetails
- .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
- .ToList();
-
- foreach (var otherDetail in otherBatchDetails)
- {
- if (otherDetail.StockQuantity > 0)
- {
- Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
- {
- MaterielCode = otherDetail.MaterielCode,
- MaterielName = otherDetail.MaterielName,
- BatchNo = otherDetail.BatchNo,
- OrderQuantity = otherDetail.StockQuantity,
- ReceiptQuantity = otherDetail.StockQuantity,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = otherDetail.LinId,
- LPNNo = stockInfo.PalletCode,
- Creater = "LK",
- CreateDate = DateTime.Now,
- OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
- };
-
- if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
- {
- otherReturnOrder.LocationCode = stockInfo.LocationCode;
- }
-
- _returnOrderRepository.AddData(otherReturnOrder);
- }
- }
-
- // 濡傛灉鎵�鏈夋壒娆￠兘鍑哄畬浜嗭紝鍒犻櫎搴撳瓨
- var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
- if (totalRemaining == 0)
- {
- DeleteAndMoveIntoHtStockStatus(stockInfo);
- }
- else
- {
- // 杩樻湁搴撳瓨锛屾洿鏂扮姸鎬�
- stockInfo.LocationCode = "";
- stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
- stockInfo.Remark = "浣欐枡閫�搴�";
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- }
- }
- else
- {
- throw new Exception($"鍑哄簱鏁伴噺 {outboundOrderDetail.OrderQuantity} 澶т簬搴撳瓨鏁伴噺 {matchedStockDetail.StockQuantity}");
- }
-
- _unitOfWorkManage.CommitTran();
}
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
+ _unitOfWorkManage.CommitTran();
}
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+
}
+
/// <summary>
/// 鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP(琛ㄥ崟鎻愪氦)
/// </summary>
--
Gitblit v1.9.3