From a1240198ebb21b20a11bb3b832b03f9d272537af Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Apr 2025 20:23:40 +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 | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 e2e035e..fb7c8ff 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 @@ -51,7 +51,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem Map resultMap = new HashMap<>(); //验证参数 - Map paramMap = null; + Map paramMap = null; try { paramMap = StringUtils.isEmpty(buttonDynamicModel.getFunctionValue()) ? null : JSONObject.parseObject(buttonDynamicModel.getFunctionValue(), Map.class); } catch (Exception e) { @@ -63,8 +63,8 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem 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; + String startTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.START_TIME)) ? (String) paramMap.get(MesPcnExtConstWords.START_TIME) : null; + String endTime = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.END_TIME)) ? (String) paramMap.get(MesPcnExtConstWords.END_TIME) : null; if (StringUtils.isEmpty(startTime) || StringUtils.isEmpty(endTime)) { //根据当前时间计算当前班次的时间 Map shiftTimeMap = shiftService.calcCurShiftTimeMapByCurTime(reqBean.getOrganizeCode(), reqBean.getWorkCenterCode()); @@ -93,7 +93,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem if (!checkTime) return packResultMap(resultMap, "时间查询条件限制一天!"); - String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? paramMap.get(MesPcnExtConstWords.PART_NO) : null; + String partNo = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.PART_NO)) ? (String) paramMap.get(MesPcnExtConstWords.PART_NO) : null; //查询加工记录数据 DdlPackBean packBean = DdlPackBean.getDdlPackBean(reqBean.getOrganizeCode()); @@ -104,7 +104,7 @@ public class MesFunctionProductionPartSheetService extends BaseSwsService implem List productionRecordList = productionRecordRepository.findByHqlWhere(packBean); if (CollectionUtils.isEmpty(productionRecordList)) return resultMap; - Integer reportStatus = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) ? Integer.valueOf(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) : null; + Integer reportStatus = !CollectionUtils.isEmpty(paramMap) && !StringUtils.isEmpty(paramMap.get(MesPcnExtConstWords.REPORT_STATUS)) ? (Integer) paramMap.get(MesPcnExtConstWords.REPORT_STATUS) : null; //搜集需要汇报的加工记录 List productionRecordList2Report = (StringUtils.isEmpty(reportStatus) || reportStatus.compareTo(REPORT_STATUS.REPORT.getValue()) == 0)