新版430
上一版本: 4164fd37 | 补丁 | 提交 | 忽略空白
“linengliang”
2024-01-12 aab3254e58ba8c1a5ce0772562ee3d312873028b 
消息提醒
已修改2个文件
29 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentReportRepairController.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11(lnl)/lnl.sql 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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)){




 lxzn-module-system/lxzn-system-start/src/main/resources/db/2024_1_11(lnl)/lnl.sql


@@ -7,4 +7,13 @@


INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1745365425845702657', N'物料类型', N'material_type', '', 0, N'admin', '2024-01-11 16:41:59.4940000', NULL, NULL, NULL);




INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745365536852152322', N'1745365425845702657', N'加工件', N'needPart', '', 1, 1, N'admin', '2024-01-11 16:42:25.0000000', N'admin', '2024-01-11 16:45:00.3490000');




INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745365875504451586', N'1745365425845702657', N'采购件', N'needSpare', '', 1, 1, N'admin', '2024-01-11 16:43:46.0000000', N'admin', '2024-01-11 16:44:24.5800000');




INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624015416393730', N'设备质量隐患确认消息接收人', N'QuanlityConfirm', NULL, N'admin', '2024-01-12 09:49:32.0660000', NULL, NULL);




INSERT INTO [dbo].[sys_role] ([id], [role_name], [role_code], [description], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745625163405787138', N'设备事故登记消息接收人', N'FaultInfo', NULL, N'admin', '2024-01-12 09:54:05.7710000', NULL, NULL);




INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624699176026113', N'1724240975967690753', N'质量隐患确认', N'QuanlityConfirm', '', 10, 1, N'admin', '2024-01-12 09:52:15.0830000', NULL, NULL);




INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1745624959524864001', N'1724240975967690753', N'设备事故登记确认', N'FaultInfo', '', 11, 1, N'admin', '2024-01-12 09:53:17.1640000', NULL, NULL);