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

# Conflicts:
#	MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -183,6 +183,7 @@ namespace Business.ResourceExamineManagement
             //var seorderentry = await _mysql_crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
             //根据Bom编码查询出对应工单并且状态不为完成、关闭，非委外工单。
             //TODO:工单类型；
+            //TODO:占用时间是使用生产工单开始结束日期、还是系统建议开始结束时间。
             var morderList = await _mes_morder.GetManyByCondition(x => x.bom_number == bomNumber && (x.morder_state != "完成" || x.morder_state != "关闭"
             && x.morder_icitem_type != "相关委外工单") && !x.IsDeleted && x.tenant_id == seorderentry.tenant_id);
 
@@ -346,9 +347,9 @@ namespace Business.ResourceExamineManagement
             mes_Mooccupy.moo_stime = item.moentry_sys_stime;
             mes_Mooccupy.moo_etime = item.moentry_sys_etime;
             mes_Mooccupy.moo_state = 1;
-            mes_Mooccupy.moo_cbr = string.Empty;
+            //mes_Mooccupy.moo_cbr = string.Empty;
             //mes_Mooccupy.moo_ctime = ;
-            mes_Mooccupy.moo_creason = string.Empty;
+            //mes_Mooccupy.moo_creason = string.Empty;
             mes_Mooccupy.tenant_id = seorderentry.tenant_id;//取销售子表企业ID
             mes_Mooccupy.factory_id = seorderentry.factory_id;
             mes_Mooccupy.org_id = seorderentry.org_id;

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

@@ -880,6 +880,8 @@ namespace Business.ResourceExamineManagement
             returnlist = returnlist.OrderBy(s => s.num).ToList();
             var childList = returnlist.Where(s => s.parent_id == returnlist[0].id && s.type == 0).OrderBy(s => s.num).ToList();
 
+            var planList = GetICPlan(returnlist.Select(p => p.item_id).ToList(), bangid, param.factoryId);//plan列表
+
             //1.如果主料够的时候，不需要显示替代料的平铺视图，如果主料不够，显示替代料的平铺视图。
             //2.替代策略和替代方式，影响到的是甲乙组概念，替代按主料有限，取代按组的优先级。A与B的替代，则A和B各自会存在一个组。
             List<long> calcIds = new List<long>();
@@ -933,10 +935,12 @@ namespace Business.ResourceExamineManagement
                             factoryId = param.factoryId
 
                         };
+                        var plan = planList.Find(x => x.icitem_id == returnlist[0].item_id);
                         var ProductiveDate = _productExamineAppService.ProductiveExamine(prodExamine);
                         var Day = ProductiveDate.Result / (60 * 10); //返回的分钟除以十个小时得出工作天数；
                         mes_Morders.moentry_sys_stime = returnlist[0].kitting_time.Value.AddDays(1);//数据齐套完成后隔天开始生产；
-                        mes_Morders.moentry_sys_etime = returnlist[0].kitting_time.Value.AddDays((double)Day);//TODO：结束日期=开始时间+生成时长+自检提前期+入库提前期+发运提前期；
+                        var LeadTime = Day + plan.self_inspection_date.Value + plan.Shipping_date.Value + plan.Warehousing_date.Value;
+                        mes_Morders.moentry_sys_etime = returnlist[0].kitting_time.Value.AddDays((double)LeadTime);//结束日期=开始时间+生产时长+自检提前期+入库提前期+发运提前期；
                         mes_Morders.morder_need_time = ProductiveDate.Result;
                         returnlist[0].satisfy_time = mes_Morders.moentry_sys_etime;
                     }

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

@@ -130,5 +130,23 @@ namespace Bussiness.Model.MES.IC
         [Comment("计算id")]
         [NotMapped]
         public long? bang_id { get; set; }
+        /// <summary>
+        /// 自检提前期
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("自检提前期")]
+        public decimal? self_inspection_date { get; set; }
+        /// <summary>
+        /// 入库提前期
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("入库提前期")]
+        public decimal? Warehousing_date { get; set; }
+        /// <summary>
+        /// 发运提前期
+        /// </summary>
+        [Precision(20, 8)]
+        [Comment("发运提前期")]
+        public decimal? Shipping_date { get; set; }
     }
 }