From 48e2278d7ac330c7f05deda6f884acb6f01206b4 Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 13 四月 2026 17:13:51 +0800
Subject: [PATCH] 1
---
WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 75 ++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
index 3cfc3f8..1aaac7e 100644
--- a/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
+++ b/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs
@@ -20,7 +20,6 @@
using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
-using WIDESEA_Core.Log;
using WIDESEA_Core.Utilities;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
@@ -111,7 +110,7 @@
{
string serialNumber = serialNumberObj?.ToString();
if (!string.IsNullOrEmpty(serialNumber))
- {
+ {
serialNumbers.Add(serialNumber);
}
else
@@ -162,6 +161,10 @@
return WebResponseContent.Instance.Error($"鏈壘鍒板叆搴撳崟鏄庣粏淇℃伅");
}
List<MatSerNumAnalysisModel> models = CodeAnalysisHelper.CodeAnalysis<MatSerNumAnalysisModel>(AnalysisCodeEnum.MatSerNumAnalysis, serialNumbers);
+
+ models.FirstOrDefault().DeliveryNote = models.FirstOrDefault()?.DeliveryNote.Replace("BS:", "");
+ models.FirstOrDefault().LotNo = models.FirstOrDefault()?.LotNo.Replace("DN:", "");
+
//楠岃瘉鍒ゆ柇鏃堕棿鏍煎紡
WebResponseContent IsValidContent = IsValidMCDates(models);
if (!IsValidContent.Status)
@@ -179,13 +182,9 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.LotNo ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
+ inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.SupplierBatch == (models.FirstOrDefault()?.DeliveryNote ?? "") && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == (quantitys.FirstOrDefault())).ToList();
}
- else
- {
- inboundOrderDetails = inboundOrder.Details.Where(x => x.MaterielCode == materielCode && x.BatchNo == (models.FirstOrDefault()?.LotNo ?? "")).ToList();
- }
-
+
if (inboundOrderDetails == null || inboundOrderDetails.Count <= 0)
{
@@ -265,13 +264,8 @@
///鎵炬暟閲忓尮閰嶇殑
if (warehouse.WarehouseCode.Contains("BC"))
{
- notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ notGroupDetail = inboundOrderDetails.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.DeliveryNote && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
}
- else
- {
- 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)
{
@@ -323,7 +317,7 @@
decimal totalQuantity = stockInfo.Details.Sum(x => x.StockQuantity);
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
-
+
_unitOfWorkManage.BeginTran();
if (stockInfo.Id == 0)
{
@@ -367,26 +361,29 @@
string json = JsonConvert.SerializeObject(item);
Dictionary<string, object> delKeyDict = JsonConvert.DeserializeObject<Dictionary<string, object>>(json);
+ string serialNumber = string.Empty;
+ decimal quantity = 0;
+ // 绗竴姝ワ細璇诲彇serialNumber骞舵牎楠�
if (delKeyDict.TryGetValue("serialNumber", out object serialNumberObj))
{
- string serialNumber = serialNumberObj?.ToString();
- if (!string.IsNullOrEmpty(serialNumber))
- {
- serialNumbers.Add(serialNumber);
- }
- else
+ serialNumber = serialNumberObj?.ToString();
+ if (string.IsNullOrEmpty(serialNumber))
{
return WebResponseContent.Instance.Error("serialNumber鐨勫�间负绌�");
}
}
+ else
+ {
+ return WebResponseContent.Instance.Error("缂哄皯serialNumber瀛楁");
+ }
+
if (delKeyDict.TryGetValue("quantity", out object quantityObj))
{
if (quantityObj == null)
{
return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺鐨勫�间负绌�");
}
- decimal quantity;
try
{
quantity = Convert.ToDecimal(quantityObj);
@@ -399,13 +396,30 @@
{
return WebResponseContent.Instance.Error("鐗╂枡鏁伴噺蹇呴』澶т簬0");
}
-
- quantitys.Add(quantity);
}
else
{
return WebResponseContent.Instance.Error("缂哄皯鐗╂枡鏁伴噺瀛楁");
}
+
+ var keyValuePairs = serialNumber.Split(',');
+ List<string> newKeyValuePairs = new List<string>();
+ bool qFieldUpdated = false;
+
+ foreach (var pair in keyValuePairs)
+ {
+ if (pair.StartsWith("Q:"))
+ {
+ newKeyValuePairs.Add($"Q:{quantity}");
+ qFieldUpdated = true;
+ }
+ else
+ {
+ newKeyValuePairs.Add(pair);
+ }
+ }
+ string updatedSerialNumber = string.Join(',', newKeyValuePairs);
+ serialNumbers.Add(updatedSerialNumber);
}
Dt_Warehouse warehouse = _warehouseService.Repository.QueryFirst(x => x.WarehouseId == warehouseId);
if (warehouse == null)
@@ -465,12 +479,17 @@
return WebResponseContent.Instance.Error($"鎵樼洏鍙烽噸澶�,璇ユ墭鐩樺凡缁勮繃鐗╂枡");
}
List<Dt_StockInfoDetail> stockInfoDetails = new List<Dt_StockInfoDetail>();
+ _unitOfWorkManage.BeginTran();
foreach (var model in models)
{
Dt_InboundOrderDetail notGroupDetail = new Dt_InboundOrderDetail();
- notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity).FirstOrDefault();
+ notGroupDetail = inboundOrder.Details.Where(x => x.OrderDetailStatus <= OrderDetailStatusEnum.Inbounding.ObjToInt() && x.MaterielCode == model.MaterielCode && x.SupplierBatch == model.LotNo && x.OrderQuantity > x.ReceiptQuantity && x.OrderQuantity == model.Quantity).FirstOrDefault();
+ if (notGroupDetail == null)
+ {
+ return WebResponseContent.Instance.Error($"璇锋鏌ョ墿鏂欎俊鎭潯鐮佸拰鍏ュ簱鍗曟槑缁嗘槸鍚﹀搴旀纭�");
+ }
if (notGroupDetail.MaterielType == 1)
{
@@ -532,7 +551,7 @@
inboundOrder.OrderStatus = InOrderStatusEnum.鍏ュ簱涓�.ObjToInt();
- _unitOfWorkManage.BeginTran();
+
if (stockInfo.Id == 0)
{
_stockRepository.StockInfoRepository.Db.InsertNav(stockInfo).Include(x => x.Details).ExecuteCommand();
@@ -1727,7 +1746,6 @@
_inboundOrderDetailService.DeleteData(item);
}
BaseDal.DeleteData(oldOutboundOrder);
- WriteLog.Write_Log("API", "SMOM鎺ㄩ�佸叆搴撳崟鎹彇娑�", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = oldOutboundOrder, 鎺ユ敹鎶ユ枃 = content });
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -1820,10 +1838,7 @@
};
_unitOfWorkManage.BeginTran();
Db.InsertNav(erpProScrapSheet).Include(x => x.Details).ExecuteCommand();
- WriteLog.Write_Log("API", "erp鍗曟嵁涓嬪彂", "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = erpProScrapSheet, 鎺ユ敹鎶ユ枃 = WebResponseContent.Instance.OK() });
-
_unitOfWorkManage.CommitTran();
-
return WebResponseContent.Instance.OK();
}
--
Gitblit v1.9.3