领料单编码规则调整

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

@@ -2410,6 +2410,7 @@ namespace Business.ResourceExamineManagement
 
             //排产
              _productionScheduleAppService.DoProductShcedule(workOrds);
+            AutoCreatePickBill(workOrds.Select(a => a.WorkOrd).ToList());
         }
 
         /// <summary>
@@ -2484,10 +2485,9 @@ namespace Business.ResourceExamineManagement
                 List<ProductStructureMaster>  itemList=GetProductStructure(dbPeriodSequences.Select(a=>a.ItemNum).Distinct().ToList());
                 var childrenList= itemList.Select(a=>a.ComponentItem).Distinct().ToList();
                 List<ItemMaster> itemLocList = _itemMaster.Select(p => childrenList.Contains(p.ItemNum) && p.Domain == "1001" && p.IsActive).Distinct().ToList();
-                int i = 100;
                 foreach (var item in dbPeriodSequences)
                 {
-                    var Nbr = "Demo" + DateTime.Now.ToString("yyyyMMdd")+ i.ToString();
+                    var Nbr = GetMaxSerialNumber(417416915624005);
                     nbrMasterList.Add(new NbrMaster
                     {
                         Domain = "1001",
@@ -2495,12 +2495,12 @@ namespace Business.ResourceExamineManagement
                         Nbr = Nbr,
                         Remark="",
                         Date=item.PlanDate,
-                        Status="",
-                        WorkOrd="",
+                        ProdLine=item.Line,
+                        Status ="",
+                        WorkOrd=item.WorkOrds,
                         QtyOrd=item.OrdQty.HasValue? item.OrdQty.Value:0,
                         IsActive = true
                     });
-                    i++;
                     itemList.Where(a => a.ParentItem == item.ItemNum).ToList()?.ForEach(a =>
                     {
                         string LocationTo = "";
@@ -2513,7 +2513,6 @@ namespace Business.ResourceExamineManagement
                             Domain = "1001",
                             Type = "SM",
                             Nbr = Nbr,
-                            //TODO:Line产线字段是否需要
                             ItemNum =a.ComponentItem,
                             QtyFrom = 0,
                             QtyTo = 0,

MicroServices/Business/Bussiness.Model/MES/IC/NbrMaster.cs

@@ -75,5 +75,11 @@ namespace Business.Model.MES.IC
         /// </summary>
         [Comment("是否有效")]
         public Boolean IsActive { get; set; }
+
+        /// <summary>
+        /// 产线
+        /// </summary>
+        [Comment("产线")]
+        public string? ProdLine { get; set; }
     }
 }