|
|
|
@ -986,13 +986,14 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
item.setPartNo(partNo);
|
|
|
|
|
item.setWorkOrderType(MesExtEnumUtil.ORDER_TYPE.UN_SORT.getValue());
|
|
|
|
|
item.setOrderFlag(MesExtEnumUtil.ORDER_TYPE_IDENTIFICATION.N.getValue());
|
|
|
|
|
List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("10")).collect(Collectors.toList());
|
|
|
|
|
List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("20")).collect(Collectors.toList());
|
|
|
|
|
MesShift mesShift= collect.get(0);
|
|
|
|
|
item.setShiftCode(mesShift.getShiftCode());
|
|
|
|
|
item.setShiftCode(mesShift.getShiftName());
|
|
|
|
|
item.setShiftName(mesShift.getShiftName());
|
|
|
|
|
String today = TimeTool.getToday();
|
|
|
|
|
item.setPlanStartTime(today+" "+mesShift.getStartTime() );
|
|
|
|
|
item.setPlanEndTime(today+" "+mesShift.getEndTime() );
|
|
|
|
|
String dayBefore = new SimpleDateFormat("yyyy-MM-dd").format(TimeTool.getDateBefore(new Date(), 1));
|
|
|
|
|
item.setPlanStartTime(dayBefore+" "+mesShift.getStartTime());
|
|
|
|
|
item.setPlanEndTime(today+" "+mesShift.getEndTime());
|
|
|
|
|
|
|
|
|
|
//生成工单号
|
|
|
|
|
List<String> orderList=new ArrayList<>();
|
|
|
|
|