Merge branch 'master' of http://123.60.180.165:4647/ZZYDOP/DOPCore

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

@@ -407,9 +407,9 @@ namespace Business.ResourceExamineManagement
                 dtl.earliest_times = DateTime.Now.Date.AddDays(3);
 
                 //获取当前物料bom数据
-                var childBom = boms.Where(p => p.bom_number == item.bom_number).FirstOrDefault();
+                var childBom = boms.Where(p => p.item_number == item.item_number).FirstOrDefault();
                 //bom层级组装
-                var getBomList = BomPretreatment(item.Id, childBom.Id, item.qty.GetInt(), bomlist, bomchildlist, icitemlist);
+                var getBomList = BomPretreatment(childBom.Id, bomlist, bomchildlist, icitemlist);
                 //bom替代关系组装
                 BomSubstitute(getBomList, bomlist, bomchildlist, icitemlist);
                 //库存初始化
@@ -1021,12 +1021,8 @@ namespace Business.ResourceExamineManagement
         /// <param name="orderid"></param>
         /// <param name="BomId"></param>
         /// <param name="Quantity"></param>
-        public List<BomChildExamineDto> BomPretreatment(long? orderid, long? BomId, int Quantity, List<ic_bom> bomlist, List<ic_bom_child> bomchildlist, List<ic_item> icitemlist)
+        public List<BomChildExamineDto> BomPretreatment(long? BomId, List<ic_bom> bomlist, List<ic_bom_child> bomchildlist, List<ic_item> icitemlist)
         {
-            if (orderid == null)
-            {
-                //throw new bu
-            }
             if (BomId == null)
             {
                 //throw new bu

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

@@ -145,6 +145,13 @@ namespace Bussiness.Model.MES.IC
         /// </summary>
         [Description("序号")]
         public int child_num { get; set; }
+
+        /// <summary>
+        /// 版本
+        /// </summary>
+        [StringLength(80)]
+        [Description("版本")]
+        public string? version { get; set; }
     }
 }