From fd5a43c2e677740482b8d25195120ffa75c5ac77 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 19 一月 2026 15:47:29 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 352 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 271 insertions(+), 81 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 511a80a..72705e1 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -111,10 +111,11 @@
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) : base(BaseDal)
{
_mapper = mapper;
_stockRepository = stockRepository;
@@ -140,6 +141,8 @@
_productionRepository = productionRepository;
_inboundRepository = inboundRepository;
_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
+ _takeStockOrderCPRepository = takeStockOrderCPRepository;
+ _takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
}
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -1650,7 +1653,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);
}
@@ -3113,46 +3120,169 @@
// 鑾峰彇鎵撳嵃鏈哄悕绉�
string printerName = AppSettings.app("PrinterName");
- // 灏濊瘯涓嶅悓鐨勬墦鍗版柟娉�
- for (int retryCount = 0; retryCount < maxRetryCount; retryCount++)
- {
- try
- {
- Console.WriteLine($"灏濊瘯鎵撳嵃 (鏂规硶 {retryCount + 1}/{maxRetryCount}): {fullPath}");
+ PrintUsingSpireSimple(fullPath, printerName);
- 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("鎵�鏈夋墦鍗版柟娉曢兘澶辫触");
}
+
+ private void PrintUsingSpireSimple(string filePath, string printerName)
+ {
+ try
+ {
+ using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
+ {
+ // 鍔犺浇鏂囦欢
+ pdf.LoadFromFile(filePath);
+
+ // 鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
+ string actualPrinterName = GetActualPrinterName(printerName);
+
+ Console.WriteLine($"閰嶇疆鐨勬墦鍗版満鍚嶇О: {printerName}");
+ Console.WriteLine($"瀹為檯浣跨敤鐨勬墦鍗版満鍚嶇О: {actualPrinterName}");
+
+ // 濡傛灉鎵句笉鍒板疄闄呮墦鍗版満锛屼娇鐢ㄩ粯璁ゆ墦鍗版満
+ if (!string.IsNullOrEmpty(actualPrinterName) && IsPrinterInstalled(actualPrinterName))
+ {
+ pdf.PrintSettings.PrinterName = actualPrinterName;
+ Console.WriteLine($"鉁� 宸茶缃墦鍗版満: {actualPrinterName}");
+ }
+ else
+ {
+ Console.WriteLine($"鈿狅笍 鎵撳嵃鏈� '{actualPrinterName}' 鏈壘鍒帮紝浣跨敤榛樿鎵撳嵃鏈�");
+ }
+
+ // 鐩存帴鎵撳嵃
+ pdf.Print();
+ 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}");
+ }
+
+ 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 +3290,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 +3413,93 @@
}
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}鐩樼偣鏄庣粏鐘舵�佷笉姝ｇ‘");
+ }
+ takeStockOrderDetail.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);
+ _takeStockOrderDetailCPRepository.UpdateData(takeStockOrderDetail);
+ _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