|
@@ -794,8 +794,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
- bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
|
|
- bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
|
|
|
|
+ bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
|
|
|
|
|
+ bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
|
|
|
pretreatments.Add(bomChildExamineDto);
|
|
pretreatments.Add(bomChildExamineDto);
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -911,12 +911,12 @@ namespace Business.ResourceExamineManagement
|
|
|
bang_id = bangid,
|
|
bang_id = bangid,
|
|
|
morder_no = GenerateMoList[0]
|
|
morder_no = GenerateMoList[0]
|
|
|
};
|
|
};
|
|
|
- _CalcBomViewAppService.CreateMainOrder(generateMorderDto, getBomList[0], new List<BomChildExamineDto>(), new List<BomChildExamineDto>(), bangid, item.plan_date.GetValueOrDefault(), sklist, item, icitemlist, Convert.ToInt32(getBomList[0].ProductionTime.GetValueOrDefault() == 0 ? 1 : getBomList[0].ProductionTime.GetValueOrDefault()));
|
|
|
|
|
|
|
+ _CalcBomViewAppService.CreateMainOrder(generateMorderDto, getBomList[0], new List<BomChildExamineDto>(), new List<BomChildExamineDto>(), bangid, item.plan_date.GetValueOrDefault(), sklist, item, icitemlist, Convert.ToInt32(getBomList[0].RoutingDesignTime.GetValueOrDefault() == 0 ? 1 : getBomList[0].RoutingDesignTime.GetValueOrDefault()));
|
|
|
|
|
|
|
|
//最晚开工时间=订单行客户要求交期-运输提前期-库存提前期-生产提前期-下单提前期-生产时间
|
|
//最晚开工时间=订单行客户要求交期-运输提前期-库存提前期-生产提前期-下单提前期-生产时间
|
|
|
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.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 = dtl.latest_times.AddDays(Convert.ToDouble(getBomList[0].DesignTime.GetValueOrDefault() + getBomList[0].PurLT));
|
|
|
|
|
|
|
+ dtl.kitting_times = dtl.latest_times.AddDays(Convert.ToDouble(getBomList[0].BOMDesignTime.GetValueOrDefault() + getBomList[0].PurLT));
|
|
|
//TODO:最早开始时间默认3天后(后期调整,因为要计算排产,计算产能这一类,才能得到开工时间)
|
|
//TODO:最早开始时间默认3天后(后期调整,因为要计算排产,计算产能这一类,才能得到开工时间)
|
|
|
dtl.earliest_times = dtl.kitting_times.AddDays(1);
|
|
dtl.earliest_times = dtl.kitting_times.AddDays(1);
|
|
|
}
|
|
}
|
|
@@ -4811,8 +4811,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
- bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
|
|
- bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
|
|
|
|
+ bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
|
|
|
|
|
+ bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
|
|
|
|
|
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
|
|
|
|
@@ -4852,8 +4852,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
- bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
|
|
- bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
|
|
|
|
+ bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
|
|
|
|
|
+ bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
@@ -4882,8 +4882,8 @@ namespace Business.ResourceExamineManagement
|
|
|
bomChildExamineDto.type = 0;
|
|
bomChildExamineDto.type = 0;
|
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
bomChildExamineDto.PurLT = curicitem == null ? 0 : curicitem.PurLT;
|
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
bomChildExamineDto.clean_leadtime = curicitem == null ? 0 : curicitem.clean_leadtime;
|
|
|
- bomChildExamineDto.DesignTime = curicitem == null ? 0 : curicitem.DesignTime;
|
|
|
|
|
- bomChildExamineDto.ProductionTime = curicitem == null ? 0 : curicitem.ProductionTime;
|
|
|
|
|
|
|
+ bomChildExamineDto.BOMDesignTime = curicitem == null ? 0 : curicitem.BOMDesignTime;
|
|
|
|
|
+ bomChildExamineDto.RoutingDesignTime = curicitem == null ? 0 : curicitem.RoutingDesignTime;
|
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
bomChildExamineDtos.Add(bomChildExamineDto);
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|