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 | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 2f92c4b..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,9 +622,15 @@
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>();
foreach (var model in models)
{
if (purchaseOrderNos.FirstOrDefault(x => x == model.PurchaseOrderNo) == null)
@@ -631,13 +638,12 @@
return WebResponseContent.Instance.Error($"鏈湪鏀惰揣鍗曟槑缁嗕腑鎵惧埌璇ラ噰璐崟");
}
- Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt() && x.OrderQuantity == model.Quantity && !detailKeys.Contains(x.Id) && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ Dt_InboundOrderDetail? notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus < OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode==model.MaterielCode && x.BatchNo==model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
if (notGroupDetail == null)
{
return WebResponseContent.Instance.Error($"璇ョ墿鏂欏湪璇ュ叆搴撳崟涓凡鍏ㄩ儴缁勭洏瀹屾垚");
}
- detailKeys.Add(notGroupDetail.Id);
Dt_StockInfoDetail stockInfoDetail = new Dt_StockInfoDetail()
{
BatchNo = model.LotNo,
@@ -662,8 +668,11 @@
stockInfoDetails.Add(stockInfoDetail);
- notGroupDetail.ReceiptQuantity = model.Quantity;
- notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+ notGroupDetail.ReceiptQuantity += model.Quantity;
+ if (notGroupDetail.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt())
+ {
+ notGroupDetail.OrderDetailStatus = OrderDetailStatusEnum.GroupAndInbound.ObjToInt();
+ }
}
float totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
@@ -765,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>();
@@ -846,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();
@@ -904,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