From a474060ae47fc4c807120b2a6178e8d8f84c0863 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:07:25 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 592 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 430 insertions(+), 162 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 511a80a..edfcea8 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -108,13 +108,15 @@
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;
-
+ private readonly ITakeStockOrderCPRepository _takeStockOrderCPRepository;
+ 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) : 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;
@@ -140,6 +142,9 @@
_productionRepository = productionRepository;
_inboundRepository = inboundRepository;
_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
+ _takeStockOrderCPRepository = takeStockOrderCPRepository;
+ _takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
+ _stockInfoDetailCPRepository = stockInfoDetailCPRepository;
}
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -556,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>();
@@ -635,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>();
@@ -704,7 +701,7 @@
// 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
if (cpInboundDetails.Any())
{
- BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
+ BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
}
// 鏇存柊鎴愬搧搴撳瓨鏄庣粏鐘舵��
@@ -985,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)
@@ -999,7 +996,7 @@
}
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"))
{
@@ -1136,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();
// 鏇存柊搴撳瓨鏄庣粏鐘舵��
@@ -1159,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();
@@ -1650,7 +1647,11 @@
int lastStatus = locationInfo.LocationStatus;
///鐩樼偣鍑哄簱浠诲姟瀹屾垚閫昏緫
- if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt() && stockInfo.System == "SMOM")
+ {
+ return SMOMOutInventoryCompleted(task, stockInfo, locationInfo);
+ }
+ else if (task.TaskType == TaskTypeEnum.OutInventory.ObjToInt())
{
return OutInventoryCompleted(task, stockInfo, locationInfo);
}
@@ -1931,7 +1932,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)
@@ -1940,31 +1941,32 @@
if (inboundOrder == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
- Dt_OutboundOrderDetail outboundOrderDetail = new Dt_OutboundOrderDetail();
+ List<Dt_OutboundOrderDetail> outboundOrderDetails = new List<Dt_OutboundOrderDetail>();
foreach(var detail in stockInfo.Details)
{
- outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
- .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo)
- .First();
- if(outboundOrderDetail != null) break;
-
+ Dt_OutboundOrderDetail outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo).First();
+ outboundOrderDetails.Add(outboundOrderDetail);
}
- if (outboundOrderDetail.LocationName != null && outboundOrderDetail.LocationName != "")
+ for(var i = 0; i<outboundOrderDetails.Count; i++)
{
- foreach(var detail in stockInfo.Details)
- {
- outboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
- .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo && x.LocationName == stockInfo.LocationCode)
- .First();
- if (outboundOrderDetail != null) break;
- }
+ if (outboundOrderDetails[i].LocationName != null && outboundOrderDetails[i].LocationName != "")
+ {
+ foreach (var detail in stockInfo.Details)
+ {
+ Dt_OutboundOrderDetail newOutboundOrderDetail = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == inboundOrder.Id && x.BatchNo == detail.BatchNo && x.LocationName == stockInfo.LocationCode)
+ .First();
+ outboundOrderDetails[i] = newOutboundOrderDetail;
+ }
+ }
}
- if (outboundOrderDetail == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
- DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetail);
+ if (outboundOrderDetails == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+ DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetails);
// 3. 鎵ц鏍稿績鍑哄簱閫昏緫
- return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetail, inboundOrder);
+ return DWANDYSExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetails, inboundOrder);
}
else
{
@@ -2059,14 +2061,9 @@
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
// 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
- if(locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
- {
- AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
- }
- else
- {
- AddRetrueOrder(stockInfo, inboundOrder);
- }
+
+ AddRetrueOrder(stockInfo, inboundOrder);
+
// 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
if (inboundOrder.System == null)
@@ -2125,6 +2122,82 @@
throw;
}
}
+
+ private WebResponseContent DWANDYSExecuteOutboundLogic(Dt_Task task, Dt_StockInfo stockInfo,
+ Dt_LocationInfo locationInfo, List<Dt_OutboundOrderDetail> outboundOrderDetails, Dt_OutboundOrder inboundOrder)
+ {
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+ ///鏇存柊鍑哄簱鍗�
+ _outboundService.OutboundOrderService.Repository.UpdateData(inboundOrder);
+ // 鏇存柊鍑哄簱璁㈠崟璇︽儏
+ _outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
+
+ // 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
+ if (locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
+ {
+ AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
+ }
+
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (inboundOrder.System == null)
+ {
+ return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
+ }
+ if (!inboundOrder.System.Equals("SMOM"))
+ {
+ UpdateLocationStatus(locationInfo);
+ }
+ // 澶勭悊浠诲姟瀹屾垚
+ CompleteTask(task);
+
+ // 娣诲姞鐘舵�佸彉鏇磋褰�
+ AddStatusChangeRecord(task, stockInfo, locationInfo);
+
+ // 鏍规嵁璁㈠崟绫诲瀷澶勭悊涓嶅悓閫昏緫
+
+ var outboundOrder = _outboundService.OutboundOrderService.Db.Queryable<Dt_OutboundOrder>()
+ .Where(x => x.OrderNo == inboundOrder.OrderNo).First();
+ foreach(var outboundOrderDetail in outboundOrderDetails)
+ {
+ var outDetail = _outboundService.OutboundOrderDetailService.Db.Queryable<Dt_OutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == outboundOrderDetail.BatchNo).First();
+ 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");
+
+
+ if (outboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && inboundOrder.System.Equals("ERP"))
+ {
+ FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetail.LinId);
+ DownloadReport(path, savePath, outboundOrderDetail.Id);
+ }
+ ///鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
+ if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && inboundOrder.System.Equals("SMOM"))
+ {
+ var stockInfoDetail = stockInfo.Details.FirstOrDefault();
+ ProcessNormalOutbound(task, stockInfo, outboundOrder, outDetail);
+ //DownloadReport(path, savePath, outboundOrderDetails.Id);
+ //printTest(savePath);
+ //SendNormalOutboundToWMS(task, outboundOrder, stockInfoDetail, outDetail);
+ }
+
+ if (outboundOrder.OrderType == 240) // 鐩樼偣鍑哄簱
+ {
+ // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
+ }
+ }
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+ }
private void UpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
{
int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
@@ -2154,36 +2227,43 @@
}
//浣庢俯銆佽嵂姘�
- private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
+ private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref List<Dt_OutboundOrderDetail> inboundOrderDetails)
{
- string BatchNo = inboundOrderDetail.BatchNo;
- int overCount = inboundOrder.Details.Where(x => x.BatchNo == BatchNo).Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
- //inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
-
- foreach (var item in stockInfo.Details)
+ List<Dt_OutboundOrderDetail> newOutboundOrderDetails = inboundOrderDetails;
+ int overCount = inboundOrder.Details.Count(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+ foreach (var newOutboundOrderDetail in newOutboundOrderDetails)
{
- if (inboundOrderDetail == null) continue;
+ string BatchNo = newOutboundOrderDetail.BatchNo;
+ //inboundOrderDetail = inboundOrder.Details.FirstOrDefault(x => x.BatchNo == stockInfo.Details.FirstOrDefault()?.BatchNo&&x.LPNNo==stockInfo.PalletCode);
- if(inboundOrderDetail.BatchNo == item.BatchNo)
+ foreach (var item in stockInfo.Details)
{
- inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;
+ if (newOutboundOrderDetail == null) continue;
- if (inboundOrderDetail.OverOutQuantity == inboundOrderDetail.OrderQuantity)
+ if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) continue;
+
+ if (newOutboundOrderDetail.BatchNo == item.BatchNo)
{
- inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
- }
- else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
- {
- inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
- inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ newOutboundOrderDetail.OverOutQuantity += item.OutboundQuantity;
+
+ if (newOutboundOrderDetail.OverOutQuantity == newOutboundOrderDetail.OrderQuantity)
+ {
+ newOutboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ else if (newOutboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ newOutboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ }
}
}
+ if (inboundOrder.Details.Count() == overCount)
+ {
+ inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
}
- if (inboundOrder.Details.Count == overCount)
- {
- inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
- }
+
}
private void DeleteAndMoveIntoHtStockStatus(Dt_StockInfo stockInfo)
@@ -2519,7 +2599,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)
@@ -2568,7 +2648,7 @@
System = "WMS",
Remark = stockInfoDetail.BatchNo
};
- if(lastReturnOrder != null)
+ if (lastReturnOrder != null)
{
lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
_returnOrderRepository.UpdateData(lastReturnOrder);
@@ -2578,7 +2658,7 @@
returnOrder.LocationCode = stockInfo.LocationCode;
}
_unitOfWorkManage.BeginTran();
- if(lastReturnOrder == null)
+ if (lastReturnOrder == null)
{
_returnOrderRepository.AddData(returnOrder);
lastReturnOrder = returnOrder;
@@ -2671,7 +2751,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)
{
@@ -2709,7 +2789,7 @@
returnOrders.Add(returnOrder);
// 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.StockQuantity = remainingQuantity;
matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
//matchedStockDetail.OrderNo = returnOrder.OrderNo;
}
@@ -3110,49 +3190,173 @@
return;
}
- // 鑾峰彇鎵撳嵃鏈哄悕绉�
+ // 鑾峰彇閰嶇疆鐨勬墦鍗版満鍚嶇О
string printerName = AppSettings.app("PrinterName");
- // 灏濊瘯涓嶅悓鐨勬墦鍗版柟娉�
- for (int retryCount = 0; retryCount < maxRetryCount; retryCount++)
+ if (string.IsNullOrEmpty(printerName))
{
- try
- {
- Console.WriteLine($"灏濊瘯鎵撳嵃 (鏂规硶 {retryCount + 1}/{maxRetryCount}): {fullPath}");
-
- switch (retryCount)
- {
- case 0:
- // 鏂规硶1: 浣跨敤鍘熷鎵撳嵃鍛戒护
- PrintUsingRawCommand(fullPath, printerName);
- break;
- case 1:
- // 鏂规硶3: 鐩存帴浣跨敤Spire.PDF浣嗙畝鍖栬缃�
- PrintUsingSpireSimple(fullPath, printerName);
- break;
- case 2:
- // 鏂规硶3: 鐩存帴浣跨敤Spire.PDF浣嗙畝鍖栬缃�
- PrintUsingSpireSimple(fullPath, printerName);
- break;
- }
-
- Console.WriteLine("鎵撳嵃浠诲姟鍙戦�佹垚鍔�");
- return;
- }
- catch (Exception ex)
- {
- Console.WriteLine($"鎵撳嵃鏂规硶 {retryCount + 1} 澶辫触: {ex.Message}");
-
- if (retryCount < maxRetryCount - 1)
- {
- Thread.Sleep(retryDelayMs);
- }
- }
+ Console.WriteLine("鉁� 鎵撳嵃澶辫触锛氭湭閰嶇疆鎵撳嵃鏈哄悕绉�");
+ return;
}
- Console.WriteLine("鎵�鏈夋墦鍗版柟娉曢兘澶辫触");
+ // 鐩存帴浣跨敤閰嶇疆鐨勬墦鍗版満鍚嶇О锛屼笉杩涜浠讳綍杞崲
+ PrintUsingConfiguredPrinter(fullPath, printerName.Trim());
}
+
+ /// <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);
+
+ // 璁剧疆鎵撳嵃鏈哄悕绉帮紙鍙娇鐢ㄩ厤缃殑鍚嶇О锛�
+ pdf.PrintSettings.PrinterName = printerName;
+
+ Console.WriteLine($"鉁� 浣跨敤閰嶇疆鐨勬墦鍗版満: {printerName}");
+ Console.WriteLine($"鉁� 姝ｅ湪鎵撳嵃: {Path.GetFileName(filePath)}");
+
+ // 鐩存帴鎵撳嵃
+ pdf.Print();
+ Console.WriteLine("鉁� 鎵撳嵃浠诲姟宸叉彁浜�");
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触: {ex.Message}");
+ throw;
+ }
+ }
+
+ /// <summary>
+ /// 浠庨厤缃殑鍙嬪ソ鍚嶇О鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
+ /// </summary>
+ private string GetActualPrinterName(string displayName)
+ {
+ if (string.IsNullOrEmpty(displayName))
+ return string.Empty;
+
+ // 濡傛灉閰嶇疆鐨勬槸 "192.168.99.3 涓婄殑 Lenovo M7605D"
+ if (displayName.Contains("192.168.99.3 涓婄殑 Lenovo M7605D"))
+ {
+ // 鍦ㄧ郴缁熶腑鏌ユ壘瀹為檯鐨勬墦鍗版満鍚嶇О
+ return FindActualPrinterForIP("192.168.99.3");
+ }
+
+ // 濡傛灉鐩存帴閰嶇疆鐨勬槸IP鍦板潃
+ if (displayName.Contains("192.168.99.3"))
+ {
+ return FindActualPrinterForIP("192.168.99.3");
+ }
+
+ // 濡傛灉宸茬粡鏄疄闄呯殑鎵撳嵃鏈哄悕绉帮紝鐩存帴杩斿洖
+ if (IsPrinterInstalled(displayName))
+ {
+ return displayName;
+ }
+
+ // 榛樿杩斿洖鍘熷悕绉�
+ return displayName;
+ }
+
+ /// <summary>
+ /// 鏌ユ壘IP鍦板潃瀵瑰簲鐨勫疄闄呮墦鍗版満鍚嶇О
+ /// </summary>
+ private string FindActualPrinterForIP(string ipAddress)
+ {
+ try
+ {
+ // 鑾峰彇鎵�鏈夋墦鍗版満
+ var allPrinters = new List<string>();
+ foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
+ {
+ allPrinters.Add(printer);
+ }
+
+ Console.WriteLine($"鏌ユ壘IP鍦板潃 {ipAddress} 瀵瑰簲鐨勬墦鍗版満...");
+ Console.WriteLine("绯荤粺鎵撳嵃鏈哄垪琛�:");
+ foreach (var printer in allPrinters)
+ {
+ Console.WriteLine($" - {printer}");
+ }
+
+ // 浼樺厛鏌ユ壘鍖呭惈IP鍦板潃鐨勬墦鍗版満
+ foreach (string printer in allPrinters)
+ {
+ if (printer.Contains(ipAddress))
+ {
+ Console.WriteLine($"鉁� 鎵惧埌鍖呭惈IP鐨勬墦鍗版満: {printer}");
+ return printer;
+ }
+ }
+
+ // 鏌ユ壘鑱旀兂鎵撳嵃鏈�
+ foreach (string printer in allPrinters)
+ {
+ if (printer.Contains("M7605D", StringComparison.OrdinalIgnoreCase))
+ {
+ Console.WriteLine($"鉁� 鎵惧埌鑱旀兂鎵撳嵃鏈�: {printer}");
+ return printer;
+ }
+ }
+
+
+ // 杩斿洖绗竴涓彲鐢ㄧ殑鎵撳嵃鏈�
+ if (allPrinters.Any())
+ {
+ Console.WriteLine($"鈿狅笍 鏈壘鍒扮簿纭尮閰嶏紝浣跨敤绗竴涓墦鍗版満: {allPrinters.First()}");
+ return allPrinters.First();
+ }
+
+ return string.Empty;
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鏌ユ壘鎵撳嵃鏈哄け璐�: {ex.Message}");
+ return string.Empty;
+ }
+ }
+
+ /// <summary>
+ /// 妫�鏌ユ墦鍗版満鏄惁宸插畨瑁�
+ /// </summary>
+ private bool IsPrinterInstalled(string printerName)
+ {
+ try
+ {
+ foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
+ {
+ if (printer.Equals(printerName, StringComparison.OrdinalIgnoreCase))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ catch
+ {
+ return false;
+ }
+ }
/// <summary>
/// 浣跨敤鍘熷鎵撳嵃鍛戒护
/// </summary>
@@ -3160,55 +3364,28 @@
{
try
{
- // 鏂规硶1: 浣跨敤Process鐩存帴鎵撳嵃
- var process = new System.Diagnostics.Process();
- process.StartInfo.FileName = filePath;
- process.StartInfo.Verb = "print";
- process.StartInfo.CreateNoWindow = true;
- process.StartInfo.WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden;
- process.Start();
+ var processStartInfo = new System.Diagnostics.ProcessStartInfo
+ {
+ FileName = filePath,
+ Verb = "print", // 浣跨敤"print"鍔ㄨ瘝
+ UseShellExecute = true, // 鍏抽敭锛氬惎鐢⊿hell鎵ц
+ CreateNoWindow = true,
+ WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
+ };
- // 绛夊緟涓�娈垫椂闂磋鎵撳嵃浠诲姟鎻愪氦
- if (!process.WaitForExit(5000))
- {
- Console.WriteLine("鎵撳嵃杩涚▼鏈強鏃堕��鍑猴紝浣嗕换鍔″彲鑳藉凡鎻愪氦");
- }
+ // 璁剧疆鎵撳嵃鏈猴紙鍙�夛紝绯荤粺閫氬父浼氫娇鐢ㄩ粯璁ゆ墦鍗版満锛�
+ // processStartInfo.Arguments = $"/t \"{filePath}\" \"{printerName}\"";
+
+ System.Diagnostics.Process.Start(processStartInfo);
}
- catch
+ catch (Exception ex)
{
- // 濡傛灉涓婅堪鏂规硶澶辫触锛屽皾璇曚娇鐢╮undll32
- try
- {
- var args = $@"/c rundll32.exe C:\Windows\System32\shimgvw.dll,ImageView_PrintTo ""{filePath}"" ""{printerName}""";
- System.Diagnostics.Process.Start("cmd.exe", args);
- }
- catch
- {
- throw;
- }
+ Console.WriteLine($"鎵撳嵃澶辫触: {ex.Message}");
+ // 鍙互灏濊瘯鍏朵粬鏂规硶
+ //TryAlternativePrintMethod(filePath, printerName);
}
}
- /// <summary>
- /// 浣跨敤Spire.PDF浣嗙畝鍖栬缃�
- /// </summary>
- private void PrintUsingSpireSimple(string filePath, string printerName)
- {
- using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
- {
- // 浣跨敤鏈�灏忛厤缃姞杞芥枃浠�
- pdf.LoadFromFile(filePath);
-
- // 璁剧疆鍩烘湰鎵撳嵃鏈轰俊鎭�
- if (!string.IsNullOrEmpty(printerName))
- {
- pdf.PrintSettings.PrinterName = printerName;
- }
-
- // 鐩存帴鎵撳嵃锛屼笉妫�鏌�
- pdf.Print();
- }
- }
/// <summary>
/// 妫�鏌ユ枃浠舵槸鍚﹀彲璁块棶
@@ -3310,6 +3487,97 @@
}
return content;
}
+
+ /// <summary>
+ /// SMOM鐩樼偣鍗曞畬鎴�
+ /// </summary>
+ /// <param name="task"></param>
+ /// <param name="stockInfo"></param>
+ /// <param name="locationInfo"></param>
+ /// <returns></returns>
+ public WebResponseContent SMOMOutInventoryCompleted(Dt_Task task, Dt_StockInfo stockInfo, Dt_LocationInfo locationInfo)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ //鑾峰彇瀵瑰簲鐩樼偣鍗�
+ Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details).First();
+ if (takeStockOrder == null)
+ {
+ return content.Error($"鐩樼偣鍗晎task.OrderNo}涓嶅瓨鍦�");
+ }
+ if (takeStockOrder.TakeStockStatus != TakeStockStatusEnum.鐩樼偣涓�.ObjToInt())
+ {
+ return content.Error($"鐩樼偣鍗晎task.OrderNo}鐩樼偣宸插畬鎴愭垨鏈紑濮�");
+ }
+ if (stockInfo.StockStatus != StockStatusEmun.鍑哄簱閿佸畾.ObjToInt())
+ {
+ return content.Error($"{stockInfo.PalletCode}搴撳瓨鐘舵�佷笉姝ｇ‘");
+ }
+ if (locationInfo.LocationStatus != LocationStatusEnum.Lock.ObjToInt())
+ {
+ return content.Error($"{locationInfo.LocationCode}璐т綅鐘舵�佷笉姝ｇ‘");
+ }
+ //鏍规嵁浠诲姟鎵樼洏鏌ョ洏鐐规槑缁�
+ Dt_TakeStockOrderDetailCP? takeStockOrderDetail = takeStockOrder.Details.FirstOrDefault(x => x.TakePalletCode == stockInfo.PalletCode);
+ if (takeStockOrderDetail == null)
+ {
+ return content.Error($"{stockInfo.PalletCode}鏈壘鍒板搴旂洏鐐规槑缁�");
+ }
+ if (takeStockOrderDetail.TakeDetalStatus != TakeStockDetailStatusEnum.鐩樼偣鍑哄簱涓�.ObjToInt())
+ {
+ return content.Error($"{stockInfo.PalletCode}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
+ }
+ takeStockOrder.Details.ForEach(x =>
+ {
+ x.TakeDetalStatus = TakeStockDetailStatusEnum.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
+ stockInfo.StockStatus = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ stockInfo.Details.ForEach(x =>
+ {
+ x.Status = StockStatusEmun.鐩樼偣鍑哄簱瀹屾垚.ObjToInt();
+ });
+ stockInfo.LocationCode = "";
+ task.TaskStatus = TaskStatusEnum.Finish.ObjToInt();
+ int beforeStatus = locationInfo.LocationStatus;
+ locationInfo.LocationStatus = LocationStatusEnum.Lock.ObjToInt();
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = stockInfo.Details.FirstOrDefault()?.MaterielCode,
+ MaterielName = stockInfo.Details.FirstOrDefault()?.MaterielName,
+ BatchNo = stockInfo.Details.FirstOrDefault()?.BatchNo,
+ OrderQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
+ ReceiptQuantity = stockInfo.Details.Sum(x => x.StockQuantity),
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = stockInfo.Details.FirstOrDefault()?.LinId,
+ LocationCode = stockInfo.LocationCode,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.鐩樼偣鍥炲簱鍗�.ObjToInt(),
+ System = "WMS"
+ };
+
+ _unitOfWorkManage.BeginTran();
+ //璐т綅鍙樺姩璁板綍
+ _basicService.LocationInfoService.UpdateData(locationInfo);
+ _returnOrderRepository.AddData(returnOrder);
+ _recordService.LocationStatusChangeRecordSetvice.AddLocationStatusChangeRecord(locationInfo, beforeStatus, LocationStatusEnum.Lock.ObjToInt(), LocationChangeType.OutboundCompleted.ObjToInt(), takeStockOrder?.OrderNo ?? "", task.TaskNum);
+ _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.浜哄伐瀹屾垚);
+ _unitOfWorkManage.CommitTran();
+ content.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ content.Error(ex.Message);
+ }
+ return content;
+ }
}
#endregion
#endregion
--
Gitblit v1.9.3