优先级、巷道、分区

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -522,5 +522,20 @@
         /// 单位类型id
         /// </summary>
         public const string UNITTYPEID = "24906054811669";
+
+        /// <summary>
+        /// 优先级-出库
+        /// </summary>
+        public const int priority_outstock = -50;
+
+        /// <summary>
+        /// 优先级-入库
+        /// </summary>
+        public const int priority_instock = -100;
+
+        /// <summary>
+        /// 原材料八工位待入库
+        /// </summary>
+        public const string LOCATION_YCLBGWDRK = "35750287617301";
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/CommonCreatePretaskInput.cs

@@ -56,6 +56,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
         /// </summary>
         public bool isChangeCarryLoc2StartLoc { get; set; } = true;
 
-}
+        /// <summary>
+        /// 优先级
+        /// </summary>
+        public int priority { get; set; } = 0;
+    }
 
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/InStockStrategyQuery.cs

@@ -23,5 +23,13 @@
         public int BllType { get; set; }
 
         public int Size { get; set; }
+
+        public string Region_id { get; set; }
+
+        // 排除有任务的通道
+        public bool AvoidBusyPassage { get; set; } = false;
+
+        // 巷道
+        public string passage { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs

@@ -41,5 +41,13 @@
         /// 箱号
         /// </summary>
         public string? container_no { get; set; }
+
+        public string Region_id { get; set; }
+
+        // 排除有任务的通道
+        public bool AvoidBusyPassage { get; set; } = false;
+
+        // 是否过滤载具占用状态
+        public bool filter_carry_status { get; set; } = true;
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsDistaskH.cs

@@ -235,4 +235,8 @@ public partial class WmsDistaskH : BaseEntity<string>
     /// </summary>
     public string endlocation_code { get; set; } = string.Empty;
 
+    /// <summary>
+    /// 优先级
+    /// </summary>
+    public int? priority { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPretaskH.cs

@@ -176,7 +176,7 @@ public partial class WmsPretaskH : BaseEntity<string>
     /// <summary>
     /// 优先级
     /// </summary>
-    public int priority { get; set; } = 1;
+    public int priority { get; set; } = 0;
     /// <summary>
     /// 优先级
     /// </summary>