From d1feb3ca73935d14dfa5d96548d682e875aa2443 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期二, 13 五月 2025 14:22:34 +0800
Subject: [PATCH] 预警更新
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
index cf79150..a608a7f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs"
@@ -1331,6 +1331,8 @@
try
{
List<ERPProItemsItem> proItemsItems = new List<ERPProItemsItem>();
+ Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x=>x.WarehouseId==mesProInOrder.WarehouseId);
+ string batchNoRemark = "";
foreach (var item in mesProInOrder.Details)
{
ERPProItemsItem proItemsItem = new ERPProItemsItem()
@@ -1338,7 +1340,7 @@
PartNum = item.ProductCode,
Rev=item.ProductVersion,
DateCode=item.DateCode,
- BatchNumber= item.BagNo,
+ BatchNumber= item.ProductCode,
XLocation=item.XSite,
Xqty=item.XQty,
QtySet=item.SETQty,
@@ -1354,6 +1356,7 @@
}
}
};
+ batchNoRemark += item.BagNo + ",";
proItemsItems.Add(proItemsItem);
}
ERPProInboundModel proInboundModel = new ERPProInboundModel()
@@ -1363,13 +1366,20 @@
CreatorCode = "GSWMS",
CompanyCode = "HATC",
FactoryCode = "HA02",
- WarehouseCode = "HA71",
- LocationCode = "HA71",
+ WarehouseCode = warehouse.WarehouseCode,
+ LocationCode = warehouse.WarehouseCode,
StockDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
StockFormType= "Production",
- StockFormItems= proItemsItems
+ StockFormItems= proItemsItems,
+ Remark=batchNoRemark
};
- _invokeERPService.InvokeProInApi(proInboundModel);
+ string response = _invokeERPService.InvokeProInApi(proInboundModel);
+ ErpRequestContent requestContent = response.DeserializeObject<ErpRequestContent>();
+ if (requestContent.res != 1)
+ {
+ return content.Error($"{requestContent.Data}");
+ }
+ content.OK();
}
catch (Exception ex)
{
@@ -1560,6 +1570,15 @@
}
return palletTypeInfo.PalletType;
}
+ else if (warehouse.WarehouseCode == WarehouseEnum.HA58.ObjToString())
+ {
+ Dt_PalletTypeInfo palletTypeInfo = _palletTypeInfoRepository.QueryFirst(x => x.CodeStartStr == palletCode.Substring(0, 2));
+ if (palletTypeInfo == null)
+ {
+ throw new Exception($"鎵樼洏鍙烽敊璇�");
+ }
+ return palletTypeInfo.PalletType;
+ }
return -1;
}
/// <summary>
--
Gitblit v1.9.3