|
|
@@ -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);
|
|
|
}
|
|
|
|