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

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

@@ -16,11 +16,15 @@ namespace Tnb.ProductionMgr.Entities.Dto
     public class PrdInstockRecordUpListChildOutPut
     {
         public string id { get; set; }
-        public string bill_code { get; set; }
+        public string code { get; set; }
         public string bill_type { get; set; }
         public string carry_code { get; set; }
         public string create_id { get; set; }
         public string bill_date { get; set; }
+        /// <summary>
+        /// 起始库位编号
+        /// </summary>
+        public string location_code { get; set; } = string.Empty;
     }
     
     public class PrdInstockRecordUpListDownOutPut

ProductionMgr/Tnb.ProductionMgr/PrdInstockRecordUpServicecs.cs

@@ -99,9 +99,10 @@ namespace Tnb.ProductionMgr
                         .Where(x=>x.mo_task_id==a.id).ToList((x,y,z)=>new PrdInstockRecordUpListChildOutPut()
                     {
                         id = x.id,
-                        bill_code = x.code,
+                        code = x.code,
                         bill_type = z.FullName,
                         carry_code = x.carry_code,
+                        location_code = x.location_code,
                         create_id = y.RealName,
                         bill_date = x.bill_date==null ? "" : x.bill_date.ToString(DbTimeFormat.SS),