|
|
|
@ -875,7 +875,7 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
DdlPreparedPack.getInPackList(
|
|
|
|
|
Arrays.asList(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue(),
|
|
|
|
|
MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue()) ,"reportStatus",ddlPackBean);
|
|
|
|
|
List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("1")).collect(Collectors.toList());
|
|
|
|
|
List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("10")).collect(Collectors.toList());
|
|
|
|
|
String startTime=" 08:00:00";
|
|
|
|
|
if(!CollectionUtils.isEmpty(collect)){
|
|
|
|
|
MesShift mesShift= collect.get(0);
|
|
|
|
@ -986,7 +986,7 @@ 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("1")).collect(Collectors.toList());
|
|
|
|
|
List<MesShift> collect = mesShiftList.stream().filter(s -> s.getShiftCode().equalsIgnoreCase("10")).collect(Collectors.toList());
|
|
|
|
|
MesShift mesShift= collect.get(0);
|
|
|
|
|
item.setShiftCode(mesShift.getShiftCode());
|
|
|
|
|
item.setShiftCode(mesShift.getShiftName());
|
|
|
|
|