From d0909faaed79ad8a0de95887bcf938284e127270 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Sat, 12 Apr 2025 15:11:10 +0800 Subject: [PATCH] =?UTF-8?q?=2046281=20PCN-=E6=8C=89=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BA=A7=E9=87=8F=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/MesFunctionProductionPartSheetService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java index daeea12..e2e035e 100644 --- a/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java +++ b/modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/station/function/MesFunctionProductionPartSheetService.java @@ -57,6 +57,12 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem } catch (Exception e) { } + //返回客户端作为查询条件 + Map 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 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; //查询加工记录数据