From 53057cc533632e7f7ddf671bf6f7a26a3de444c1 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期日, 19 一月 2025 15:36:34 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/InboundOrderService.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 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 00a078d..fd869c4 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"
@@ -429,7 +429,7 @@
/// <param name="warehouseId"></param>
/// <param name="serNums"></param>
/// <returns></returns>
- public WebResponseContent InPinKu(int warehouseId, List<string> serNums)
+ public WebResponseContent WMSInPinKu(int warehouseId, List<string> serNums)
{
WebResponseContent content = new WebResponseContent();
try
@@ -472,6 +472,7 @@
SerialNumber = model.SerialNumber,
StockQuantity = model.Quantity,
OutboundQuantity = 0,
+ OrderNo = "",
Unit = materielInfo.MaterielUnit,
Status = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt(),
ProductionDate = model.ProductionDate,
@@ -621,6 +622,13 @@
stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
}
}
+ else if(warehouse.WarehouseCode == WarehouseEnum.HA57.ToString())
+ {
+ if (models.Count >= 2)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
+ }
+ }
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
foreach (var model in models)
@@ -766,6 +774,13 @@
stockInfo.PalletType = PalletTypeEnum.LargestPallet.ObjToInt();
}
}
+ else if (warehouse.WarehouseCode == WarehouseEnum.HA57.ToString())
+ {
+ if (models.Count >= 2)
+ {
+ return WebResponseContent.Instance.Error($"缁勭洏鏄庣粏涓嶅敮涓�");
+ }
+ }
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
List<int> detailKeys = new List<int>();
@@ -847,7 +862,7 @@
List<ERPInboundDetailModel>? detailModels = new List<ERPInboundDetailModel>();
foreach (var stockInfo in stockInfos)
{
- foreach (var item in stockInfo.Details.GroupBy(x=>x.InboundOrderRowNo).Select(x=>x.Key))
+ foreach (var item in stockInfo.Details.GroupBy(x => x.InboundOrderRowNo).Select(x => x.Key))
{
//鍖哄垎涓嶅悓鎵规
Dt_StockInfoDetail? dt_StockInfoDetail = stockInfo.Details.Where(x => x.InboundOrderRowNo == item).FirstOrDefault();
@@ -905,7 +920,7 @@
throw new ArgumentNullException(nameof(ruleCode));
SqlSugarClient sugarClient = new SqlSugarClient(new ConnectionConfig
{
- IsAutoCloseConnection = false,
+ IsAutoCloseConnection = true,
DbType = DbType.SqlServer,
ConnectionString = DBContext.ConnectionString
});
--
Gitblit v1.9.3