From bfc11f87e2b64420c9917c0b9881b3e327d6f796 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 04 十一月 2025 22:19:59 +0800
Subject: [PATCH] 优化调拨出入库
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs | 11 ++++++++++-
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs | 11 ++++++++---
新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/InventoryServices.cs | 5 +++++
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
index fdb77d2..553f878 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/DeliveryOrderServices.cs"
@@ -1091,6 +1091,7 @@
return content;
}
+
public WebResponseContent OutTaskFinish(Dt_SupplyTask supplyTask, Dt_DeliveryOrder deliveryOrder)
{
WebResponseContent content = new WebResponseContent();
@@ -1139,7 +1140,7 @@
_inventory_BatchServices.DeleteData(inventory_Batch);
else
_inventory_BatchServices.UpdateData(inventory_Batch);
- _materielInfoService.UpdateData(materielInfo);
+ //_materielInfoService.UpdateData(materielInfo);
if (inventoryInfo.StockQuantity <= 0)
_inventoryInfoService.DeleteData(inventoryInfo);
else
@@ -1156,7 +1157,15 @@
{
materielInfo.Business_qty -= supplyTask.StockQuantity;
if (materielInfo.Business_qty < materielInfo.MinQty)
+ {
CreateAllocatInOut(materielInfo);//鍒涘缓璋冩嫧浠诲姟
+ }
+ else
+ {
+ _materielInfoService.UpdateData(materielInfo);
+ }
+
+
}
#endregion
_unitOfWorkManage.CommitTran();
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 00f08fa..325a79e 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"
@@ -74,6 +74,11 @@
}
+ /// <summary>
+ /// 涓嶈鏄嚭搴撳叆搴撶洏鐐癸紝wcs閮戒細璋冪敤鎴戣繖涓柟娉�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
public ApiResponse<Dt_InventoryInfo> OrderFeedback(EdiOrderCallbackRequest request)
{
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
index 4dd3a3a..657ff21 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs"
@@ -36,7 +36,7 @@
Dt_Tactics tactics = _tacticsService.Repository.QueryFirst(x => x.TacticeName == "鍑哄簱绛栫暐");
List<Dt_SupplyTask> supplyTasks = new List<Dt_SupplyTask>();
//// 鏌ヨ澶т欢搴撲腑鍙敤鐨勫簱瀛�
- List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == WareCode);
+ List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.AvailableQuantity > 0 && x.WarehouseCode == WareCode);//杩欓噷濡傛灉鏈変咯涓笉鍚屾壒娆＄殑鐗╂枡锛岃ˉ璐т笉绠℃壒娆�
if (dt_InventoryInfos.Count < 1) throw new Exception($"鐗╂枡缂栧彿銆恵materielInfo.MaterielCode}銆戝ぇ浠跺簱鏃犲簱瀛橈紒璇峰強鏃惰ˉ鍏呭簱瀛橈紒");
if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
@@ -50,6 +50,8 @@
OutStatus = "鏂板缓",
Details = new List<Dt_DeliveryOrderDetail>()
};
+
+ #region 寰幆
foreach (var item in dt_InventoryInfos)
{
decimal Qty = 0;
@@ -84,7 +86,7 @@
{
deliveryOrderDetail.Order_qty += Qty;
}
- deliveryOrder.Details.Add(deliveryOrderDetail);
+ //deliveryOrder.Details.Add(deliveryOrderDetail);
#endregion
#region 娣诲姞璋冩嫧鍑哄簱浠诲姟
Dt_SupplyTask supplyTask = new Dt_SupplyTask()
@@ -104,9 +106,12 @@
SupplyQuantity = 0,
Remark = "璋冩嫧鍑哄簱"
};
- supplyTasks.Add(supplyTask);
+ supplyTasks.Add(supplyTask);
#endregion
}
+ #endregion
+
+
#region 澶т欢搴撹ˉ绔嬪簱鍚庣珛搴撲笟鍔″簱瀛樻暟杩樻槸灏忎簬绔嬪簱鏈�灏忓簱瀛樻暟锛屾坊鍔犳彁绀轰俊鎭�
//娣诲姞鎶ヨ淇℃伅
if (materielInfo.Business_qty < materielInfo.MinQty)
--
Gitblit v1.9.3