Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/GeneralOutstockInput.cs

@@ -0,0 +1,29 @@
+namespace Tnb.ProductionMgr.Entities.Dto
+{
+    public class GeneralOutstockInput
+    {
+        /// <summary>
+        /// 目标库位编号
+        /// </summary>
+        public string location_code { get; set; } = string.Empty;
+    
+        /// 所属工位
+        /// </summary>
+        public string? workstation_id { get; set; }
+    
+        /// <summary>
+        /// 任务单
+        /// </summary>
+        public string? mo_task_id { get; set; }
+
+        public List<GeneralOutstockDInput> details { get; set; } = new List<GeneralOutstockDInput>();
+    }
+
+    public class GeneralOutstockDInput
+    {
+        public string material_id { get; set; }
+        public string material_code { get; set; }
+        public string material_name { get; set; }
+        public decimal num { get; set; }
+    }
+}

ProductionMgr/Tnb.ProductionMgr.Entities/Dto/PrdManage/MaterialPreparationPlanOutput.cs

@@ -18,6 +18,7 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         public string parent_id { get; set; }
         public string material_id { get; set; }
         public string material_code { get; set; }
+        public string workstation_id { get; set; }
         public List<MaterialPreparationPlanDDOutput> children { get; set; } = new List<MaterialPreparationPlanDDOutput>();
     }
     

ProductionMgr/Tnb.ProductionMgr.Entities/Entity/PrdOutstockD.cs

@@ -32,7 +32,7 @@ public partial class PrdOutstockD : BaseEntity<string>
     /// <summary>
     /// 出库需求数量
     /// </summary>
-    public string? pr_qty { get; set; }
+    public decimal? pr_qty { get; set; }
 
     /// <summary>
     /// 来源单据id