From dcecb039035f4b2e82e31c39b74db9402444c536 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 08 四月 2025 21:35:39 +0800
Subject: [PATCH] 代码更新，优化等内容
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
index 7bede87..99b1724 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesProductService.cs"
@@ -34,6 +34,12 @@
{
return content.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
+ //闄愬埗浠诲姟
+ Dt_Task task = BaseDal.QueryFirst(x => x.SourceAddress == bagInfoModel.WorkCenter && (x.TaskStatus == TaskStatusEnum.New.ObjToInt() || x.TaskStatus == TaskStatusEnum.Line_Execute.ObjToInt() || x.TaskStatus == TaskStatusEnum.Line_Executing.ObjToInt()));
+ if (task!=null)
+ {
+ return content.Error($"绾夸綋瀛樺湪浠诲姟鎴栨墽琛屼腑,鑳舵鍙穥task.PalletCode}");
+ }
Dt_Warehouse warehouseLocation = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == WarehouseEnum.HA71.ToString());
Dt_LocationInfo locationInfo = _basicRepository.LocationInfoRepository.QueryFirst(x => x.WarehouseId == warehouseLocation.WarehouseId);
if (locationInfo == null)
@@ -188,6 +194,10 @@
{
return content.Error($"鍐呭寘{item.BagNo}璐х墿鐘舵�佸紓甯�");
}
+ if (proStockInfoDetail.OutboundQuantity<=0)
+ {
+ return content.Error($"鍐呭寘{item.BagNo}鍑哄簱鏁伴噺鏈垎閰�");
+ }
Dt_MesProInOrderDetail mesProInOrderDetail = new Dt_MesProInOrderDetail()
{
BagNo = item.BagNo,
@@ -248,14 +258,14 @@
/// <summary>
/// MES鎴愬搧鍑哄簱鍗曞悓姝ユ暟鎹鐞�
/// </summary>
- public MesShipmentOrderSync MesOutSync(Dt_OutProStockInfo outProStockInfo, Dt_ProOutOrderDetail proOutOrderDetail)
+ public MesShipmentOrderSync MesOutSync(Dt_OutProStockInfo outProStockInfo, Dt_ProOutOrderDetail proOutOrderDetail,List<Dt_ProStockInfoDetail> proStockInfoDetails)
{
List<MesShipOrderDetail> mesShipOrderDetails = new List<MesShipOrderDetail>();
//鑾峰彇鍑哄簱鍗�
Dt_ProOutOrder proOutOrder = _outboundService.ProOutOrderService.Repository.QueryFirst(x => x.Id == proOutOrderDetail.ProOrderId);
//鑾峰彇瀹㈡埛
Dt_CustomerInfo customerInfo = _basicRepository.CustomerInfoRepository.QueryFirst(x => x.Code == proOutOrderDetail.Customer);
-
+ List<string> outBags = proStockInfoDetails.Where(x => x.OutboundQuantity > 0).Select(x => x.BagNo).ToList();
MesShipOrderDetail orderDetail = new MesShipOrderDetail()
{
ProductCode = proOutOrderDetail.PCode,
@@ -264,7 +274,8 @@
DateCode= outProStockInfo.DateCode,
SaleOrder = proOutOrderDetail.SaleOrder,
Sequence = outProStockInfo.Id,
- WorkCenter = "SPCK_OUTER-001"
+ WorkCenter = "SPCK_OUTER-001",
+ PlasticBox=new List<PlasticBox> { new PlasticBox() { PlasticBoxNumber= outProStockInfo.PalletCode,Insourcings=outBags } }
};
mesShipOrderDetails.Add(orderDetail);
MesShipmentOrderSync shipmentOrderSync = new MesShipmentOrderSync()
--
Gitblit v1.9.3