From 0bc74278ff8130936bc7aed763e8901fedb4f3b0 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 01 八月 2025 11:44:49 +0800
Subject: [PATCH] 故障报修新增hf编码
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java | 40 +++++++++++++++++++++++++++++++++++++---
1 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
index e406f2a..c2a3a21 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamReportRepairServiceImpl.java
@@ -12,6 +12,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
+import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
@@ -63,6 +64,10 @@
private IEamRepairOrderService iEamRepairOrderService;
@Autowired
private ISysBusinessCodeRuleService businessCodeRuleService;
+ @Autowired
+ private IEamReportThreeNoSpareService eamReportThreeNoSpareService;
+ @Autowired
+ private IEamBaseHFCodeService hfCodeService;
/**
* 鍒嗛〉鍒楄〃
*
@@ -197,18 +202,45 @@
EamReportProductHazards eamReportProductHazards=new EamReportProductHazards();
eamReportProductHazards.setEquipmentId(eamReportRepair.getEquipmentId());
eamReportProductHazards.setReportId(eamReportRepair.getId());
+ eamReportProductHazards.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ eamReportProductHazards.setConfirmStatus(EamReportProductHazardsEnum.PENDING_SUBMIT.name());
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_PRODUCT_HAZARDS.name());
+ if (eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃骇鍝佸畨鍏ㄩ殣鎮ｇ‘璁ょ殑HF缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportProductHazards.setHfCode(eamBaseHFCode.getHfCode());
iEamReportProductHazardsService.save(eamReportProductHazards);
}
if (StrUtil.isNotEmpty(eamReportRepair.getIsAccidentsRegister())&&("1").equals(eamReportRepair.getIsAccidentsRegister())) {
//娣诲姞璁惧浜嬫晠鐧昏琛�
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairRequest, eamReportAccidentsRegister);
+ eamReportAccidentsRegister.setId(null);
eamReportAccidentsRegister.setReportId(eamReportRepair.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setRegisterStatus(EamReportAccidentsRegisterEnum.PENDING_SUBMIT.name());
+ EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_ACCIDENTS_REGISTER.name());
+ if (eamBaseHFCode == null) {
+ throw new JeecgBootException("鏈厤缃澶囦簨鏁呯櫥璁拌〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportAccidentsRegister.setHfCode(eamBaseHFCode.getHfCode());
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
+ //鐢熸垚涓変笉鍘熷垯
+ EamReportThreeNoSpare eamReportThreeNoSpare = new EamReportThreeNoSpare();
+ BeanUtils.copyProperties(eamReportRepairRequest, eamReportThreeNoSpare);
+ eamReportThreeNoSpare.setId(null);
+ eamReportThreeNoSpare.setReportId(eamReportRepair.getId());
+ eamReportThreeNoSpare.setPreventionMeasures(eamReportAccidentsRegister.getTakeSteps());
+ eamReportThreeNoSpare.setSubmitStatus(EamReportThreeNoSpareEnum.PENDING_SUBMIT.name());
+ eamReportThreeNoSpare.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
+ EamBaseHFCode threeHfCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.REPORT_THREE_NO_SPARE.name());
+ if (threeHfCode == null) {
+ throw new JeecgBootException("鏈厤缃笁涓嶆斁杩囧師鍒欒〃鐨凥F缂栫爜锛屾坊鍔犲け璐ワ紒");
+ }
+ eamReportThreeNoSpare.setHfCode(threeHfCode.getHfCode());
+ eamReportThreeNoSpareService.save(eamReportThreeNoSpare);
}
- //鐢熸垚缁翠慨宸ュ崟,鍙兘浼氭湁棰嗗彇鎿嶄綔
+ //鐢熸垚缁翠慨宸ュ崟
EamRepairOrder eamRepairOrder=new EamRepairOrder();
BeanUtils.copyProperties(eamReportRepairRequest, eamRepairOrder);
String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.REPAIR_ORDER_CODE_RULE);
@@ -216,6 +248,8 @@
eamRepairOrder.setId(null);
eamRepairOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
eamRepairOrder.setReportId(eamReportRepair.getId());
+ eamRepairOrder.setReportPerson(eamReportRepair.getCreateBy());
+ eamRepairOrder.setFaultPhenomenon(eamReportRepair.getFaultDescription());
eamRepairOrder.setRepairStatus(EamRepairOrderRepairStatusEnum.PENDING_REPAIR.name());
iEamRepairOrderService.save(eamRepairOrder);
//鏇存柊璁惧缁翠慨鐘舵��
@@ -260,7 +294,7 @@
EamReportAccidentsRegister eamReportAccidentsRegister = new EamReportAccidentsRegister();
BeanUtils.copyProperties(eamReportRepairDto, eamReportAccidentsRegister);
eamReportAccidentsRegister.setReportId(eamReportRepairDto.getId());
- eamReportAccidentsRegister.setDelFlag(CommonConstant.DEFAULT_0);
+ eamReportAccidentsRegister.setDelFlag(Integer.valueOf(CommonConstant.DEFAULT_0));
eamReportAccidentsRegister.setId(null);
iEamReportAccidentsRegisterService.save(eamReportAccidentsRegister);
}
--
Gitblit v1.9.3