|
|
|
@ -847,7 +847,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
String startTime=" 08:00:00";
|
|
|
|
|
if(!CollectionUtils.isEmpty(collect)){
|
|
|
|
|
MesShift mesShift= collect.get(0);
|
|
|
|
|
startTime= StringUtil.isEmpty(mesShift.getStartTime())?" 08:00:00":" "+mesShift.getStartTime()+":00";
|
|
|
|
|
startTime= StringUtil.isEmpty(mesShift.getStartTime())?" 08:00:00":" "+mesShift.getStartTime();
|
|
|
|
|
}
|
|
|
|
|
//获取前一天的早班到当天早班的区间的所有加工记录,统计个数
|
|
|
|
|
DdlPreparedPack.timeBuilder(
|
|
|
|
@ -959,8 +959,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
item.setShiftCode(mesShift.getShiftCode());
|
|
|
|
|
item.setShiftCode(mesShift.getShiftName());
|
|
|
|
|
String today = TimeTool.getToday();
|
|
|
|
|
item.setPlanStartTime(today+" "+mesShift.getStartTime()+":00");
|
|
|
|
|
item.setPlanEndTime(today+" "+mesShift.getEndTime()+":00");
|
|
|
|
|
item.setPlanStartTime(today+" "+mesShift.getStartTime() );
|
|
|
|
|
item.setPlanEndTime(today+" "+mesShift.getEndTime() );
|
|
|
|
|
|
|
|
|
|
//生成工单号
|
|
|
|
|
List<String> orderList=new ArrayList<>();
|
|
|
|
|