|
|
|
@ -57,6 +57,12 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//返回客户端作为查询条件
|
|
|
|
|
Map<Integer, String> reportStatusMap = new HashMap<>();
|
|
|
|
|
reportStatusMap.put(REPORT_STATUS.REPORT.getValue(), REPORT_STATUS.REPORT.getDescription());
|
|
|
|
|
reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription());
|
|
|
|
|
resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap);
|
|
|
|
|
|
|
|
|
|
String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? paramMap.get(MesPcnExtConstWords.START_TIME) : null;
|
|
|
|
|
String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? paramMap.get(MesPcnExtConstWords.END_TIME) : null;
|
|
|
|
|
if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) {
|
|
|
|
@ -73,6 +79,9 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
|
|
|
|
|
//返回客户端作为默认条件
|
|
|
|
|
resultMap.put(MesPcnExtConstWords.START_TIME, startTime);
|
|
|
|
|
resultMap.put(MesPcnExtConstWords.END_TIME, endTime);
|
|
|
|
|
|
|
|
|
|
//客户端默认开窗时不查询数据
|
|
|
|
|
return resultMap;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Boolean checkTime;
|
|
|
|
@ -84,12 +93,6 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem
|
|
|
|
|
|
|
|
|
|
if (!checkTime) return packResultMap(resultMap, "时间查询条件限制一天!");
|
|
|
|
|
|
|
|
|
|
//返回客户端作为查询条件
|
|
|
|
|
Map<Integer, String> reportStatusMap = new HashMap<>();
|
|
|
|
|
reportStatusMap.put(REPORT_STATUS.REPORT.getValue(), REPORT_STATUS.REPORT.getDescription());
|
|
|
|
|
reportStatusMap.put(REPORT_STATUS.UN_REPORT.getValue(), REPORT_STATUS.UN_REPORT.getDescription());
|
|
|
|
|
resultMap.put(MesPcnExtConstWords.REPORT_STATUS, reportStatusMap);
|
|
|
|
|
|
|
|
|
|
String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? paramMap.get(MesPcnExtConstWords.PART_NO) : null;
|
|
|
|
|
|
|
|
|
|
//查询加工记录数据
|
|
|
|
|