From 513da724807c2fed2d4ec772b31d054a550d391a Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期三, 28 一月 2026 14:13:55 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 616 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 425 insertions(+), 191 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 170c786..35e8717 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -108,6 +108,7 @@
private readonly IOutboundOrderDetailRepository _outboundOrderDetailRepository;
private readonly INewOutboundOrderDetailRepository _newOutboundOrderDetailRepository;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
+ private readonly IStockInfoDetailCPRepository _stockInfoDetailCPRepository;
private readonly IReturnOrderRepository _returnOrderRepository;
private readonly IProductionRepository _productionRepository;
private readonly IInboundRepository _inboundRepository;
@@ -115,7 +116,7 @@
private readonly ITakeStockOrderDetailCPRepository _takeStockOrderDetailCPRepository;
public ITaskRepository Repository => BaseDal;
- public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IMapper mapper, IUnitOfWorkManage unitOfWorkManage, IMaterielInfoService materielInfoService, IInboundOrderDetail_HtyService inboundOrderDetail_HtyService, IOutboundOrder_HtyService outboundOrder_HtyService, IOutboundOrderDetail_HtyService outboundOrderDetail_HtyService, IInboundOrder_HtyService inboundOrder_HtyService, IStockRepository stockRepository, IInboundOrderDetailService inboundOrderDetailService, IBasicService basicService, IOutboundService outboundService, IInboundService inboundService, IRecordService recordService, IStockService stockService, ITask_HtyService taskHtyService, ILocationInfoService locationInfoService, IOutboundOrderDetailRepository outboundOrderDetailRepository, IBasicRepository basicRepository, IStockInfoDetailRepository stockInfoDetailRepository, IPalletTypeInfoRepository palletTypeInfoRepository, IReturnOrderRepository returnOrderRepository, IProductionRepository productionRepository, IInboundRepository inboundRepository, INewOutboundOrderDetailRepository newOutboundOrderDetailRepository, ITakeStockOrderCPRepository takeStockOrderCPRepository, ITakeStockOrderDetailCPRepository takeStockOrderDetailCPRepository, IStockInfoDetailCPRepository stockInfoDetailCPRepository) : base(BaseDal)
{
_mapper = mapper;
_stockRepository = stockRepository;
@@ -143,6 +144,7 @@
_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
_takeStockOrderCPRepository = takeStockOrderCPRepository;
_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
+ _stockInfoDetailCPRepository = stockInfoDetailCPRepository;
}
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -559,9 +561,9 @@
return WebResponseContent.Instance.Error("鏈壘鍒板叆搴撳崟淇℃伅");
}
var allBoxCodesForDetail = BaseDal.Db.Queryable<Dt_StockInfoDetailCP>()
- .Where(x => x.StockDetailId == dt_StockInfo.Details.FirstOrDefault().Id)
- .Select(x => x.BoxCode)
- .ToList();
+ .Where(x => dt_StockInfo.Details.Select(d => d.Id).Contains(x.StockDetailId))
+ .Select(x => x.BoxCode)
+ .ToList();
// 2. 鑾峰彇鎵樼洏涓嬬殑鎵�鏈夌鍙�
var boxCodes = new List<string>();
@@ -638,14 +640,6 @@
.ToList();
}
- // 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
- if (cpInboundDetails.Any())
- {
- foreach (var cpDetail in cpInboundDetails)
- {
- cpDetail.CPOrderDetailStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
- }
- }
// 4. 鏌ヨ骞舵洿鏂版垚鍝佸簱瀛樻槑缁嗭紙濡傛灉鏈夊崟鐙殑鎴愬搧搴撳瓨琛級
List<Dt_StockInfoDetailCP> cpStockDetails = new List<Dt_StockInfoDetailCP>();
@@ -707,7 +701,7 @@
// 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
if (cpInboundDetails.Any())
{
- BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
+ BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
}
// 鏇存柊鎴愬搧搴撳瓨鏄庣粏鐘舵��
@@ -988,7 +982,7 @@
// 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
{
- if(inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
{
bool allCompleted = inboundOrder.Details.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
if (allCompleted)
@@ -1139,7 +1133,7 @@
int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
{
// 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
- UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
+ UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
///鏇存柊搴撳瓨鐘舵��
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
// 鏇存柊搴撳瓨鏄庣粏鐘舵��
@@ -1162,21 +1156,21 @@
AddRecords(task, stockInfo, locationInfo, lastStatus);
// 鏇存柊鍏ュ簱鍗�
- UpdateInboundOrder(inboundOrder, inboundOrderDetail);
+ UpdateInboundOrder(inboundOrder, inboundOrderDetail);
- // 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
- if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
- {
- FeedBackInboundERP(inboundOrder.UpperOrderNo, inboundOrderDetail.LinId);
- }
- if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
- {
- //SendInboundInfoToWMS(task, inboundOrder, stockInfo);
+ // 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
+ if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
+ {
+ FeedBackInboundERP(inboundOrder.UpperOrderNo, inboundOrderDetail.LinId);
}
- else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
- {
- SendAllocateInfoToWMS(task, inboundOrder, stockInfo);
- }
+ if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
+ {
+ SendInboundInfoToWMS(task, inboundOrder, stockInfo);
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
+ {
+ SendAllocateInfoToWMS(task, inboundOrder, stockInfo);
+ }
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -1693,128 +1687,130 @@
x.LPNNo == stockInfo.PalletCode)
.ToList();
- if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
+ List<Dt_NewOutboundOrderDetail> outboundOrderDetails1 = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id)
+ .ToList();
+ if ((outboundOrderDetails == null && outboundOrderDetails1 == null) || (outboundOrderDetails.Count == 0 && outboundOrderDetails1.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 stockDetail in stockInfoDetails)
+ if (outboundOrderDetails == null || outboundOrderDetails.Count == 0)
{
- var matchingOrderDetails = outboundOrderDetails
- .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
- x.BatchNo == stockDetail.BatchNo)
- .ToList();
-
- if (matchingOrderDetails.Count == 0)
+ foreach (var stockDetail in stockInfoDetails)
{
- continue;
- }
+ var matchingOrderDetails = outboundOrderDetails1
+ .Where(x => x.MaterielCode == stockDetail.MaterielCode)
+ .ToList();
- // 璁＄畻闇�瑕佸垎閰嶇殑鏁伴噺
- 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)
+ if (matchingOrderDetails.Count == 0)
{
- orderDetail.OverOutQuantity += allocateQty;
- remainingStock -= allocateQty;
+ continue;
+ }
- // 妫�鏌ユ槸鍚﹀畬鎴�
- if (Math.Abs(orderDetail.OverOutQuantity - orderDetail.OrderQuantity) < 0.001m)
+ // 璁＄畻闇�瑕佸垎閰嶇殑鏁伴噺
+ 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.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
+ 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();
-
- try
- {
- // 鏇存柊鍑哄簱鍗�
- _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
-
- _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
-
-
- AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
-
- // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
- if (outboundOrder.System == null)
+ // 鏇存柊璁㈠崟鐘舵��
+ if (outboundOrder.Details.Count == overCount)
{
- return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
+ _unitOfWorkManage.BeginTran();
- if (!outboundOrder.System.Equals("SMOM"))
+ try
{
- UpdateLocationStatus(locationInfo);
- }
+ // 鏇存柊鍑哄簱鍗�
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
- // 澶勭悊浠诲姟瀹屾垚
- CompleteTask(task);
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails1);
- // 娣诲姞鐘舵�佸彉鏇磋褰�
- 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");
+ AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails1);
- // ERP绯荤粺鍙嶉
- if (outboundOrder.System.Equals("ERP"))
- {
- // 涓烘瘡涓畬鎴愮殑鏄庣粏鍙嶉ERP
- foreach (var orderDetail in outboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (outboundOrder.System == null)
{
- FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
}
- // 濡傛灉鏈夊畬鎴愮殑鏄庣粏锛屼笅杞芥姤琛�
- if (outboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
+ if (!outboundOrder.System.Equals("SMOM"))
{
- DownloadReport(path, savePath, outboundOrderDetails.First().Id);
+ UpdateLocationStatus(locationInfo);
}
- }
- // 鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
- if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.System.Equals("SMOM"))
- {
- var outStockLockInfoList = _outboundService.OutboundStockLockInfoService.Repository
- .QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+ // 澶勭悊浠诲姟瀹屾垚
+ CompleteTask(task);
- if (outStockLockInfoList.Count == 0)
- throw new Exception($"璁㈠崟 {outboundOrder.OrderNo} 鎵樼洏 {stockInfo.PalletCode} 鏈壘鍒板簱瀛橀攣瀹氫俊鎭�");
+ // 娣诲姞鐘舵�佸彉鏇磋褰�
+ AddStatusChangeRecord(task, stockInfo, locationInfo);
- // 閲囪喘鍑哄簱
- if (outboundOrder.OrderType == 1)
+ 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"))
{
- var passBack = new HouseoutboundPassBack
+ // 涓烘瘡涓畬鎴愮殑鏄庣粏鍙嶉ERP
+ foreach (var orderDetail in outboundOrderDetails1.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
{
- ApiType = "ShippingOrderController",
- Method = "AsrsOutboundSO",
- Parameters = new List<HouseoutboundPassBack.datas>
+ FeedBackOutERP(outboundOrder.OrderNo, orderDetail.LinId);
+ }
+
+ // 濡傛灉鏈夊畬鎴愮殑鏄庣粏锛屼笅杞芥姤琛�
+ if (outboundOrderDetails1.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()))
+ {
+ DownloadReport(path, savePath, outboundOrderDetails1.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
+ {
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
{
new HouseoutboundPassBack.datas
{
@@ -1842,33 +1838,33 @@
}
}
}
- };
+ };
- //璋冪敤SMOM鎺ュ彛...
- var authResult = AuthenticateWithWMS();
- if (authResult.IsSuccess)
- {
- passBack.Context = new Dictionary<string, string>
+ //璋冪敤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 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
+ {
+ ApiType = "InventoryAllocateController",
+ Method = "AsrsFinishedStockCount",
+ Parameters = new List<Allocate>
{
new Allocate
{
@@ -1899,38 +1895,271 @@
}
}
}
- };
+ };
- // 璋冪敤SMOM鎺ュ彛...
- var authResult = AuthenticateWithWMS();
- if (authResult.IsSuccess)
- {
- allocate.Context = new Dictionary<string, string>
+ // 璋冪敤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)
+ 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;
+ }
+ }
+ else
+ {
+ foreach (var stockDetail in stockInfoDetails)
+ {
+ var matchingOrderDetails = outboundOrderDetails
+ .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
+ x.BatchNo == stockDetail.BatchNo)
+ .ToList();
+
+ if (matchingOrderDetails.Count == 0)
+ {
+ 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)
{
- throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
}
}
}
}
-
- if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
+ // 鏇存柊璁㈠崟鐘舵��
+ if (outboundOrder.Details.Count == overCount)
{
- // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
+ outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
+ _unitOfWorkManage.BeginTran();
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
- }
- catch
+ try
+ {
+ // 鏇存柊鍑哄簱鍗�
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
+
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+
+
+ AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
+
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (outboundOrder.System == null)
+ {
+ 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()))
+ {
+ 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
+ {
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
+ {
+ new HouseoutboundPassBack.datas
{
- _unitOfWorkManage.RollbackTran();
- throw;
+ 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,
+ MaterielCode = d.MaterielCode?? "",
+ OrderQuantity = d.OrderQuantity,
+ BatchNo = d.BatchNo,
+ FinishQty = d.OrderQuantity,
+ 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 ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+ }
+ }
+
+ // 璋冩嫧鍑哄簱
+ if (outboundOrder.OrderType == 2)
+ {
+ var allocate = new InventoryAllocate
+ {
+ 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 = item.LinId,
+ LPNNo = item.PalletCode,
+ MaterielCode = item.MaterielCode,
+ OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ FinishQty = item.OrderQuantity,
+ LocationName = task.SourceAddress
+ };
+ }).ToList()
+ }
+ }
+ }
+ }
+ };
+
+ // 璋冪敤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)
@@ -1938,7 +2167,7 @@
return WebResponseContent.Instance.Error($"澶勭悊澶辫触: {ex.Message}");
}
}
- else if(warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
+ else if (warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
{
Dt_OutboundOrder inboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
.Where(x => x.OrderNo == task.OrderNo)
@@ -2605,7 +2834,7 @@
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.Where(x => x.StockId == stockInfo.Id).ToList();
- Dt_ReturnOrder? lastReturnOrder = null;
+ Dt_ReturnOrder? lastReturnOrder = null;
foreach (var stockInfoDetail in stockInfoDetails)
{
if (stockInfoDetail == null)
@@ -2654,7 +2883,7 @@
System = "WMS",
Remark = stockInfoDetail.BatchNo
};
- if(lastReturnOrder != null)
+ if (lastReturnOrder != null)
{
lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
_returnOrderRepository.UpdateData(lastReturnOrder);
@@ -2664,7 +2893,7 @@
returnOrder.LocationCode = stockInfo.LocationCode;
}
_unitOfWorkManage.BeginTran();
- if(lastReturnOrder == null)
+ if (lastReturnOrder == null)
{
_returnOrderRepository.AddData(returnOrder);
lastReturnOrder = returnOrder;
@@ -2757,7 +2986,7 @@
var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
if (matchedStockDetail == null)
{
- matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outboundDetail.MaterielCode);
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode);
if (matchedStockDetail == null)
{
@@ -2795,7 +3024,7 @@
returnOrders.Add(returnOrder);
// 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.StockQuantity = remainingQuantity;
matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
//matchedStockDetail.OrderNo = returnOrder.OrderNo;
}
@@ -3196,58 +3425,59 @@
return;
}
- // 鑾峰彇鎵撳嵃鏈哄悕绉�
+ // 鑾峰彇閰嶇疆鐨勬墦鍗版満鍚嶇О
string printerName = AppSettings.app("PrinterName");
- PrintUsingSpireSimple(fullPath, printerName);
+ if (string.IsNullOrEmpty(printerName))
+ {
+ Console.WriteLine("鉁� 鎵撳嵃澶辫触锛氭湭閰嶇疆鎵撳嵃鏈哄悕绉�");
+ return;
+ }
-
- Console.WriteLine("鎵�鏈夋墦鍗版柟娉曢兘澶辫触");
+ // 鐩存帴浣跨敤閰嶇疆鐨勬墦鍗版満鍚嶇О锛屼笉杩涜浠讳綍杞崲
+ PrintUsingConfiguredPrinter(fullPath, printerName.Trim());
}
- private void PrintUsingSpireSimple(string filePath, string printerName)
+ /// <summary>
+ /// 鍙娇鐢ㄩ厤缃殑鎵撳嵃鏈鸿繘琛屾墦鍗�
+ /// </summary>
+ private void PrintUsingConfiguredPrinter(string filePath, string printerName)
{
try
{
+ // 1. 棣栧厛楠岃瘉鎵撳嵃鏈烘槸鍚﹀瓨鍦�
+ if (!IsPrinterInstalled(printerName))
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃鏈� '{printerName}' 鏈畨瑁呮垨涓嶅瓨鍦�");
+ Console.WriteLine("\n绯荤粺宸插畨瑁呯殑鎵撳嵃鏈哄垪琛�:");
+ foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
+ {
+ Console.WriteLine($" - {printer}");
+ }
+ throw new InvalidOperationException($"鎵撳嵃鏈� '{printerName}' 鏈畨瑁�");
+ }
+
+ // 3. 浣跨敤 Spire.PDF 鎵撳嵃
using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
{
// 鍔犺浇鏂囦欢
pdf.LoadFromFile(filePath);
- // 鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
- string actualPrinterName = GetActualPrinterName(printerName);
+ // 璁剧疆鎵撳嵃鏈哄悕绉帮紙鍙娇鐢ㄩ厤缃殑鍚嶇О锛�
+ pdf.PrintSettings.PrinterName = printerName;
- Console.WriteLine($"閰嶇疆鐨勬墦鍗版満鍚嶇О: {printerName}");
- Console.WriteLine($"瀹為檯浣跨敤鐨勬墦鍗版満鍚嶇О: {actualPrinterName}");
-
- // 濡傛灉鎵句笉鍒板疄闄呮墦鍗版満锛屼娇鐢ㄩ粯璁ゆ墦鍗版満
- if (!string.IsNullOrEmpty(actualPrinterName) && IsPrinterInstalled(actualPrinterName))
- {
- pdf.PrintSettings.PrinterName = actualPrinterName;
- Console.WriteLine($"鉁� 宸茶缃墦鍗版満: {actualPrinterName}");
- }
- else
- {
- Console.WriteLine($"鈿狅笍 鎵撳嵃鏈� '{actualPrinterName}' 鏈壘鍒帮紝浣跨敤榛樿鎵撳嵃鏈�");
- }
+ Console.WriteLine($"鉁� 浣跨敤閰嶇疆鐨勬墦鍗版満: {printerName}");
+ Console.WriteLine($"鉁� 姝ｅ湪鎵撳嵃: {Path.GetFileName(filePath)}");
// 鐩存帴鎵撳嵃
pdf.Print();
- Console.WriteLine("鉁� 鎵撳嵃浠诲姟宸叉彁浜ゆ垚鍔�");
+ Console.WriteLine("鉁� 鎵撳嵃浠诲姟宸叉彁浜�");
}
}
catch (Exception ex)
{
- Console.WriteLine($"鉁� Spire.PDF鎵撳嵃澶辫触: {ex.Message}");
-
- // 杈撳嚭鎵�鏈夊彲鐢ㄦ墦鍗版満锛屽府鍔╄皟璇�
- Console.WriteLine("\n绯荤粺鎵�鏈夊彲鐢ㄦ墦鍗版満:");
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
- {
- Console.WriteLine($" - {printer}");
- }
-
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触: {ex.Message}");
throw;
}
}
@@ -3317,7 +3547,7 @@
// 鏌ユ壘鑱旀兂鎵撳嵃鏈�
foreach (string printer in allPrinters)
{
- if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase));
+ if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
{
Console.WriteLine($"鉁� 鎵惧埌鑱旀兂鎵撳嵃鏈�: {printer}");
return printer;
@@ -3533,7 +3763,10 @@
{
return content.Error($"{stockInfo.PalletCode}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
}
- takeStockOrderDetail.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ takeStockOrder.Details.ForEach(x =>
+ {
+ x.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
stockInfo.StockStatus = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
stockInfo.Details.ForEach(x =>
{
@@ -3565,7 +3798,8 @@
_basicService.LocationInfoService.UpdateData(locationInfo);
_returnOrderRepository.AddData(returnOrder);
_recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
- _takeStockOrderDetailCPRepository.UpdateData(takeStockOrderDetail);
+ _takeStockOrderCPRepository.UpdateData(takeStockOrder);
+ _takeStockOrderDetailCPRepository.UpdateData(takeStockOrder.Details);
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
_stockRepository.StockInfoDetailRepository.UpdateData(stockInfo.Details);
BaseDal.DeleteAndMoveIntoHty(task, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
--
Gitblit v1.9.3