From 06bc8ee02717f3ee80483d15a52c753cb6df9432 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期三, 04 二月 2026 08:48:15 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 549 +++++++++++++++++++++++++++++-------------------------
1 files changed, 291 insertions(+), 258 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index d63db3f..decc47b 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
@@ -81,6 +81,7 @@
using System;
using WIDESEA_Common.Log;
using static WIDESEA_Common.HouseInboundPassBack.data.data1;
+using System.Diagnostics;
namespace WIDESEA_TaskInfoService
{
@@ -108,6 +109,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 +117,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 +145,7 @@
_newOutboundOrderDetailRepository = newOutboundOrderDetailRepository;
_takeStockOrderCPRepository = takeStockOrderCPRepository;
_takeStockOrderDetailCPRepository = takeStockOrderDetailCPRepository;
+ _stockInfoDetailCPRepository = stockInfoDetailCPRepository;
}
public string ReceiveWMSTaskin = WIDESEA_Core.Helper.AppSettings.Configuration["ReceiveWMSTaskin"];
@@ -559,9 +562,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 +641,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 +702,7 @@
// 鏇存柊鎴愬搧鍏ュ簱鏄庣粏鐘舵��
if (cpInboundDetails.Any())
{
- BaseDal.Db.Updateable(cpInboundDetails).ExecuteCommand();
+ BaseDal.Db.Deleteable(cpInboundDetails).ExecuteCommand();
}
// 鏇存柊鎴愬搧搴撳瓨鏄庣粏鐘舵��
@@ -988,7 +983,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)
@@ -1002,7 +997,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"))
{
@@ -1139,7 +1134,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 +1157,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 +1933,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)
@@ -1947,31 +1942,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
{
@@ -2066,14 +2062,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)
@@ -2132,6 +2123,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());
@@ -2161,36 +2228,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)
@@ -2526,7 +2600,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)
@@ -2575,7 +2649,7 @@
System = "WMS",
Remark = stockInfoDetail.BatchNo
};
- if(lastReturnOrder != null)
+ if (lastReturnOrder != null)
{
lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
_returnOrderRepository.UpdateData(lastReturnOrder);
@@ -2585,7 +2659,7 @@
returnOrder.LocationCode = stockInfo.LocationCode;
}
_unitOfWorkManage.BeginTran();
- if(lastReturnOrder == null)
+ if (lastReturnOrder == null)
{
_returnOrderRepository.AddData(returnOrder);
lastReturnOrder = returnOrder;
@@ -2678,7 +2752,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)
{
@@ -2716,7 +2790,7 @@
returnOrders.Add(returnOrder);
// 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.StockQuantity = remainingQuantity;
matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
//matchedStockDetail.OrderNo = returnOrder.OrderNo;
}
@@ -3106,223 +3180,205 @@
}
}
- public virtual void PrintTestDirect(string fullPath)
+ public void PrintTestDirect(string fullPath)
{
- const int maxRetryCount = 3;
- const int retryDelayMs = 1000;
-
if (!File.Exists(fullPath))
{
- Console.WriteLine($"鎵撳嵃澶辫触锛氭枃浠朵笉瀛樺湪 {fullPath}");
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触锛氭枃浠朵笉瀛樺湪 {fullPath}");
return;
}
- // 鑾峰彇鎵撳嵃鏈哄悕绉�
- string printerName = AppSettings.app("PrinterName");
+ // 鑾峰彇鎵撳嵃鏈哄悕绉伴厤缃�
+ string printerName = AppSettings.app("PrinterName")?.Trim();
- PrintUsingSpireSimple(fullPath, printerName);
+ if (string.IsNullOrEmpty(printerName))
+ {
+ // 濡傛灉娌℃湁閰嶇疆锛屼娇鐢ㄧ郴缁熼粯璁ゆ墦鍗版満
+ printerName = GetDefaultPrinterUbuntu();
+ }
-
- Console.WriteLine("鎵�鏈夋墦鍗版柟娉曢兘澶辫触");
+ PrintUsingUbuntuPrinter(fullPath, printerName);
}
-
-
- private void PrintUsingSpireSimple(string filePath, string printerName)
+ /// <summary>
+ /// 鑾峰彇 Ubuntu 榛樿鎵撳嵃鏈�
+ /// </summary>
+ private string GetDefaultPrinterUbuntu()
{
try
{
- using (Spire.Pdf.PdfDocument pdf = new Spire.Pdf.PdfDocument())
+ ProcessStartInfo psi = new ProcessStartInfo
{
- // 鍔犺浇鏂囦欢
- pdf.LoadFromFile(filePath);
+ FileName = "lpstat",
+ Arguments = "-d",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true
+ };
- // 鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
- string actualPrinterName = GetActualPrinterName(printerName);
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
- Console.WriteLine($"閰嶇疆鐨勬墦鍗版満鍚嶇О: {printerName}");
- Console.WriteLine($"瀹為檯浣跨敤鐨勬墦鍗版満鍚嶇О: {actualPrinterName}");
-
- // 濡傛灉鎵句笉鍒板疄闄呮墦鍗版満锛屼娇鐢ㄩ粯璁ゆ墦鍗版満
- if (!string.IsNullOrEmpty(actualPrinterName) && IsPrinterInstalled(actualPrinterName))
+ // 瑙ｆ瀽榛樿鎵撳嵃鏈哄悕绉帮紝渚嬪: "system default destination: LenovoPrinter"
+ if (output.Contains(":"))
{
- pdf.PrintSettings.PrinterName = actualPrinterName;
- Console.WriteLine($"鉁� 宸茶缃墦鍗版満: {actualPrinterName}");
+ return output.Split(':')[1].Trim();
}
- else
- {
- Console.WriteLine($"鈿狅笍 鎵撳嵃鏈� '{actualPrinterName}' 鏈壘鍒帮紝浣跨敤榛樿鎵撳嵃鏈�");
- }
-
- // 鐩存帴鎵撳嵃
- pdf.Print();
- Console.WriteLine("鉁� 鎵撳嵃浠诲姟宸叉彁浜ゆ垚鍔�");
+ return "LenovoPrinter"; // 榛樿鍥為��
}
+ }
+ catch
+ {
+ return "LenovoPrinter";
+ }
+ }
+
+ /// <summary>
+ /// Ubuntu 鎵撳嵃瀹炵幇
+ /// </summary>
+ private void PrintUsingUbuntuPrinter(string filePath, string printerName)
+ {
+ try
+ {
+ PrintWithLpr(filePath, printerName);
+
}
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;
}
}
/// <summary>
- /// 浠庨厤缃殑鍙嬪ソ鍚嶇О鑾峰彇瀹為檯鐨勬墦鍗版満鍚嶇О
+ /// 浣跨敤 lpr 鍛戒护鎵撳嵃
/// </summary>
- private string GetActualPrinterName(string displayName)
+ private void PrintWithLpr(string filePath, string printerName)
{
- if (string.IsNullOrEmpty(displayName))
- return string.Empty;
+ Console.WriteLine($"馃搫 姝ｅ湪鎵撳嵃鍒� {printerName}: {Path.GetFileName(filePath)}");
- // 濡傛灉閰嶇疆鐨勬槸 "192.168.99.3 涓婄殑 Lenovo M7605D"
- if (displayName.Contains("192.168.99.3 涓婄殑 Lenovo M7605D"))
- {
- // 鍦ㄧ郴缁熶腑鏌ユ壘瀹為檯鐨勬墦鍗版満鍚嶇О
- return FindActualPrinterForIP("192.168.99.3");
- }
+ string command = $"lpr -P {printerName} \"{filePath}\"";
- // 濡傛灉鐩存帴閰嶇疆鐨勬槸IP鍦板潃
- if (displayName.Contains("192.168.99.3"))
- {
- return FindActualPrinterForIP("192.168.99.3");
- }
-
- // 濡傛灉宸茬粡鏄疄闄呯殑鎵撳嵃鏈哄悕绉帮紝鐩存帴杩斿洖
- if (IsPrinterInstalled(displayName))
- {
- return displayName;
- }
-
- // 榛樿杩斿洖鍘熷悕绉�
- return displayName;
+ ExecuteShellCommand(command);
}
+
/// <summary>
- /// 鏌ユ壘IP鍦板潃瀵瑰簲鐨勫疄闄呮墦鍗版満鍚嶇О
+ /// 鎵ц Shell 鍛戒护
/// </summary>
- private string FindActualPrinterForIP(string ipAddress)
+ private void ExecuteShellCommand(string command)
{
- try
+ ProcessStartInfo psi = new ProcessStartInfo
{
- // 鑾峰彇鎵�鏈夋墦鍗版満
- var allPrinters = new List<string>();
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
- {
- allPrinters.Add(printer);
- }
+ FileName = "/bin/bash",
+ Arguments = $"-c \"{command.Replace("\"", "\\\"")}\"",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true,
+ RedirectStandardError = true
+ };
- 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)
+ using (Process process = new Process { StartInfo = psi })
{
- Console.WriteLine($"鏌ユ壘鎵撳嵃鏈哄け璐�: {ex.Message}");
- return string.Empty;
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ string error = process.StandardError.ReadToEnd();
+ process.WaitForExit();
+
+ if (process.ExitCode == 0)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃浠诲姟鎻愪氦鎴愬姛");
+ if (!string.IsNullOrEmpty(output))
+ Console.WriteLine($"杈撳嚭: {output}");
+ }
+ else
+ {
+ throw new InvalidOperationException($"鍛戒护鎵ц澶辫触: {error}");
+ }
}
}
+
/// <summary>
- /// 妫�鏌ユ墦鍗版満鏄惁宸插畨瑁�
+ /// 鍙娇鐢ㄩ厤缃殑鎵撳嵃鏈鸿繘琛屾墦鍗�
/// </summary>
- private bool IsPrinterInstalled(string printerName)
+ /// <summary>
+ /// Ubuntu 鎵撳嵃鏂规硶 - 浣跨敤 lpr 鍛戒护
+ /// </summary>
+ private void PrintUsingConfiguredPrinter(string filePath, string printerName)
{
try
{
- foreach (string printer in System.Drawing.Printing.PrinterSettings.InstalledPrinters)
+ // 1. 妫�鏌ユ墦鍗版満鏄惁鍦ㄧ嚎
+ if (!IsPrinterAvailableUbuntu(printerName))
{
- if (printer.Equals(printerName, StringComparison.OrdinalIgnoreCase))
- {
- return true;
- }
+ throw new InvalidOperationException($"鎵撳嵃鏈� '{printerName}' 涓嶅彲鐢ㄦ垨鏈壘鍒�");
}
- return false;
- }
- catch
- {
- return false;
- }
- }
- /// <summary>
- /// 浣跨敤鍘熷鎵撳嵃鍛戒护
- /// </summary>
- private void PrintUsingRawCommand(string filePath, string printerName)
- {
- try
- {
- var processStartInfo = new System.Diagnostics.ProcessStartInfo
+
+ Console.WriteLine($"鉁� 浣跨敤鎵撳嵃鏈�: {printerName}");
+ Console.WriteLine($"鉁� 姝ｅ湪鎵撳嵃: {Path.GetFileName(filePath)}");
+
+ // 2. 浣跨敤 lpr 鍛戒护鎵撳嵃
+ ProcessStartInfo psi = new ProcessStartInfo
{
- FileName = filePath,
- Verb = "print", // 浣跨敤"print"鍔ㄨ瘝
- UseShellExecute = true, // 鍏抽敭锛氬惎鐢⊿hell鎵ц
+ FileName = "lpr",
+ Arguments = $"-P {printerName} \"{filePath}\"",
+ UseShellExecute = false,
CreateNoWindow = true,
- WindowStyle = System.Diagnostics.ProcessWindowStyle.Hidden
+ RedirectStandardOutput = true,
+ RedirectStandardError = true
};
- // 璁剧疆鎵撳嵃鏈猴紙鍙�夛紝绯荤粺閫氬父浼氫娇鐢ㄩ粯璁ゆ墦鍗版満锛�
- // processStartInfo.Arguments = $"/t \"{filePath}\" \"{printerName}\"";
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ string error = process.StandardError.ReadToEnd();
+ process.WaitForExit();
- System.Diagnostics.Process.Start(processStartInfo);
+ if (process.ExitCode == 0)
+ {
+ Console.WriteLine($"鉁� 鎵撳嵃浠诲姟宸叉彁浜ゅ埌 {printerName}");
+ }
+ else
+ {
+ throw new InvalidOperationException($"鎵撳嵃澶辫触: {error}");
+ }
+ }
}
catch (Exception ex)
{
- Console.WriteLine($"鎵撳嵃澶辫触: {ex.Message}");
- // 鍙互灏濊瘯鍏朵粬鏂规硶
- //TryAlternativePrintMethod(filePath, printerName);
+ Console.WriteLine($"鉁� 鎵撳嵃澶辫触: {ex.Message}");
+ throw;
}
}
-
/// <summary>
- /// 妫�鏌ユ枃浠舵槸鍚﹀彲璁块棶
+ /// Ubuntu 妫�鏌ユ墦鍗版満鍙敤鎬�
/// </summary>
- private bool IsFileAccessible(string filePath)
+ private bool IsPrinterAvailableUbuntu(string printerName)
{
try
{
- using (FileStream fs = new FileStream(filePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+ ProcessStartInfo psi = new ProcessStartInfo
{
- return fs.Length > 0;
+ FileName = "lpstat",
+ Arguments = $"-p {printerName}",
+ UseShellExecute = false,
+ CreateNoWindow = true,
+ RedirectStandardOutput = true
+ };
+
+ using (Process process = new Process { StartInfo = psi })
+ {
+ process.Start();
+ string output = process.StandardOutput.ReadToEnd();
+ process.WaitForExit();
+
+ return output.Contains($"{printerName} is idle") ||
+ output.Contains($"{printerName} is ready");
}
}
catch
@@ -3330,25 +3386,6 @@
return false;
}
}
-
- /// <summary>
- /// 灏濊瘯寮哄埗鍨冨溇鍥炴敹锛岄噴鏀惧彲鑳藉瓨鍦ㄧ殑鏂囦欢鍙ユ焺
- /// </summary>
- private void TryForceGarbageCollection()
- {
- try
- {
- GC.Collect();
- GC.WaitForPendingFinalizers();
- Console.WriteLine("宸叉墽琛屽瀮鍦惧洖鏀�");
- }
- catch (Exception ex)
- {
- Console.WriteLine($"鍨冨溇鍥炴敹澶辫触: {ex.Message}");
- }
- }
-
-
/// <summary>
/// 鐩樼偣鍑哄簱瀹屾垚
/// </summary>
@@ -3427,12 +3464,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}涓嶅瓨鍦�");
@@ -3495,6 +3527,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