From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 95 ++++++++++++++++++++++++++++++-----------------
1 files changed, 60 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
index 15505fe..f618b41 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java
@@ -72,6 +72,8 @@
private IFaultInfoService faultInfoService;
@Value("${jeecg.path.upload}")
private String upLoadPath;
+ @Autowired
+ private IRepairOrderService repairOrderService;
/**
@@ -119,6 +121,7 @@
equipmentReportRepair.setSource("1");
equipmentReportRepair.setIsCreateOrder(0);
equipmentReportRepairService.save(equipmentReportRepair);
+ Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
String IS_PRODUCT_YES = "yes";
if(IS_PRODUCT_YES.equals(equipmentReportRepair.getErrUda1())){
String num = sysIdentityService.getNumByTypeAndLength("QuanlityConfirm",4);
@@ -132,21 +135,31 @@
quanlityConfirm.setQuantity(equipmentReportRepair.getQuantity());
quanlityConfirm.setOperator(curUser.getId());
quanlityConfirmService.save(quanlityConfirm);
+ MessageDTO qMessageDTO = new MessageDTO();
+ qMessageDTO.setTitle("璐ㄩ噺闅愭偅纭鎻愰啋");
+ qMessageDTO.setContent("缁熶竴缂栧彿涓恒��"+equipment.getNum()+"銆戠殑璁惧闇�瑕佽繘琛岃川閲忛殣鎮ｇ‘璁わ紝璇风Щ姝ヨ嚦璐ㄩ噺闅愭偅纭杩涜纭锛佸崟鎹彿銆�"+num+"銆�");
+ qMessageDTO.setCategory("璐ㄩ噺闅愭偅纭");
+ qMessageDTO.setFromUser("璐ㄩ噺闅愭偅纭鎻愰啋灏忓姪鎵�");
+ qMessageDTO.setToUser(curUser.getUsername());
+ sysBaseApi.sendSysAnnouncement(qMessageDTO);
String fNum = sysIdentityService.getNumByTypeAndLength("FaultInfo",4);
FaultInfo faultInfo = new FaultInfo();
faultInfo.setNum(fNum);
faultInfo.setQuanlityId(quanlityConfirm.getId());
faultInfo.setOperater(quanlityConfirm.getOperator());
faultInfo.setIsConfirm(IS_PRODUCT_NO);
- String eId = equipmentReportRepair.getEquipmentId();
- Equipment equipment = equipmentService.getById(eId);
faultInfo.setEquipModel(equipment.getModel());
faultInfo.setEquipName(equipment.getName());
faultInfo.setEquipNum(equipment.getNum());
faultInfoService.save(faultInfo);
-
+ MessageDTO fMessageDTO = new MessageDTO();
+ fMessageDTO.setTitle("璁惧浜嬫晠鐧昏鎻愰啋");
+ fMessageDTO.setContent("缁熶竴缂栧彿涓恒��"+equipment.getNum()+"銆戠殑璁惧闇�瑕佽繘琛屼簨鏁呯櫥璁帮紝璇风Щ姝ヨ嚦璁惧浜嬫晠鐧昏琛ㄥ畬鎴愮‘璁わ紒鍗曟嵁鍙枫��"+fNum+"銆�");
+ fMessageDTO.setCategory("璁惧浜嬫晠鐧昏纭");
+ fMessageDTO.setFromUser("璁惧浜嬫晠鐧昏鎻愰啋灏忓姪鎵�");
+ fMessageDTO.setToUser(curUser.getUsername());
+ sysBaseApi.sendSysAnnouncement(fMessageDTO);
}
- Equipment equipment = equipmentService.getById(equipmentReportRepair.getEquipmentId());
equipment.setEquipmentStatus("2");
String teamId = equipment.getTeamId();
if(ObjectUtils.isNotNull(teamId)){
@@ -268,42 +281,54 @@
@PutMapping("/accept")
public Result<?> accept(@RequestBody EquipmentReportRepair equipmentReportRepair ){
- if(equipmentReportRepair.getErrUda1().equals("yes")){
- QuanlityConfirm quanlityConfirm = quanlityConfirmService.getOne(new QueryWrapper<QuanlityConfirm>().eq("report_id",equipmentReportRepair.getId()),false);
- if(ObjectUtils.isNotNull(quanlityConfirm)){
- String isConfirm1 = quanlityConfirm.getIsConfirm();
- FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
- if(ObjectUtils.isNotNull(faultInfo)){
- String isConfirm2 = faultInfo.getIsConfirm();
- if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
- return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屾垚锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ if(equipmentReportRepair.getErrUda4().equals("1")){
+ if(equipmentReportRepair.getErrUda1().equals("yes")){
+ QuanlityConfirm quanlityConfirm = quanlityConfirmService.getOne(new QueryWrapper<QuanlityConfirm>().eq("report_id",equipmentReportRepair.getId()),false);
+ if(ObjectUtils.isNotNull(quanlityConfirm)){
+ String isConfirm1 = quanlityConfirm.getIsConfirm();
+ FaultInfo faultInfo = faultInfoService.getOne(new QueryWrapper<FaultInfo>().eq("quanlity_id",quanlityConfirm.getId()),false);
+ if(ObjectUtils.isNotNull(faultInfo)){
+ String isConfirm2 = faultInfo.getIsConfirm();
+ if(!isConfirm1.equals("yes")||!isConfirm2.equals("yes")){
+ return Result.error("楠屾敹澶辫触锛屼骇鍝佽川閲忛殣鎮ｇ‘璁ゅ拰浜嬫晠鐧昏灏氭湭瀹屾垚锛岃瀹屾垚纭鍚庡啀杩涜楠屾敹");
+ }
+ }else {
+ return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜嬫晠鐧昏鍗�");
}
}else {
- return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜嬫晠鐧昏鍗�");
+ return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у搧璐ㄩ噺纭");
}
- }else {
- return Result.error("楠屾敹澶辫触锛屾湭鐢熸垚浜у搧璐ㄩ噺纭");
}
+ LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
+ equipmentReportRepair.setStatus("5");
+ equipmentReportRepair.setAcceptTime(new Date());
+ Date start = equipmentReportRepair.getFaultTime();
+ Date end = equipmentReportRepair.getAcceptTime();
+ if(ObjectUtils.isNotNull(start)){
+ long timeDifference =end.getTime() - start.getTime();
+ BigDecimal hours = new BigDecimal(timeDifference)
+ .divide(new BigDecimal(60 * 60 * 1000), 3, BigDecimal.ROUND_HALF_EVEN);
+ equipmentReportRepair.setFaultHour(hours);
+ }
+ equipmentReportRepairService.updateById(equipmentReportRepair);
+ String equipmentId = equipmentReportRepair.getEquipmentId();
+ if(StringUtils.isNotBlank(equipmentId)){
+ Equipment equipment = equipmentService.getById(equipmentId);
+ equipment.setEquipmentStatus("1");
+ equipmentService.updateById(equipment);
+ }
+ return Result.OK("楠屾敹鎴愬姛");
+ }else {
+ equipmentReportRepair.setStatus("2");
+ equipmentReportRepairService.updateById(equipmentReportRepair);
+ RepairOrder repairOrder = repairOrderService.getOne(new QueryWrapper<RepairOrder>().eq("report_repair_id",equipmentReportRepair.getId()),false);
+ if(ObjectUtils.isNotNull(repairOrder)){
+ repairOrder.setStatus("3");
+ repairOrderService.updateById(repairOrder);
+ }
+ return Result.OK("宸查┏鍥�");
}
- LoginUser user= (LoginUser)SecurityUtils.getSubject().getPrincipal();
- equipmentReportRepair.setStatus("5");
- equipmentReportRepair.setAcceptTime(new Date());
- Date start = equipmentReportRepair.getFaultTime();
- Date end = equipmentReportRepair.getAcceptTime();
- if(ObjectUtils.isNotNull(start)){
- long timeDifference =end.getTime() - start.getTime();
- BigDecimal hours = new BigDecimal(timeDifference)
- .divide(new BigDecimal(60 * 60 * 1000), 3, BigDecimal.ROUND_HALF_EVEN);
- equipmentReportRepair.setFaultHour(hours);
- }
- equipmentReportRepairService.updateById(equipmentReportRepair);
- String equipmentId = equipmentReportRepair.getEquipmentId();
- if(StringUtils.isNotBlank(equipmentId)){
- Equipment equipment = equipmentService.getById(equipmentId);
- equipment.setEquipmentStatus("1");
- equipmentService.updateById(equipment);
- }
- return Result.OK("楠屾敹鎴愬姛");
+
}
/**
* 瀵煎嚭excel
--
Gitblit v1.9.3