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

Conflicts:
	ProductionMgr/Tnb.ProductionMgr/Tnb.ProductionMgr.csproj

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

@@ -187,5 +187,22 @@ namespace Tnb.ProductionMgr.Entities.Dto.PrdManage
         /// </summary>
         public string di { get; set; }
         
+        /// <summary>
+        /// 上料库位id
+        /// </summary>
+        public string? upmat_location_id { get; set; }
+        public string? upmat_location_code { get; set; }
+    
+        /// <summary>
+        /// 下料库位id
+        /// </summary>
+        public string? downmat_location_id { get; set; }
+        public string? downmat_location_code { get; set; }
+    
+        /// <summary>
+        /// 入库仓库id
+        /// </summary>
+        public string? instock_warehouse_id { get; set; }
+        
     }
 }