Browse Source

代码提交。

tangdi 3 years ago
parent
commit
19de53dae2

+ 2 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -1201,8 +1201,8 @@ namespace Business.ResourceExamineManagement
             oOrder.ooentry_wrkcname = "10001";//工作中心名称
             oOrder.planner_num = "wwww";//计划员工号
             oOrder.planner_name = "qqq";//计划员名称
-            oOrder.ooentry_stime = DateTime.Now;//计划开工日期
-            oOrder.ooentry_etime = DateTime.Now;//计划完工日期
+            oOrder.ooentry_stime = returnlist.kitting_time == null ? DateTime.Now.AddDays(1) : returnlist.kitting_time.GetValueOrDefault().AddDays(1);//计划开工日期
+            oOrder.ooentry_etime = oOrder.ooentry_stime.GetValueOrDefault().AddDays(7);//计划完工日期
             oOrder.product_code = "产品代码";//产品代码
             oOrder.ffms_number = "1000";//fms旧料号
             oOrder.product_name = "test";//产品名称

+ 0 - 1
MicroServices/Business/Business.Application/ResourceExamineManagement/PretreatmentAppService.cs

@@ -50,7 +50,6 @@ namespace Business.ResourceExamineManagement
             dto.level = 1;
             dto.id = help.NextId();
             dto.fid= help.NextId();
-            dto.parent_id = help.NextId();
             dto.qty = 1;
             dto.num = "1";
             dto.num_order = 1;

+ 6 - 2
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -494,6 +494,9 @@ namespace Business.ResourceExamineManagement
                 dtl.latest_times = item.plan_date.GetValueOrDefault().AddDays(-Convert.ToDouble(curFacDtl?.transportation_leadtime.GetValueOrDefault() + curFacDtl?.stock_leadtime.GetValueOrDefault() + curFacDtl?.production_leadtime.GetValueOrDefault() + curFacDtl?.order_leadtime.GetValueOrDefault() + _CalcBomViewAppService.ProductionTimeDay));
                 //物料齐套时间
                 dtl.kitting_times = getBomList.Where(p => p.is_use).OrderByDescending(m => m.kitting_time).First().kitting_time.GetValueOrDefault();
+                //TODO:最早开始时间默认3天后(后期调整,因为要计算排产,计算产能这一类,才能得到开工时间)
+                dtl.earliest_times = dtl.kitting_times.AddDays(1);
+
                 //替代关系展开list
                 dtl.BomChildExamineList = getBomList;
                 //添加订单行开工信息
@@ -1301,8 +1304,9 @@ namespace Business.ResourceExamineManagement
             var result = await OrderKittingCheck(input);
             OrderResourceViewDto rtn = DataPackage(result, true);
             rtn.DayBulletinBoardList = rtn.DayBulletinBoardList.OrderByDescending(d => d.day).ToList();
-            //保存检查结果
-            SaveExamineResult(rtn.KittingCheckResultList, rtn.DayBulletinBoardList, 2);
+            //保存检查结果 替代关系不计算每日物料情况
+            SaveExamineResult(rtn.KittingCheckResultList, new List<DayBulletinBoard>(), 2);
+            //SaveExamineResult(rtn.KittingCheckResultList, rtn.DayBulletinBoardList, 2);
             return JsonConvert.SerializeObject(rtn);
         }