From 2728af674688a3d4d18ef498fde3ea808549f51b Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 13:12:48 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
index 5a66e35..1d72719 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs"
@@ -91,7 +91,7 @@
public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
{
try
- {
+ {
// 1锔忊儯 鏍￠獙璇锋眰
if (request == null || request.details == null || !request.details.Any())
{
@@ -130,6 +130,7 @@
StockQuantity = 0,
OutboundQuantity = 0,
SupplyQuantity = 0,
+ AvailableQuantity = 0,
InDate = DateTime.Now,
ProductionDate = detail.finishDate.ToString("yyyy-MM-dd"),
ShelfLife = 0,
@@ -152,6 +153,7 @@
BatchNo = detail.batchNo,
StockQuantity = 0,
OutboundQuantity = 0,
+ AvailableQuantity = 0,
SupplyQuantity = 0,
ERPStockQuantity = 0,
Status = false,
@@ -166,11 +168,13 @@
{
case "1": //鍏ュ簱
entity.StockQuantity = orderQty; //瀹為檯搴撳瓨
+ entity.AvailableQuantity = orderQty;
entity.InDate = DateTime.Now;
entity.Remark = "鍏ュ簱鍗曞洖浼�";
batch.StockQuantity = orderQty;
+ batch.AvailableQuantity = orderQty;
batch.Remark = "鍏ュ簱鍗曞洖浼�";
UpdateInboundOrderDetailStatus(detail.batchNo, detail.productCode);
break;
@@ -179,12 +183,14 @@
decimal actualOutQty = entity.StockQuantity - orderQty;// 璁＄畻鏈瀹為檯鍑哄簱鏁伴噺 20
entity.StockQuantity=orderQty; //瀹為檯搴撳瓨鏁� 100
entity.OutboundQuantity =Math.Max(0,entity.OutboundQuantity-actualOutQty); //寰呭嚭搴撴暟閲�
+ entity.AvailableQuantity = entity.StockQuantity - entity.OutboundQuantity;//鍙敤搴撳瓨
if (entity.StockQuantity < 0) entity.StockQuantity = 0;
entity.Remark = "鍑哄簱鍗曞洖浼�";
batch.StockQuantity = orderQty;
batch.OutboundQuantity =Math.Max(0,batch.OutboundQuantity-actualOutQty);//寰呭嚭搴撴暟閲�
+ batch.AvailableQuantity = batch.StockQuantity - batch.OutboundQuantity; //鍙敤搴撳瓨
if (batch.StockQuantity < 0) batch.StockQuantity = 0;
batch.Remark = "鍑哄簱鍗曞洖浼�";
UpdateOutboundOrderDetailStatus(detail.batchNo, detail.productCode);
--
Gitblit v1.9.3