修改载具状态与数据库字段类型映射

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>

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)
+                            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) => b.material_id == os.material_id && a.is_lock == 0 && !string.IsNullOrEmpty(a.location_id) && a.status == (int)EnumCarryStatus.占用)
+                                                      .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;

WarehouseMgr/Tnb.WarehouseMgr/WmsSetSortingService.cs

@@ -185,5 +185,13 @@ namespace Tnb.WarehouseMgr
             }
         }
 
+
+        public override Task ModifyAsync(WareHouseUpInput input)
+        {
+            return Task.CompletedTask;
+
+        }
+
+
     }
 }

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;
+
+        }
     }
 }