From aab3254e58ba8c1a5ce0772562ee3d312873028b Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 12 一月 2024 10:01:39 +0800
Subject: [PATCH] 消息提醒
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 1a0d577..fcc616d 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
@@ -117,9 +117,9 @@
LoginUser curUser= (LoginUser) SecurityUtils.getSubject().getPrincipal();
equipmentReportRepair.setStatus("1");
equipmentReportRepair.setSource("1");
-// equipmentReportRepair.setType("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);
@@ -133,21 +133,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)){
--
Gitblit v1.9.3