From e83c793bebdb1b9ecdcd79fab8d83fd167baa817 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 19 一月 2026 15:51:56 +0800
Subject: [PATCH] 盘点流程
---
WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 1574 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 1,093 insertions(+), 481 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs
index 86d454a..d63db3f 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"];
@@ -526,7 +529,14 @@
if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
{
- return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == dt_StockInfo.PalletCode);
+ if (returnOrder == null)
+ {
+ return WebResponseContent.Instance.Error("鏈壘鍒板洖搴撳崟淇℃伅");
+ }
+ return SurplusReturnInbound(task, dt_StockInfo, dt_LocationInfo, lastStatus, returnOrder);
}
// 1. 鑾峰彇鍏ュ簱鍗曚俊鎭�
Dt_InboundOrder? inboundOrder = null;
@@ -680,6 +690,10 @@
if (allCompleted)
{
inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ foreach (var item in inboundOrderDetails)
+ {
+ BaseDal.Db.Deleteable(item.CPDetails).ExecuteCommand();
+ }
}
else
{
@@ -738,45 +752,54 @@
InoutType = inboundOrder.OrderType,
OrderType = inboundOrder.InoutType,
// 閬嶅巻鎵�鏈夊簱瀛樻槑缁嗭紝娣诲姞鍒� DetailList
- DetailList = StockInfos.Select(d => new data.data1.Inbound
- {
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.Details.FirstOrDefault()?.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode,
- LabelList= d.Details
- .Where(detail => detail.StockDetails != null)
- .SelectMany(detail => detail.StockDetails)
- .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
- .Select(stockDetail => stockDetail.BoxCode )
- .ToList()
- }).ToList()
+ DetailList = StockInfos
+ .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
+ .GroupBy(x => new
+ {
+ x.Pallet.PalletCode,
+ x.Detail.MaterielCode,
+ x.Detail.BatchNo,
+ x.Detail.LinId
+ })
+ .Select(g => new data.data1.Inbound
+ {
+ LinId = g.Key.LinId ?? "",
+ MaterielCode = g.Key.MaterielCode ?? "",
+ OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
+ BatchNo = g.Key.BatchNo,
+ LPNNo = g.Key.PalletCode,
+ FinishQty = g.Sum(x => x.Detail.StockQuantity),
+ LocationName = g.First().Pallet.LocationCode,
+ LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
+ .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
+ .Select(sd => sd.BoxCode)
+ .Distinct()
+ .ToList()
+ })
+ .ToList()
}
}
}
}
};
- //var authResult = AuthenticateWithWMS();
- //if (authResult.IsSuccess)
- //{
- // houseInboundPassBack.Context = new Dictionary<string, string>
- // {
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- // };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ houseInboundPassBack.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
- // // 鍒ゆ柇Success鐨勫��
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskin, houseInboundPassBack, "绔嬪簱鍏ュ簱鏁伴噺鍥炰紶WMS");
+ // 鍒ゆ柇Success鐨勫��
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触: {response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
- //}
+ }
}
else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
@@ -806,44 +829,54 @@
InoutType = inboundOrder.OrderType,
OrderType = inboundOrder.InoutType,
ActiveType=1,
- DetailList = StockInfos.Select(d => new Allocate.data1.Inventory
- {
- LinId = d.Details.FirstOrDefault()?.LinId?? "",
- MaterielCode = d.Details.FirstOrDefault()?.MaterielCode?? "",
- OrderQuantity = d.Details.FirstOrDefault().StockQuantity,
- BatchNo = d.Details.FirstOrDefault()?.BatchNo,
- LPNNo = d.PalletCode,
- FinishQty = d.Details.FirstOrDefault().StockQuantity,
- LocationName = d.LocationCode,
- OrinalLocation=d.Details.FirstOrDefault()?.OrinalLocation,
- LabelList= d.Details
- .Where(detail => detail.StockDetails != null)
- .SelectMany(detail => detail.StockDetails)
- .Where(stockDetail => !string.IsNullOrEmpty(stockDetail.BoxCode))
- .Select(stockDetail => stockDetail.BoxCode )
- .ToList()
- }).ToList()
+
+ DetailList = StockInfos
+ .SelectMany(pallet => pallet.Details, (pallet, detail) => new { Pallet = pallet, Detail = detail })
+ .GroupBy(x => new
+ {
+ x.Pallet.PalletCode,
+ x.Detail.MaterielCode,
+ x.Detail.BatchNo,
+ x.Detail.LinId
+ })
+ .Select(g => new Allocate.data1.Inventory
+ {
+ LinId = g.Key.LinId ?? "",
+ MaterielCode = g.Key.MaterielCode ?? "",
+ OrderQuantity = g.Sum(x => x.Detail.StockQuantity),
+ BatchNo = g.Key.BatchNo,
+ LPNNo = g.Key.PalletCode,
+ FinishQty = g.Sum(x => x.Detail.StockQuantity),
+ LocationName = g.First().Pallet.LocationCode,
+ OrinalLocation = g.First().Detail?.OrinalLocation,
+ LabelList = g.SelectMany(x => x.Detail.StockDetails ?? new List<Dt_StockInfoDetailCP>())
+ .Where(sd => !string.IsNullOrEmpty(sd?.BoxCode))
+ .Select(sd => sd.BoxCode)
+ .Distinct()
+ .ToList()
+ })
+ .ToList()
}
}
}
}
};
- //var authResult = AuthenticateWithWMS();
- //if (authResult.IsSuccess)
- //{
- // inventoryAllocate.Context = new Dictionary<string, string>
- // {
- // { "Ticket", authResult.Ticket },
- // { "InvOrgId", authResult.InvOrgId }
- // };
+ var authResult = AuthenticateWithWMS();
+ if (authResult.IsSuccess)
+ {
+ inventoryAllocate.Context = new Dictionary<string, string>
+ {
+ { "Ticket", authResult.Ticket },
+ { "InvOrgId", authResult.InvOrgId }
+ };
- // var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
- // if (!response.Success)
- // {
- // throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
- // }
- //}
+ var response = HttpHelper.Post<MomRequestContent>(ReceiveWMSTaskAllocatein, inventoryAllocate, "璋冩嫧鍏ュ簱鏁伴噺鍥炰紶WMS");
+ if (!response.Success)
+ {
+ throw new Exception($"鎿嶄綔澶辫触锛歿response.Message ?? "鏈彁渚涢敊璇俊鎭�"}");
+ }
+ }
}
_unitOfWorkManage.CommitTran();
@@ -855,6 +888,158 @@
throw new Exception($"鍏ュ簱澶勭悊澶辫触锛歿ex.Message}", ex);
}
}
+ }
+ else if (warehouse.WarehouseCode.Contains("DW") || warehouse.WarehouseCode.Contains("YS"))
+ {
+ Dt_InboundOrder? inboundOrder = _inboundService.InbounOrderService.Db.Queryable<Dt_InboundOrder>().Where(x => x.OrderNo == dt_StockInfo.Details.FirstOrDefault().OrderNo).Includes(x => x.Details).First();
+ //Dt_InboundOrderDetail? inboundOrderDetail = null;
+ //鍑哄簱鍏ュ簱閫昏緫
+ if (task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
+ {
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ // 鏍规嵁鎵樼洏鏄庣粏鑾峰彇瀵瑰簲鐨勫叆搴撳崟鏄庣粏
+ List<Dt_InboundOrderDetail> inboundOrderDetails = new List<Dt_InboundOrderDetail>();
+
+ // 澶勭悊澶氫釜搴撳瓨鏄庣粏鐨勬儏鍐�
+ foreach (var stockDetail in dt_StockInfo.Details)
+ {
+ if (!string.IsNullOrEmpty(stockDetail.OrderNo))
+ {
+ var detail = inboundOrder.Details.FirstOrDefault(x => x.LinId == stockDetail.LinId && x.BatchNo == stockDetail.BatchNo);
+
+ if (detail != null && !inboundOrderDetails.Any(x => x.Id == detail.Id))
+ {
+ inboundOrderDetails.Add(detail);
+ }
+ }
+ }
+ if (!inboundOrderDetails.Any())
+ {
+ return WebResponseContent.Instance.Error($"鏈壘鍒板搴旂殑鍏ュ簱鍗曟槑缁�");
+ }
+ // 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
+ foreach (var inboundOrderDetail in inboundOrderDetails)
+ {
+ // 妫�鏌ヨ鏄庣粏鏄惁宸插叏閮ㄥ叆搴�
+ decimal totalStockQuantity = dt_StockInfo.Details
+ .Where(x => x.LinId == inboundOrderDetail.LinId && x.BatchNo == inboundOrderDetail.BatchNo)
+ .Sum(x => x.StockQuantity);
+
+ decimal orderQuantity = Convert.ToDecimal(inboundOrderDetail.OrderQuantity);
+ decimal receiptQuantity = Convert.ToDecimal(inboundOrderDetail.ReceiptQuantity);
+ decimal overInQuantity = Convert.ToDecimal(inboundOrderDetail.OverInQuantity);
+
+ // 鏇存柊鏀惰揣鏁伴噺
+ inboundOrderDetail.OverInQuantity = totalStockQuantity += overInQuantity;
+
+ // 妫�鏌ユ槸鍚﹀叏閮ㄥ畬鎴�
+ if (inboundOrderDetail.OverInQuantity == inboundOrderDetail.OrderQuantity)
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ }
+ else
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Inbounding.ObjToInt();
+ }
+ }
+ ///鏇存柊搴撳瓨鐘舵��
+ dt_StockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+ try
+ {
+ _unitOfWorkManage.BeginTran();
+
+ // 鏇存柊浠诲姟鐘舵��
+ UpdateTaskStatus(task);
+
+ // 鏇存柊璐т綅鐘舵��
+ UpdateLocationStatus(dt_LocationInfo, lastStatus);
+
+ // 鏇存柊搴撳瓨淇℃伅
+ UpdateStockInfo(dt_StockInfo);
+
+ // 娣诲姞璁板綍
+ AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
+
+ // 鏇存柊鍏ュ簱鍗曟槑缁�
+ if (inboundOrderDetails.Any())
+ {
+ BaseDal.Db.Updateable(inboundOrderDetails).ExecuteCommand();
+
+ // 妫�鏌ュ叆搴撳崟鏄惁鍏ㄩ儴瀹屾垚
+ bool allCompleted = inboundOrder.Details.All(x =>
+ x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+
+ if (allCompleted)
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt();
+ }
+ else
+ {
+ inboundOrder.OrderStatus = InboundStatusEnum.鍏ュ簱涓�.ObjToInt();
+ }
+ }
+
+ // 鏇存柊鍏ュ簱鍗�
+ UpdateInboundOrder(inboundOrder, inboundOrderDetails.FirstOrDefault());
+
+ // 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤MS鍥炰紶
+ if (inboundOrderDetails.Any(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt()) && inboundOrder.System.Equals("ERP"))
+ {
+ if(inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt())
+ {
+ bool allCompleted = inboundOrder.Details.All(x => x.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt());
+ if (allCompleted)
+ {
+ foreach (var detail in inboundOrder.Details)
+ {
+ FeedBackInboundERP(inboundOrder.UpperOrderNo, detail.LinId);
+ }
+ }
+ }
+ }
+ if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 0 && inboundOrder.System.Equals("SMOM"))
+ {
+
+ }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
+ {
+ SendAllocateInfoToWMS(task, inboundOrder, dt_StockInfo);
+ }
+
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw new Exception($"鍏ュ簱澶勭悊澶辫触锛歿ex.Message}", ex);
+ }
+
+ }
+ if (task.TaskType == TaskTypeEnum.SurplusReturn.ObjToInt() || task.TaskType == TaskTypeEnum.ReverseIn.ObjToInt())
+ {
+ return ReturnInbound(task, dt_StockInfo, dt_LocationInfo);
+ }
+ if (task.TaskType == TaskTypeEnum.InInventory.ObjToInt())
+ {
+ int lastStatus = dt_LocationInfo.LocationStatus;
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
+ dt_StockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
+ // 鏇存柊搴撳瓨鏄庣粏鐘舵��
+ dt_StockInfo.Details.ForEach(x => x.Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt());
+ _unitOfWorkManage.BeginTran();
+ UpdateTaskStatus(task);
+ UpdateLocationStatus(dt_LocationInfo, lastStatus);
+ UpdateStockInfo(dt_StockInfo);
+ AddRecords(task, dt_StockInfo, dt_LocationInfo, lastStatus);
+ _unitOfWorkManage.CommitTran();
+ return WebResponseContent.Instance.OK();
+
+ }
+
}
else
{
@@ -954,7 +1139,7 @@
int lastStatus, Dt_InboundOrder inboundOrder, Dt_InboundOrderDetail inboundOrderDetail)
{
// 鏇存柊鍏ュ簱鍗曟槑缁嗙姸鎬�
- UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
+ UpdateInboundOrderDetails(stockInfo, inboundOrder, ref inboundOrderDetail);
///鏇存柊搴撳瓨鐘舵��
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
// 鏇存柊搴撳瓨鏄庣粏鐘舵��
@@ -977,21 +1162,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);
+ // 鍗曟嵁鏁伴噺鍏ㄩ儴涓婃灦瀹屾垚锛屽鐞哤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);
}
- 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);
- }
+ else if (inboundOrder.OrderStatus == InboundStatusEnum.鍏ュ簱瀹屾垚.ObjToInt() && inboundOrder.OrderType == 2 && inboundOrder.System.Equals("SMOM"))
+ {
+ SendAllocateInfoToWMS(task, inboundOrder, stockInfo);
+ }
_unitOfWorkManage.CommitTran();
return WebResponseContent.Instance.OK();
@@ -1468,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);
}
@@ -1493,104 +1682,152 @@
{
try
{
- Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>().Where(x => x.OrderNo == task.OrderNo).Includes(x => x.Details)
- .First();
+ Dt_NewOutboundOrder outboundOrder = _outboundService.NewOutboundOrderService.Db.Queryable<Dt_NewOutboundOrder>()
+ .Where(x => x.OrderNo == task.OrderNo)
+ .Includes(x => x.Details)
+ .First();
- Dt_NewOutboundOrderDetail outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
- .Where(x => x.OrderId == outboundOrder.Id && x.LocationName == stockInfo.LocationCode&&x.LPNNo==stockInfo.PalletCode)
- .First();
- //List<Dt_StockInfoDetail> stockInfoDetail = _stockInfoDetailRepository.QueryData(x => x.StockId == stockInfo.Id).ToList();
- //foreach (var item in stockInfoDetail)
- //{
- // outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
- // .Where(x => x.OrderId == outboundOrder.Id && x.BatchNo == item.BatchNo && x.LocationName == stockInfo.LocationCode)
- // .First();
+ List<Dt_NewOutboundOrderDetail> outboundOrderDetails = _outboundService.NewOutboundOrderDetailService.Db.Queryable<Dt_NewOutboundOrderDetail>()
+ .Where(x => x.OrderId == outboundOrder.Id &&
+ x.LocationName == stockInfo.LocationCode &&
+ x.LPNNo == stockInfo.PalletCode)
+ .ToList();
- // item.OutboundQuantity += outboundOrderDetails.OverOutQuantity;
- //}
+ if (outboundOrderDetails == null || outboundOrderDetails.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 item in stockInfo.Details)
+ foreach (var stockDetail in stockInfoDetails)
{
- if (outboundOrderDetails == null) continue;
+ var matchingOrderDetails = outboundOrderDetails
+ .Where(x => x.MaterielCode == stockDetail.MaterielCode &&
+ x.BatchNo == stockDetail.BatchNo)
+ .ToList();
- outboundOrderDetails.OverOutQuantity += item.OutboundQuantity;
-
- if (outboundOrderDetails.OverOutQuantity == outboundOrderDetails.OrderQuantity)
+ if (matchingOrderDetails.Count == 0)
{
- outboundOrderDetails.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
- overCount++;
+ 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)
+ {
+ orderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ }
}
}
+ // 鏇存柊璁㈠崟鐘舵��
if (outboundOrder.Details.Count == overCount)
{
outboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
}
-
_unitOfWorkManage.BeginTran();
- ///鏇存柊鍑哄簱鍗�
- _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
- // 鏇存柊鍑哄簱璁㈠崟璇︽儏
- _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- // 鏇存柊搴撳瓨鐘舵��
- AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
-
- // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
- if (outboundOrder.System == null)
+ try
{
- return WebResponseContent.Instance.Error("鍑哄簱鍗曟暟鎹簮涓虹┖");
- }
- if (!outboundOrder.System.Equals("SMOM"))
- {
- UpdateLocationStatus(locationInfo);
- }
- // 澶勭悊浠诲姟瀹屾垚
- CompleteTask(task);
+ // 鏇存柊鍑哄簱鍗�
+ _outboundService.NewOutboundOrderService.Repository.UpdateData(outboundOrder);
- // 娣诲姞鐘舵�佸彉鏇磋褰�
- 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");
+ _outboundService.NewOutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
- if (outboundOrderDetails.OrderDetailStatus == OrderDetailStatusEnum.Over.ObjToInt() && outboundOrder.System.Equals("ERP"))
- {
- FeedBackOutERP(outboundOrder.OrderNo, outboundOrderDetails.LinId);
- DownloadReport(path, savePath, outboundOrderDetails.Id);
- }
- ///鍗曟嵁瀹屾垚鎺ㄩ�丼MOM绯荤粺
- if (outboundOrder.OrderStatus == OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt() && outboundOrder.System.Equals("SMOM"))
- {
- var stockInfoDetail1 = stockInfo.Details.FirstOrDefault();
- List<Dt_OutStockLockInfo> outStockLockInfo = _outboundService.OutboundStockLockInfoService.Repository.QueryData(x => x.OrderNo == outboundOrder.OrderNo);
+ AddCPRetrueOrder(stockInfo, outboundOrder, outboundOrderDetails);
- if (outStockLockInfo.Count == 0) throw new Exception("鏈壘鍒板簱瀛樹俊鎭�");
- //閲囪喘鍑哄簱
- if (outboundOrder.OrderType == 1)
+ // 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
+ if (outboundOrder.System == null)
{
- var passBack = new HouseoutboundPassBack
+ 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()))
{
- ApiType = "ShippingOrderController",
- Method = "AsrsOutboundSO",
- Parameters = new List<HouseoutboundPassBack.datas>
+ 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
{
- new HouseoutboundPassBack.datas
- {
- 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 = outStockLockInfo.Select(d => new HouseoutboundPassBack.datas.data1.Inbound
+ ApiType = "ShippingOrderController",
+ Method = "AsrsOutboundSO",
+ Parameters = new List<HouseoutboundPassBack.datas>
+ {
+ new HouseoutboundPassBack.datas
+ {
+ 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,
@@ -1601,99 +1838,140 @@
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 ?? "鏈彁渚涢敊璇俊鎭�"}");
}
}
- }
- };
+ }
- // 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
+ // 璋冩嫧鍑哄簱
+ if (outboundOrder.OrderType == 2)
{
- ApiType = "InventoryAllocateController",
- Method = "AsrsFinishedStockCount",
- Parameters = new List<Allocate>
+ var allocate = new InventoryAllocate
{
- 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 = outStockLockInfo.Select(item =>
+ 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 = outboundOrderDetails.LinId,
+ LinId = item.LinId,
LPNNo = item.PalletCode,
- MaterielCode = outboundOrderDetails.MaterielCode,
- OrderQuantity = outboundOrderDetails.OrderQuantity,
- BatchNo = outboundOrderDetails.BatchNo,
- FinishQty = outboundOrderDetails.OrderQuantity,
- OrinalLocation=outboundOrderDetails.OrinalLocation,
+ MaterielCode = item.MaterielCode,
+ OrderQuantity = item.OrderQuantity,
+ BatchNo = item.BatchNo,
+ FinishQty = item.OrderQuantity,
LocationName = task.SourceAddress
};
}).ToList()
- }
- }
- }
- }
- };
-
- //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) // 鐩樼偣鍑哄簱
- {
- // 鐩樼偣鍑哄簱鐗规畩澶勭悊閫昏緫
+ // 璋冪敤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();
}
-
- _unitOfWorkManage.CommitTran();
- return WebResponseContent.Instance.OK();
+ catch
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
}
- catch
+ catch (Exception ex)
{
- _unitOfWorkManage.RollbackTran();
- throw;
+ return WebResponseContent.Instance.Error($"澶勭悊澶辫触: {ex.Message}");
}
+ }
+ 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)
+ .Includes(x => x.Details)
+ .First();
+
+ if (inboundOrder == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+
+ Dt_OutboundOrderDetail outboundOrderDetail = new 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;
+
+ }
+
+ if (outboundOrderDetail.LocationName != null && outboundOrderDetail.LocationName != "")
+ {
+ 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 (outboundOrderDetail == null) return WebResponseContent.Instance.Error("鏈壘鍒板嚭搴撳崟淇℃伅");
+ DWANDYSUpdateOutboundOrderDetails(stockInfo, inboundOrder, ref outboundOrderDetail);
+ // 3. 鎵ц鏍稿績鍑哄簱閫昏緫
+ return ExecuteOutboundLogic(task, stockInfo, locationInfo, outboundOrderDetail, inboundOrder);
}
else
{
@@ -1788,8 +2066,15 @@
_outboundService.OutboundOrderDetailService.Repository.UpdateData(outboundOrderDetails);
// 鏇存柊搴撳瓨鐘舵�� 鍥炲簱鍗�
- AddRetrueOrder(stockInfo, inboundOrder);
-
+ if(locationInfo.RoadwayNo.Contains("DW") || locationInfo.RoadwayNo.Contains("YS"))
+ {
+ AddDWANDYSRetrueOrder(stockInfo, inboundOrder);
+ }
+ else
+ {
+ AddRetrueOrder(stockInfo, inboundOrder);
+ }
+
// 鍖哄垎鍗曟嵁鏁版嵁鏉ユ簮鏇存柊璐т綅鐘舵��
if (inboundOrder.System == null)
{
@@ -1867,6 +2152,39 @@
{
inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ }
+ }
+ if (inboundOrder.Details.Count == overCount)
+ {
+ inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱瀹屾垚.ObjToInt();
+ }
+ }
+
+ //浣庢俯銆佽嵂姘�
+ private void DWANDYSUpdateOutboundOrderDetails(Dt_StockInfo stockInfo, Dt_OutboundOrder inboundOrder, ref Dt_OutboundOrderDetail inboundOrderDetail)
+ {
+ 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)
+ {
+ if (inboundOrderDetail == null) continue;
+
+ if(inboundOrderDetail.BatchNo == item.BatchNo)
+ {
+ inboundOrderDetail.OverOutQuantity += item.OutboundQuantity;
+
+ if (inboundOrderDetail.OverOutQuantity == inboundOrderDetail.OrderQuantity)
+ {
+ inboundOrderDetail.OrderDetailStatus = OrderDetailStatusEnum.Over.ObjToInt();
+ overCount++;
+ }
+ else if (inboundOrderDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ inboundOrderDetail.OrderDetailStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ inboundOrder.OrderStatus = OutboundStatusEnum.鍑哄簱涓�.ObjToInt();
+ }
}
}
if (inboundOrder.Details.Count == overCount)
@@ -2137,8 +2455,7 @@
private void AddRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
{
Dt_StockInfoDetail stockInfoDetail = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
- .Where(x => x.StockId == stockInfo.Id)
- .First();
+ .Where(x => x.StockId == stockInfo.Id).First();
if (stockInfoDetail == null)
{
throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
@@ -2199,10 +2516,99 @@
}
}
+
+ }
+
+ //浣庢俯銆佽嵂姘村洖搴撳崟
+ private void AddDWANDYSRetrueOrder(Dt_StockInfo stockInfo, Dt_OutboundOrder outboundOrder)
+ {
+
+ List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
+ .Where(x => x.StockId == stockInfo.Id).ToList();
+
+ Dt_ReturnOrder? lastReturnOrder = null;
+ foreach (var stockInfoDetail in stockInfoDetails)
+ {
+ if (stockInfoDetail == null)
+ {
+ throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
+ }
+ if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
+ {
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x => x.LPNNo == stockInfo.PalletCode && x.LocationCode == stockInfo.LocationCode && x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
+ if (returnOrder == null)
+ {
+ throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
+ }
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
+ stockInfoDetail.OutboundQuantity = 0;
+ stockInfoDetail.StockQuantity += returnOrder.OrderQuantity;
+ stockInfoDetail.OrderNo = returnOrder.OrderNo;
+ }
+ else
+ {
+ bool allowCompeted = stockInfo.Details.All(x => x.StockQuantity == x.OutboundQuantity);
+ if (allowCompeted)
+ {
+ DeleteAndMoveIntoHtStockStatus(stockInfo);
+ }
+ else
+ {
+ decimal returnQuantity = stockInfoDetail.StockQuantity - stockInfoDetail.OutboundQuantity;
+ if (returnQuantity > 0)
+ {
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = stockInfoDetail.MaterielCode,
+ MaterielName = stockInfoDetail.MaterielName,
+ BatchNo = stockInfoDetail.BatchNo,
+ OrderQuantity = returnQuantity,
+ ReceiptQuantity = returnQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = stockInfoDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS",
+ Remark = stockInfoDetail.BatchNo
+ };
+ if(lastReturnOrder != null)
+ {
+ lastReturnOrder.Remark = lastReturnOrder.Remark + $", {returnOrder.BatchNo}";
+ _returnOrderRepository.UpdateData(lastReturnOrder);
+ }
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ returnOrder.LocationCode = stockInfo.LocationCode;
+ }
+ _unitOfWorkManage.BeginTran();
+ if(lastReturnOrder == null)
+ {
+ _returnOrderRepository.AddData(returnOrder);
+ lastReturnOrder = returnOrder;
+ }
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
+ stockInfo.Remark = "浣欐枡閫�搴�";
+ stockInfoDetail.OutboundQuantity = 0;
+ stockInfoDetail.StockQuantity = returnQuantity;
+ stockInfoDetail.OrderNo = lastReturnOrder.OrderNo;
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ _stockService.StockInfoDetailService.Repository.UpdateData(stockInfoDetail);
+ _unitOfWorkManage.CommitTran();
+ }
+ }
+ }
+ }
+
+
}
//鎴愬搧鍥炲簱鍗�
- private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, Dt_NewOutboundOrderDetail outboundOrderDetail)
+ private void AddCPRetrueOrder(Dt_StockInfo stockInfo, Dt_NewOutboundOrder outboundOrder, List<Dt_NewOutboundOrderDetail> outboundOrderDetails)
{
List<Dt_StockInfoDetail> stockInfoDetails = _stockService.StockInfoDetailService.Db.Queryable<Dt_StockInfoDetail>()
.Where(x => x.StockId == stockInfo.Id)
@@ -2212,202 +2618,217 @@
{
throw new Exception("寤虹珛鍥炲簱鍗曟椂锛屾湭鎵惧埌璇ュ簱瀛樹俊鎭�");
}
-
- // 鎵惧埌涓庡綋鍓嶅嚭搴撳崟鏄庣粏鍖归厤鐨勫簱瀛樻槑缁�
- var matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
- x.MaterielCode == outboundOrderDetail.MaterielCode &&
- x.BatchNo == outboundOrderDetail.BatchNo);
-
- if (matchedStockDetail == null)
+ _unitOfWorkManage.BeginTran();
+ try
{
- throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outboundOrderDetail.MaterielCode}, 鎵规:{outboundOrderDetail.BatchNo}");
- }
-
- if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
- {
- Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
- x.LPNNo == stockInfo.PalletCode &&
- x.LocationCode == stockInfo.LocationCode &&
- x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
-
- if (returnOrder == null)
+ if (outboundOrder.OrderType == OrderTypeEnum.鍙嶆嫞鍑哄簱鍗�.ObjToInt())
{
- throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
- }
+ Dt_ReturnOrder returnOrder = _returnOrderRepository.QueryFirst(x =>
+ x.LPNNo == stockInfo.PalletCode &&
+ x.LocationCode == stockInfo.LocationCode &&
+ x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt());
- // 鍙噺鍘诲崟鎹槑缁嗕腑鐨勬暟閲�
- matchedStockDetail.OutboundQuantity = 0;
- matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OrderNo = returnOrder.OrderNo;
-
- // 鏇存柊搴撳瓨鐘舵��
- stockInfo.LocationCode = "";
- stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
- stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
-
- // 鏇存柊鍖归厤鐨勬槑缁�
- _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
- }
- else
- {
- // 璁＄畻褰撳墠鎵规鐨勫墿浣欐暟閲�
- decimal remainingQuantity = matchedStockDetail.StockQuantity - outboundOrderDetail.OrderQuantity;
-
- _unitOfWorkManage.BeginTran();
-
- try
- {
- if (remainingQuantity > 0)
+ if (returnOrder == null)
{
- // 涓哄綋鍓嶆壒娆″垱寤鸿繑搴撳崟
- Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ throw new Exception("鍙嶆嫞鍑哄簱鍚庯紝鏈壘鍒板搴斿弽鎷ｅ洖搴撳崟淇℃伅");
+ }
+ foreach (var outDetail in outboundOrderDetails)
+ {
+ var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outDetail.MaterielCode && x.BatchNo == outDetail.BatchNo);
+ if (matchedStockDetail == null)
{
- MaterielCode = matchedStockDetail.MaterielCode,
- MaterielName = matchedStockDetail.MaterielName,
- BatchNo = matchedStockDetail.BatchNo,
- OrderQuantity = remainingQuantity,
- ReceiptQuantity = remainingQuantity,
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>
+ x.MaterielCode == outDetail.MaterielCode);
+
+ if (matchedStockDetail == null)
+ {
+ throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outDetail.MaterielCode}, 鎵规:{outDetail.BatchNo}");
+ }
+ }
+ // 鍙噺鍘诲崟鎹槑缁嗕腑鐨勬暟閲�
+ matchedStockDetail.OutboundQuantity = 0;
+ matchedStockDetail.StockQuantity = outDetail.OrderQuantity;
+ matchedStockDetail.OrderNo = returnOrder.OrderNo;
+ // 鏇存柊鍖归厤鐨勬槑缁�
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+ }
+
+
+ // 鏇存柊搴撳瓨鐘舵��
+ stockInfo.LocationCode = "";
+ stockInfo.StockStatus = StockStatusEmun.鍙嶆嫞鍏ュ簱.ObjToInt();
+ stockInfo.Remark = "鍙嶆嫞鍏ュ簱";
+ _stockService.StockInfoService.Repository.UpdateData(stockInfo);
+ }
+ else
+ {
+ var groupedDetails = outboundOrderDetails
+ .GroupBy(d => new { d.MaterielCode, d.BatchNo })
+ .ToList();
+ List<Dt_StockInfoDetail> processedStockDetails = new List<Dt_StockInfoDetail>();
+ List<Dt_ReturnOrder> returnOrders = new List<Dt_ReturnOrder>();
+
+ decimal totalOutboundQuantity = outboundOrderDetails.Sum(x => x.OrderQuantity);
+ decimal totalStockQuantity = stockInfoDetails.Sum(x => x.StockQuantity);
+
+ foreach (var groupeDetail in groupedDetails)
+ {
+ var outboundDetail = groupeDetail.First();
+ decimal totalOrderQuantity = groupeDetail.Sum(x => x.OrderQuantity);
+ var matchedStockDetail = stockInfoDetails.FirstOrDefault(x => x.MaterielCode == outboundDetail.MaterielCode && x.BatchNo == outboundDetail.BatchNo);
+ if (matchedStockDetail == null)
+ {
+ matchedStockDetail = stockInfoDetails.FirstOrDefault(x =>x.MaterielCode == outboundDetail.MaterielCode);
+
+ if (matchedStockDetail == null)
+ {
+ throw new Exception($"鏈壘鍒板尮閰嶇殑搴撳瓨鏄庣粏淇℃伅锛岀墿鏂�:{outboundDetail.MaterielCode}, 鎵规:{outboundDetail.BatchNo}");
+ }
+ }
+ // 璁＄畻褰撳墠鎵规鐨勫墿浣欐暟閲�
+ decimal remainingQuantity = matchedStockDetail.StockQuantity - totalOrderQuantity;
+
+ if (remainingQuantity > 0)
+ {
+ Dt_ReturnOrder returnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = matchedStockDetail.MaterielCode,
+ MaterielName = matchedStockDetail.MaterielName,
+ BatchNo = matchedStockDetail.BatchNo,
+ OrderQuantity = remainingQuantity,
+ ReceiptQuantity = remainingQuantity,
+ OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
+ LinId = matchedStockDetail.LinId,
+ LPNNo = stockInfo.PalletCode,
+ Creater = "LK",
+ CreateDate = DateTime.Now,
+ OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
+ System = "WMS",
+ Remark = "澶氭壒娆¤繑搴�" // 娣诲姞澶囨敞鏍囪瘑
+ };
+
+ if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
+ {
+ returnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+ // 娣诲姞杩斿簱鍗�
+ returnOrders.Add(returnOrder);
+
+ // 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
+ matchedStockDetail.StockQuantity = outboundDetail.OrderQuantity;
+ matchedStockDetail.OutboundQuantity = outboundDetail.OrderQuantity;
+ //matchedStockDetail.OrderNo = returnOrder.OrderNo;
+ }
+ else if (remainingQuantity == 0)
+ {
+ // 褰撳墠鎵规姝ｅソ鍑哄畬
+ matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
+ if (matchedStockDetail.StockQuantity == totalOrderQuantity)
+ {
+ _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(
+ matchedStockDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
+ }
+ else
+ {
+ matchedStockDetail.StockQuantity = 0;
+ _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
+ }
+ }
+ else
+ {
+ throw new Exception($"鍑哄簱鏁伴噺 {outboundDetail.OrderQuantity} 澶т簬搴撳瓨鏁伴噺 {matchedStockDetail.StockQuantity}");
+ }
+ processedStockDetails.Add(matchedStockDetail);
+ }
+
+ // 澶勭悊鍏朵粬鎵规鐨勫簱瀛樻槑缁嗭紙鍏ㄩ儴杩斿簱锛�
+ var otherBatchDetails = stockInfoDetails
+ .Where(x => !processedStockDetails.Contains(x) && x.StockQuantity > 0)
+ .ToList();
+
+ if (otherBatchDetails.Count > 0)
+ {
+ decimal totalOtherQuantity = otherBatchDetails.Sum(x => x.StockQuantity);
+
+ // 涓哄叾浠栨壒娆″垱寤鸿繑搴撳崟锛堝彧鍒涘缓涓�涓紝鍖呭惈鎵�鏈夋壒娆★級
+ var firstOtherDetail = otherBatchDetails.First();
+ Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
+ {
+ MaterielCode = firstOtherDetail.MaterielCode,
+ MaterielName = firstOtherDetail.MaterielName,
+ BatchNo = firstOtherDetail.BatchNo,
+ OrderQuantity = totalOtherQuantity,
+ ReceiptQuantity = totalOtherQuantity,
OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = matchedStockDetail.LinId,
+ LinId = firstOtherDetail.LinId,
LPNNo = stockInfo.PalletCode,
Creater = "LK",
CreateDate = DateTime.Now,
OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
+ System = "WMS",
+ Remark = $"澶氭壒娆¤繑搴擄紝鍏眥otherBatchDetails.Count}涓壒娆�"
};
+ if (outboundOrder.System == "SMOM" && !string.IsNullOrEmpty(stockInfo.LocationCode))
+ {
+ otherReturnOrder.LocationCode = stockInfo.LocationCode;
+ }
+
+
+ returnOrders.Add(otherReturnOrder);
+ }
+
+ // 鎵归噺鏇存柊宸插鐞嗙殑搴撳瓨鏄庣粏
+ var updateDetails = processedStockDetails.Where(x => x.StockQuantity > 0).ToList();
+ if (updateDetails.Any())
+ {
+ _stockService.StockInfoDetailService.Repository.UpdateData(updateDetails);
+ }
+
+ // 娣诲姞杩斿簱鍗�
+ if (returnOrders.Any())
+ {
+ _returnOrderRepository.AddData(returnOrders);
+ }
+
+ // 鏇存柊搴撳瓨涓昏〃鐘舵��
+ decimal returnQuantity = totalStockQuantity - totalOutboundQuantity;
+ if (returnQuantity == 0)
+ {
if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
{
- returnOrder.LocationCode = stockInfo.LocationCode;
+ Dt_LocationInfo dt_LocationInfo = _locationInfoService.Repository.QueryFirst(x => x.LocationCode == stockInfo.LocationCode);
+ dt_LocationInfo.LocationStatus = LocationStatusEnum.Free.ObjToInt();
+ _basicRepository.LocationInfoRepository.UpdateData(dt_LocationInfo);
}
-
- // 娣诲姞杩斿簱鍗�
- _returnOrderRepository.AddData(returnOrder);
-
- // 鏇存柊褰撳墠鎵规鏄庣粏锛氬彧淇濈暀鍑哄簱鏁伴噺锛屽叾浣欒繑搴�
- matchedStockDetail.StockQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OutboundQuantity = outboundOrderDetail.OrderQuantity;
- matchedStockDetail.OrderNo = returnOrder.OrderNo;
-
- _stockService.StockInfoDetailService.Repository.UpdateData(matchedStockDetail);
-
- // 澶勭悊鍏朵粬鎵规鐨勫簱瀛樻槑缁嗭紙鍏ㄩ儴杩斿簱锛�
- var otherBatchDetails = stockInfoDetails
- .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
- .ToList();
-
- foreach (var otherDetail in otherBatchDetails)
+ // 鍏ㄩ儴鍑哄簱锛屽垹闄ゅ簱瀛�
+ DeleteAndMoveIntoHtStockStatus(stockInfo);
+ foreach (var item in stockInfo.Details)
{
- if (otherDetail.StockQuantity > 0)
- {
- // 涓哄叾浠栨壒娆″垱寤鸿繑搴撳崟
- Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
- {
- MaterielCode = otherDetail.MaterielCode,
- MaterielName = otherDetail.MaterielName,
- BatchNo = otherDetail.BatchNo,
- OrderQuantity = otherDetail.StockQuantity,
- ReceiptQuantity = otherDetail.StockQuantity,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = otherDetail.LinId,
- LPNNo = stockInfo.PalletCode,
- Creater = "LK",
- CreateDate = DateTime.Now,
- OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
- };
-
- if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
- {
- otherReturnOrder.LocationCode = stockInfo.LocationCode;
- }
-
- _returnOrderRepository.AddData(otherReturnOrder);
-
- // 鍏朵粬鎵规鍏ㄩ儴杩斿簱锛屽簱瀛樻竻闆�
- otherDetail.StockQuantity = 0;
- otherDetail.OutboundQuantity = 0;
- otherDetail.OrderNo = otherReturnOrder.OrderNo;
-
- _stockService.StockInfoDetailService.Repository.UpdateData(otherDetail);
- }
+ BaseDal.Db.Deleteable(item.StockDetails).ExecuteCommand();
}
-
- // 鏇存柊搴撳瓨涓昏〃鐘舵��
+ }
+ else if (returnQuantity > 0)
+ {
+ // 鏈変綑鏂欒繑搴�
stockInfo.LocationCode = "";
stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
- stockInfo.Remark = "浣欐枡閫�搴�";
+ stockInfo.Remark = $"浣欐枡閫�搴擄紝鍏眥returnOrders.Count}涓繑搴撳崟";
_stockService.StockInfoService.Repository.UpdateData(stockInfo);
}
- else if (remainingQuantity == 0)
- {
- // 褰撳墠鎵规姝ｅソ鍑哄畬
- matchedStockDetail.OutboundQuantity = matchedStockDetail.StockQuantity;
- _stockService.StockInfoDetailService.Repository.DeleteAndMoveIntoHty(matchedStockDetail, App.User.UserId == 0 ? OperateType.鑷姩瀹屾垚 : OperateType.浜哄伐瀹屾垚);
- // 鍏朵粬鎵规鍏ㄩ儴杩斿簱
- var otherBatchDetails = stockInfoDetails
- .Where(x => x.Id != matchedStockDetail.Id && x.StockQuantity > 0)
- .ToList();
-
- foreach (var otherDetail in otherBatchDetails)
- {
- if (otherDetail.StockQuantity > 0)
- {
- Dt_ReturnOrder otherReturnOrder = new Dt_ReturnOrder
- {
- MaterielCode = otherDetail.MaterielCode,
- MaterielName = otherDetail.MaterielName,
- BatchNo = otherDetail.BatchNo,
- OrderQuantity = otherDetail.StockQuantity,
- ReceiptQuantity = otherDetail.StockQuantity,
- OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt(),
- LinId = otherDetail.LinId,
- LPNNo = stockInfo.PalletCode,
- Creater = "LK",
- CreateDate = DateTime.Now,
- OrderType = OrderTypeEnum.浣欐枡鍥炲簱鍗�.ObjToInt(),
- System = "WMS"
- };
-
- if (outboundOrder.System == "SMOM" && stockInfo.LocationCode != null)
- {
- otherReturnOrder.LocationCode = stockInfo.LocationCode;
- }
-
- _returnOrderRepository.AddData(otherReturnOrder);
- }
- }
-
- // 濡傛灉鎵�鏈夋壒娆￠兘鍑哄畬浜嗭紝鍒犻櫎搴撳瓨
- var totalRemaining = stockInfoDetails.Sum(x => x.StockQuantity);
- if (totalRemaining == 0)
- {
- DeleteAndMoveIntoHtStockStatus(stockInfo);
- }
- else
- {
- // 杩樻湁搴撳瓨锛屾洿鏂扮姸鎬�
- stockInfo.LocationCode = "";
- stockInfo.StockStatus = StockStatusEmun.浣欐枡閫�搴�.ObjToInt();
- stockInfo.Remark = "浣欐枡閫�搴�";
- _stockService.StockInfoService.Repository.UpdateData(stockInfo);
- }
- }
- else
- {
- throw new Exception($"鍑哄簱鏁伴噺 {outboundOrderDetail.OrderQuantity} 澶т簬搴撳瓨鏁伴噺 {matchedStockDetail.StockQuantity}");
- }
-
- _unitOfWorkManage.CommitTran();
}
- catch
- {
- _unitOfWorkManage.RollbackTran();
- throw;
- }
+ _unitOfWorkManage.CommitTran();
}
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ throw;
+ }
+
}
+
/// <summary>
/// 鍗曟嵁鏄庣粏鍑哄簱瀹屾垚鍥炶皟ERP(琛ㄥ崟鎻愪氦)
/// </summary>
@@ -2699,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>
@@ -2746,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>
/// 妫�鏌ユ枃浠舵槸鍚﹀彲璁块棶
@@ -2896,6 +3413,101 @@
}
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_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();
+ 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);
+ _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