From 8c4a0799a24ee06c8013e27cef39811f3c14faf6 Mon Sep 17 00:00:00 2001
From: alex <whitebig@126.com>
Date: Tue, 27 Jun 2023 10:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=BD=E5=85=B7=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=98=A0=E5=B0=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entity/WmsCarryH.cs                       |  2 ++
 .../Tnb.WarehouseMgr/WmsOutStockService.cs    | 22 ++++++++++++++++---
 .../Tnb.WarehouseMgr/WmsSetSortingService.cs  |  8 +++++++
 .../WmsSignForDeliveryService.cs              |  8 +++++++
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs
index 5dd02dac..dabacbd7 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsCarryH.cs
@@ -43,6 +43,8 @@ public partial class WmsCarryH : BaseEntity<string>
     /// <summary>
     /// 载具状态
     /// </summary>
+    /// 
+    [SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public int carry_status { get; set; }
 
     /// <summary>
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
index a216fa8c..52078432 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsOutStockService.cs
@@ -81,20 +81,36 @@ namespace Tnb.WarehouseMgr
                         List<WmsCarryCode> carryCodes = new();
                         foreach (var os in outStockDList)
                         {
-                            var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id)
-                                                      .Where((a, b) => b.material_id == os.material_id && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用)
+                            var carryCodesPart = await _db.Queryable<WmsCarryH>().InnerJoin<WmsCarryCode>((a, b) => a.id == b.carry_id).InnerJoin<BasLocation>((a, b, c) => a.location_id == c.id)
+                                                      .Where((a, b, c) => b.material_id == os.material_id && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用 && c.is_type == ((int)EnumLocationType.存储库位).ToString())
                                                       .WhereIF(!string.IsNullOrEmpty(os.code_batch), (a, b) => b.code_batch == os.code_batch)
                                                       .Select<WmsCarryCode>()
                                                       .ToListAsync();
                             if (carryCodesPart?.Count > 0)
                             {
+                                
                                 carryCodes.AddRange(carryCodesPart);
                                 var codeQty = carryCodes.Sum(x => x.codeqty);
                                 if (codeQty < os.pr_qty)
                                 {
                                     throw new AppFriendlyException($"需要出库[{os.pr_qty}],实际库存{codeQty},数量不足", 500);
                                 }
-                                var partCarryMats = carryCodesPart.Adapt<List<WmsCarryMat>>();
+                                List<WmsCarryCode> curCarryCodes = new();
+                                for (int i = 0; i < carryCodesPart.Count; i++)
+                                {
+                                    if (os.pr_qty > carryCodesPart[i].codeqty)
+                                    {
+                                        os.pr_qty -= carryCodesPart[i].codeqty;
+                                        curCarryCodes.Add(carryCodesPart[i]);
+                                    }
+                                    else if (os.pr_qty <= carryCodesPart[i].codeqty)
+                                    {
+                                        carryCodesPart[i].codeqty = os.pr_qty;
+                                        curCarryCodes.Add(carryCodesPart[i]);
+                                        break;
+                                    }
+                                }
+                                var partCarryMats = curCarryCodes.Adapt<List<WmsCarryMat>>();
                                 for (int i = 0; i < partCarryMats.Count; i++)
                                 {
                                     partCarryMats[i].need_qty = carryCodesPart[i].codeqty;
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
index 39f43c1b..7bc941a4 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs
@@ -185,5 +185,13 @@ namespace Tnb.WarehouseMgr
             }
         }
 
+
+        public override Task ModifyAsync(WareHouseUpInput input)
+        {
+            return Task.CompletedTask;
+
+        }
+
+
     }
 }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
index 8a82ceb9..0f0f2f10 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs
@@ -15,6 +15,7 @@ using SqlSugar;
 using Tnb.BasicData.Entities;
 using Tnb.WarehouseMgr.Entities;
 using Tnb.WarehouseMgr.Entities.Consts;
+using Tnb.WarehouseMgr.Entities.Dto;
 using Tnb.WarehouseMgr.Entities.Dto.Inputs;
 using Tnb.WarehouseMgr.Interfaces;
 
@@ -93,5 +94,12 @@ namespace Tnb.WarehouseMgr
                 throw;
             }
         }
+
+
+        public override Task ModifyAsync(WareHouseUpInput input)
+        {
+            return Task.CompletedTask;
+
+        }
     }
 }