From 490d9978a94df454f3720ee2d7b558772890986c Mon Sep 17 00:00:00 2001 From: FCL Date: Tue, 31 Mar 2026 10:48:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=9F=E9=97=B4=E6=A0=B8=E6=9F=A5?= =?UTF-8?q?=E3=80=81=E6=A3=80=E5=AE=9A=E6=A0=A1=E5=87=86=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/DeviceCalibrationServiceImpl.java | 20 +++++----- .../service/DevicePeriodCheckServiceImpl.java | 38 +++++++++---------- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java index 031ab11a..0e2ad751 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DeviceCalibrationServiceImpl.java @@ -214,6 +214,14 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B ruleParam.put("businessType", DeviceConstant.CALIBRATION_TYPE); ruleParam.put("deviceId", deviceId); List deviceList = deviceInfomationService.getListNeedByRule(ruleParam); + if(deviceList.isEmpty()){ + throw exception0(DEVICE_CALIBRATION_NOT_EXISTS.getCode(), "当前设备未配置检定校准规则，请配置后再操作"); + } + DeviceInfoWithBizConfigVO configVO = deviceList.get(0); + DeviceConfigBusinessRuleDO rule = configVO.getRule(); + if(rule == null){ + throw exception0(DEVICE_CALIBRATION_NOT_EXISTS.getCode(), "当前设备未配置检定校准规则，请配置后再操作"); + } String formKey = dictionaryBusinessService.getValueByDataKey(formDicKey); DataTemplateDO formTemplate = dataTemplateService.getLatestDataByKey(formKey); Long formTemplateId = formTemplate.getId(); @@ -223,16 +231,8 @@ public class DeviceCalibrationServiceImpl implements DeviceCalibrationService, B entity.setEffectiveFlag("1"); entity.setFormId(formTemplateId); entity.setFlowStatus(QmsCommonConstant.NOT_START); - if(deviceList.isEmpty()){ - deviceCalibrationMapper.insert(entity); - return BeanUtils.toBean(entity, DeviceCalibrationRespVO.class); - } - DeviceInfoWithBizConfigVO configVO = deviceList.get(0); - DeviceConfigBusinessRuleDO rule = configVO.getRule(); - if(rule == null){ - deviceCalibrationMapper.insert(entity); - return BeanUtils.toBean(entity, DeviceCalibrationRespVO.class); - } + + entity.setSpecification(rule.getStandard()); entity.setCheckType(rule.getCalibrationCheckType()); entity.setFrequencyRemark(rule.getFrequencyRemark()); diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java index 7bde5327..174695b3 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/device/service/DevicePeriodCheckServiceImpl.java @@ -272,6 +272,14 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B ruleParam.put("businessType", DeviceConstant.PERIOD_TYPE); ruleParam.put("deviceId", deviceId); List deviceList = deviceInfomationService.getListNeedByRule(ruleParam); + if(deviceList.isEmpty()){ + throw exception0(DEVICE_PERIOD_CHECK_NOT_EXISTS.getCode(), "当前设备未配置期间核查规则，请配置后再操作"); + } + DeviceInfoWithBizConfigVO configVO = deviceList.get(0); + DeviceConfigBusinessRuleDO rule = configVO.getRule(); + if(rule == null){ + throw exception0(DEVICE_PERIOD_CHECK_NOT_EXISTS.getCode(), "当前设备未配置期间核查规则，请配置后再操作"); + } String formKey = dictionaryBusinessService.getValueByDataKey(formDicKey); DataTemplateDO formTemplate = dataTemplateService.getLatestDataByKey(formKey); Long formTemplateId = formTemplate.getId(); @@ -282,16 +290,7 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B entity.setFormId(formTemplateId); entity.setFlowStatus(QmsCommonConstant.NOT_START); entity.setCheckTarget(DeviceConstant.PERIOD_CHECK_TAGET_DEVICE); - if(deviceList.isEmpty()){ - devicePeriodCheckMapper.insert(entity); - return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); - } - DeviceInfoWithBizConfigVO configVO = deviceList.get(0); - DeviceConfigBusinessRuleDO rule = configVO.getRule(); - if(rule == null){ - devicePeriodCheckMapper.insert(entity); - return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); - } + entity.setFrequencyRemark(rule.getFrequencyRemark()); entity.setCheckPersonRemark(rule.getTreatmentUser()); entity.setCheckAccording(rule.getTreatmentMethod()); @@ -309,7 +308,14 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B ruleParam.put("businessType", DeviceConstant.PERIOD_TYPE); ruleParam.put("deviceId", deviceId); List materialList = materialInfomationService.getListNeedByRule(ruleParam); - + if(materialList.isEmpty()){ + throw exception0(DEVICE_PERIOD_CHECK_NOT_EXISTS.getCode(), "当前物料未配置期间核查规则，请配置后再操作"); + } + MaterialInfoWithBizConfigVO configVO = materialList.get(0); + DeviceConfigBusinessRuleDO rule = configVO.getRule(); + if(rule == null){ + throw exception0(DEVICE_PERIOD_CHECK_NOT_EXISTS.getCode(), "当前物料未配置期间核查规则，请配置后再操作"); + } String formKey = dictionaryBusinessService.getValueByDataKey(formDicKey); DataTemplateDO formTemplate = dataTemplateService.getLatestDataByKey(formKey); Long formTemplateId = formTemplate.getId(); @@ -320,16 +326,6 @@ public class DevicePeriodCheckServiceImpl implements DevicePeriodCheckService, B entity.setFormId(formTemplateId); entity.setFlowStatus(QmsCommonConstant.NOT_START); entity.setCheckTarget(DeviceConstant.PERIOD_CHECK_TAGET_MATERIAL); - if(materialList.isEmpty()){ - devicePeriodCheckMapper.insert(entity); - return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); - } - MaterialInfoWithBizConfigVO configVO = materialList.get(0); - DeviceConfigBusinessRuleDO rule = configVO.getRule(); - if(rule == null){ - devicePeriodCheckMapper.insert(entity); - return BeanUtils.toBean(entity, DevicePeriodCheckRespVO.class); - } entity.setFrequencyRemark(rule.getFrequencyRemark()); entity.setCheckPersonRemark(rule.getTreatmentUser()); entity.setCheckAccording(rule.getTreatmentMethod());