|
|
|
@ -423,10 +423,10 @@ public class MesWorkOrderService extends BaseMesService<MesWorkOrder> implements
|
|
|
|
|
MesException.throwMesBusiException("产线【%s】班次【%s】信息不存在", item.getWorkCenterCode(), item.getShiftCode());
|
|
|
|
|
}
|
|
|
|
|
item.setShiftName(mesShift.getShiftName());
|
|
|
|
|
//拼接
|
|
|
|
|
item.setPlanStartTime(item.getPlanDate() + " " + mesShift.getStartTime());
|
|
|
|
|
item.setPlanEndTime(item.getPlanDate() + " " + mesShift.getEndTime());
|
|
|
|
|
try {
|
|
|
|
|
//拼接
|
|
|
|
|
item.setPlanStartTime(TimeTool.parseStringFormat(item.getPlanDate() + " " + mesShift.getStartTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
|
|
|
|
|
item.setPlanEndTime(TimeTool.parseStringFormat(item.getPlanDate() + " " + mesShift.getEndTime(),DateUtil.BASE_FORMAT1,DateUtil.BASE_FORMAT));
|
|
|
|
|
int windowStartEndTimeCompare = DateUtilExt.compareDateTime(DateUtil.BASE_FORMAT, item.getPlanStartTime(), item.getPlanEndTime());
|
|
|
|
|
if (windowStartEndTimeCompare > 0) {
|
|
|
|
|
item.setPlanEndTime(TimeTool.pareDateToString(DateUtil.addDays(item.getPlanEndTime(), 1)));
|
|
|
|
|