代码提交

MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -275,7 +275,8 @@ namespace Business.ResourceExamineManagement
             dto.backflush = toDto.backflush;
             //dto.qty = toDto.qty;
             //dto.replace_amount = dtl.replace_amount.Value;
-            dto.qty = dtl.replace_qty == null ? 1 : dtl.replace_qty.Value;
+            //dto.qty = dtl.replace_qty == null ? 1 : dtl.replace_qty.Value;
+            dto.qty = toDto.qty;
             dto.is_replace = 0;
             dto.haveicsubs = 0;
             dto.substitute_code = sl.substitute_code;

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -4076,7 +4076,7 @@ namespace Business.ResourceExamineManagement
                 string LocationFrom = "";
                 if (find != null)
                 {
-                    LocationFrom = find.Location;
+                    //LocationFrom = find.Location;
                     //找出职责范围负责人
                     var ewdm = ewdmList.Find(s => 0 >= string.Compare(s.ItemNum1, a.ItemNum) && 0 >= string.Compare(a.ItemNum, s.ItemNum2));
                     if (ewdm != null && !string.IsNullOrEmpty(ewdm.Employee))
@@ -4095,7 +4095,7 @@ namespace Business.ResourceExamineManagement
                             ItemNum = a.ItemNum,
                             QtyFrom = 0,
                             QtyTo = 0,
-                            LocationFrom = LocationFrom,
+                            LocationFrom = string.IsNullOrEmpty(a.Location) == true ? find.Location : a.Location,
                             LocationTo = LocationTo,//现在这几条线是同一线边仓，暂时不考虑多个线边仓
                             WorkOrd = workord.WorkOrd,
                             QtyOrd = a.QtyRequired,

MicroServices/Business/Business.Domain/StructuredDB/Production/WorkOrdDetail.cs

@@ -110,5 +110,11 @@ namespace Business.Domain
         /// </summary>
         [Comment("序号")]
         public short Line { get; set; }
+
+        /// <summary>
+        /// 库位
+        /// </summary>
+        [Comment("库位")]
+        public string Location { get; set; }
     }
 }