From edc7293bf81729ebaa2d7cdd9a1f3aeaf567f538 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期三, 31 十二月 2025 17:32:08 +0800
Subject: [PATCH] 更新
---
项目代码/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
index e1b621b..0dd2c7b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_TaskInfoService/TaskService_Inbound.cs"
@@ -459,9 +459,9 @@
{
throw new Exception($"鏈壘鍒板叆搴撳崟鍙蜂负{inboundOrder.PurchaseOrderNo}鏉＄爜{palletCode}鍗曟嵁淇℃伅");
}
- if (inboundOrderDetail.PurchaseDetailWide < 690)
+ if (inboundOrderDetail.PurchaseDetailWide < 690 || inboundOrderDetail.PurchaseDetailWide > 2500)
{
- return content.Error("鏂板巶鐗╂枡骞呭闄愬埗涓�690-2700mm");
+ return content.Error($"鐗╂枡骞呭闄愬埗涓�690-2500mm,褰撳墠绾稿嵎骞呭{inboundOrderDetail.PurchaseDetailWide}");
}
if (inboundOrderDetail.PurchaseDetailThickness <= 0)
{
@@ -509,7 +509,7 @@
BatchNo = inboundOrderDetail.MaterialLot,
StockLength = inboundOrderDetail.PurchaseDetailQuantity
};
- if (inboundOrderDetail.PurchaseDetailWide > 1200)
+ if (inboundOrderDetail.PurchaseDetailWide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -554,9 +554,9 @@
{
throw new Exception($"鏈壘鍒板叆搴撳崟鍙蜂负{inboundOrder.UpperOrderNo}鏉＄爜{palletCode}鍗曟嵁淇℃伅");
}
- if (inboundOrderDetail.MaterialWide < 690)
+ if (inboundOrderDetail.MaterialWide < 690 || inboundOrderDetail.MaterialWide > 2500)
{
- return content.Error("鏂板巶鐗╂枡骞呭闄愬埗涓�690-2700mm");
+ return content.Error($"鐗╂枡骞呭闄愬埗涓�690-2500mm,褰撳墠绾稿嵎骞呭{inboundOrderDetail.MaterialWide}");
}
if (inboundOrderDetail.MaterialThick <= 0)
{
@@ -604,7 +604,7 @@
BatchNo = inboundOrderDetail.MaterialLot,
StockLength = inboundOrderDetail.OrderQuantity
};
- if (inboundOrderDetail.MaterialWide > 1200)
+ if (inboundOrderDetail.MaterialWide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -651,9 +651,11 @@
}
BSTStockInfoDTO bSTStockInfoDTO = bSTResponse.Data ?? throw new Exception($"涓�鏈烢RP鏈繑鍥瀧palletCode}鐨勫簱瀛樹俊鎭�");
-
+ if (bSTStockInfoDTO.W < 690 || bSTStockInfoDTO.W > 2500)
+ {
+ return content.Error($"鐗╂枡骞呭闄愬埗涓�690-2500mm,褰撳墠绾稿嵎骞呭{bSTStockInfoDTO.W}");
+ }
Dt_MaterielInfo materielInfo = _basicRepository.MaterielInfoRepository.QueryFirst(x => x.MaterialSourceId == bSTStockInfoDTO.MaterialId) ?? throw new Exception($"鏈壘鍒版潯鐮亄palletCode}鐗╂枡淇℃伅{bSTStockInfoDTO.MaterialNo}");
-
//鐢熸垚搴撳瓨缁勭洏淇℃伅
Dt_StockInfo stockInfo = new Dt_StockInfo()
{
@@ -675,7 +677,7 @@
StockLength = bSTStockInfoDTO.StockMeter,
MaterielId = materielInfo.MaterialSourceId
};
- if (bSTStockInfoDTO.W > 1200)
+ if (bSTStockInfoDTO.W >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -729,6 +731,10 @@
}
else if (yLInboundCache.BarCode != palletCode && yLInboundCache.BindStatus == WhetherEnum.True.ObjToInt())
{
+ if (purchaseBSTOrderDetail.MaterialWide < 690 || purchaseBSTOrderDetail.MaterialWide > 2500)
+ {
+ return content.Error($"鐗╂枡骞呭闄愬埗涓�690-2500mm,褰撳墠绾稿嵎骞呭{purchaseBSTOrderDetail.MaterialWide}");
+ }
yLInboundCache = _mapper.Map<Dt_YLInboundCache>(purchaseBSTOrderDetail);
yLInboundCache.Id = Id;
//鑾峰彇閲囪喘涓诲崟
@@ -756,7 +762,7 @@
StockLength = purchaseBSTOrderDetail.ProcurementLength,
MaterielId = purchaseBSTOrderDetail.MaterialId
};
- if (purchaseBSTOrderDetail.MaterialWide > 1200)
+ if (purchaseBSTOrderDetail.MaterialWide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -1051,6 +1057,21 @@
_unitOfWorkManage.CommitTran();
//璁板綍搴撳瓨鍙樺姩
_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.StockLength, 0, StockChangeTypeEnum.Inbound,taskNum:task.TaskNum);
+ //涓婃姤鏂板巶ERP
+ if (stockInfo.MaterielInvOrgId==MaterielInvOrgEnum.鏂板巶.ObjToInt() && task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
+ {
+ string request = _invokeERPService.ERPPurchaseUp(new ERPPurchaseUpModel()
+ {
+ INV_BARCODE_RFID = new List<INV_BARCODE_RFIDItem>()
+ {
+ new INV_BARCODE_RFIDItem()
+ {
+ INV_BARCODE=stockInfo.PalletCode,
+ RFID_BARCODE=stockInfo.RfidCode
+ }
+ }
+ });
+ }
//涓婃姤鑰佸巶ERP
if (stockInfo.MaterielInvOrgId == MaterielInvOrgEnum.鑰佸巶.ObjToInt() && task.TaskType == TaskTypeEnum.Inbound.ObjToInt())
{
@@ -1631,7 +1652,7 @@
MaterielCode = materielInfo.MaterielCode,
MaterielName = materielInfo.MaterielName,
};
- if (wide > 1200)
+ if (wide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -1717,7 +1738,7 @@
MaterielCode = materielInfo.MaterielCode,
MaterielName = materielInfo.MaterielName,
};
- if (wide > 1200)
+ if (wide >= 1160)
{
stockInfo.PalletType = 2;
}
@@ -1895,7 +1916,7 @@
MaterielName = materielInfo.MaterielName,
StockLength=item.ProQuantity
};
- if (item.Wide > 1200)
+ if (item.Wide >= 1160)
{
stockInfo.PalletType = 2;
}
--
Gitblit v1.9.3