|
|
@@ -847,9 +847,16 @@ namespace Business.ResourceExamineManagement
|
|
|
//库存初始化
|
|
|
_CalcBomViewAppService.BomStock(getBomList, stocklist, bangid);
|
|
|
_CalcBomViewAppService.newStockOccList = new List<mo_ic_item_stockoccupy>();
|
|
|
- //计算
|
|
|
- _CalcBomViewAppService.CalcView(getBomList, bangid, item.qty.GetValueOrDefault(), item.plan_date, sklist, item, icitemlist);
|
|
|
-
|
|
|
+ //bom未生成,直接取标准时间
|
|
|
+ if (getBomList.Count == 1)
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ //计算
|
|
|
+ _CalcBomViewAppService.CalcView(getBomList, bangid, item.qty.GetValueOrDefault(), item.plan_date, sklist, item, icitemlist);
|
|
|
+ }
|
|
|
//TODO:最晚开始时间
|
|
|
var curFacDtl = leadTimeList.FirstOrDefault(p => p.item_id == childBom.icitem_id);
|
|
|
//最晚开工时间=订单行客户要求交期-运输提前期-库存提前期-生产提前期-下单提前期-生产时间
|
|
|
@@ -4706,6 +4713,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
+ bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
+ bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
|
|
|
@@ -4745,6 +4754,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
+ bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
+ bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
});
|
|
|
}
|
|
|
@@ -4773,6 +4784,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
+ bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
+ bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
});
|
|
|
}
|