|
|
|
@ -728,8 +728,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
List<Integer> statusList = Stream.of(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue()).collect(Collectors.toList());
|
|
|
|
|
DdlPreparedPack.getInPackList( statusList,"reportStatus",ddlPackBean);
|
|
|
|
|
DdlPreparedPack.getIsNull("workOrderNo",ddlPackBean);
|
|
|
|
|
//String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER");
|
|
|
|
|
String workCenterCodes ="B19CK01A";
|
|
|
|
|
String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER");
|
|
|
|
|
//String workCenterCodes ="B19CK01A";
|
|
|
|
|
List<String> centerList = Arrays.asList(workCenterCodes.split(","));
|
|
|
|
|
DdlPreparedPack.getInPackList(centerList, "workCenterCode",ddlPackBean);
|
|
|
|
|
|
|
|
|
@ -762,8 +762,8 @@ public class MesWorkOrderService implements IMesWorkOrderService {
|
|
|
|
|
List<Integer> statusList = Stream.of(MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_10.getValue(), MesExtEnumUtil.REPORT_STATUS.REPORT_STATUS_40.getValue()).collect(Collectors.toList());
|
|
|
|
|
DdlPreparedPack.getInPackList( statusList,"reportStatus",ddlPackBean);
|
|
|
|
|
DdlPreparedPack.getIsNotNull("workOrderNo",ddlPackBean);
|
|
|
|
|
//String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER");
|
|
|
|
|
String workCenterCodes ="B19CK01A";
|
|
|
|
|
String workCenterCodes = configService.getCfgValue(organizeCode, "MES_PCN_REPORT_CENTER");
|
|
|
|
|
//String workCenterCodes ="B19CK01A";
|
|
|
|
|
|
|
|
|
|
List<String> centerList = Arrays.asList(workCenterCodes.split(","));
|
|
|
|
|
|
|
|
|
|