From c42731f080a4873e298bfe8489b47993432d8404 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 24 十月 2025 12:08:48 +0800
Subject: [PATCH] 优化权限配置

---
 新建文件夹/WIDESEA_WMSServer/WIDESEA_SquareCabinServices/extend/Allocat.cs |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

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 d840053..ec5ff26 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"
@@ -9,6 +9,7 @@
 using WIDESEA_Common.OrderEnum;
 using WIDESEA_Common.StockEnum;
 using WIDESEA_Common.TaskEnum;
+using WIDESEA_Common.WareHouseEnum;
 using WIDESEA_Core;
 using WIDESEA_ISquareCabinServices;
 using WIDESEA_Model.Models;
@@ -18,7 +19,7 @@
 {
     public partial class DeliveryOrderServices
     {
-        #region 鍒涘缓骞冲簱璋冩嫧鍑哄簱鍗曘�佺珛搴撹皟鎷ㄥ叆搴撳崟
+        #region 鍒涘缓骞冲簱璋冩嫧鍑哄簱鍗曘�佺珛搴撹皟鎷ㄥ叆搴撳崟  鍦ㄧ珛搴撳嚭搴撳畬鎴愬悗璋冪敤  鍦ㄥ嚭搴撳畬鎴愬悗灏嗙墿鏂欒〃涓殑涓氬姟鏁伴噺锛圔usiness_qty锛夊噺鍘诲疄闄呭嚭搴撴暟閲�
         /// <summary>
         /// 鍒涘缓璋冩嫧鍗�
         /// </summary>
@@ -29,8 +30,14 @@
             WebResponseContent response = new WebResponseContent();
             try
             {
+                if (materielInfo.Business_qty >= materielInfo.MinQty) return response;
+                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.StockQuantity > x.OutboundQuantity).OrderBy(x => x.InDate).ToList();
+                List<Dt_InventoryInfo> dt_InventoryInfos = _inventoryInfoService.Repository.QueryData(x => x.MaterielCode == materielInfo.MaterielCode && x.StockStatus == StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt() && x.StockQuantity > x.OutboundQuantity && x.WarehouseCode == WarehouseEnum.澶т欢搴�.ObjToInt().ToString("000"));
+                if (tactics.SelectTactice == TacticsEnum.ComeOutonFirstTime.ObjToInt())
+                    dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.ValidityPeriod).ToList();
+                else
+                    dt_InventoryInfos = dt_InventoryInfos.OrderBy(x => x.InDate).ToList();
                 decimal Qty = 0;
                 foreach (var item in dt_InventoryInfos)
                 {
@@ -42,6 +49,7 @@
                         materielInfo.Business_qty += materielInfo.BoxQty;
                         item.OutboundQuantity += materielInfo.BoxQty;
                     }
+                    item.AvailableQuantity = item.StockQuantity - item.OutboundQuantity;
                 }
 
                 #region 娣诲姞璋冩嫧鍑哄簱鍗�
@@ -67,6 +75,7 @@
                         Status = 2,
                         Reservoirarea = item.First().WarehouseCode
                     };
+                    deliveryOrder.Warehouse_no = item.First().WarehouseCode;
                     deliveryOrder.Details.Add(deliveryOrderDetail);
                 }
                 #endregion

--
Gitblit v1.9.3