From d13e6e7d5df05ba244971d2fabb788ccb0f5c12a Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期二, 27 一月 2026 15:12:10 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/JiAnLiKu
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 131 ++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 70 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 1e5a5e8..edfcea8 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();
@@ -1938,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)
@@ -2605,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)
@@ -2654,7 +2648,7 @@
System = "WMS",
Remark = stockInfoDetail.BatchNo
};
- if(lastReturnOrder != null)
+ if (lastReturnOrder != null)
{
lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
_returnOrderRepository.UpdateData(lastReturnOrder);
@@ -2664,7 +2658,7 @@
returnOrder.LocationCode = stockInfo.LocationCode;
}
_unitOfWorkManage.BeginTran();
- if(lastReturnOrder == null)
+ if (lastReturnOrder == null)
{
_returnOrderRepository.AddData(returnOrder);
lastReturnOrder = returnOrder;
@@ -2757,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)
{
@@ -2795,7 +2789,7 @@
returnOrders.Add(returnOrder);
// 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.StockQuantity = remainingQuantity;
matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
//matchedStockDetail.OrderNo = returnOrder.OrderNo;
}
@@ -3196,58 +3190,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;
}
}
@@ -3506,12 +3501,7 @@
try
{
//鑾峰彇瀵瑰簲鐩樼偣鍗�
- Dt_TakeStockOrderDetailCP takeStockOrderDetailCP = _takeStockOrderDetailCPRepository.QueryFirst(x => x.TakePalletCode == task.PalletCode);
- if (takeStockOrderDetailCP == null)
- {
- return content.Error($"鐩樼偣鍗曪紝鎵樼洏鍙穥takeStockOrderDetailCP.TakePalletCode}涓嶅瓨鍦�");
- }
- Dt_TakeStockOrderCP takeStockOrder = _inboundRepository.TakeStockOrderRepository.Db.Queryable<Dt_TakeStockOrderCP>().Where(x => x.Id == takeStockOrderDetailCP.TakeStockId).Includes(x => x.Details).First();
+ 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}涓嶅瓨鍦�");
@@ -3574,6 +3564,7 @@
_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.浜哄伐瀹屾垚);
--
Gitblit v1.9.3