修改

“linengliang”

2023-12-13 5c3742eca3b35c96f66c53b8dfabcb6848e03a7d

修改

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -788,6 +788,8 @@
                                         .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                                         .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                                         .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
                                         .setIsLineEquip("no")
                                         .setIsLine("no")
                                         .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
                                         .setGpo(equipmentImportVo.getGpo());
                                 if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
@@ -860,6 +862,7 @@
     @Transactional(rollbackFor = {Exception.class})
     public Result<?> addLine(@RequestBody Equipment equipment){
          equipment.setIsLineEquip("no");
          equipment.setIsLine("yes");
          equipmentService.save(equipment);
          List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
          for(Equipment equipment1:equipmentList){
@@ -874,7 +877,11 @@
     @Transactional(rollbackFor = {Exception.class})
     public Result<?> editLine(@RequestBody Equipment equipment){
         equipmentService.updateById(equipment);
         equipmentService.update(new UpdateWrapper<Equipment>().eq("line_id",equipment.getId()).set("line_id",null).set("is_meta",null));
         equipmentService.update(new UpdateWrapper<Equipment>()
                 .eq("line_id",equipment.getId())
                 .set("line_id",null)
                 .set("is_meta",null)
                 .set("is_line_equip","no"));
         List<Equipment> equipmentList = equipment.getEquipmentOfLineTable();
         for(Equipment equipment1:equipmentList){
             equipment1.setLineId(equipment.getId());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -394,6 +394,8 @@
    private String isLineEquip;
    @Dict(dicCode = "is_product")
    private String isJudging;
    @Dict(dicCode = "is_product")
    private String isLine;


}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamEquipmentMapper.java

@@ -80,6 +80,7 @@
                                       @Param("warrantyEnd")Date warrantyEnd,
                                        @Param("lineId")String lineId,
                                        @Param("isLineEquip")String isLineEquip,
                                       @Param("isLine")String isLine,
                                       @Param("sql")String sql
    );
    List<DailyInspectionStandardDetail>  getStandardList(Page<DailyInspectionStandardDetail> page,@Param("mainId") String mainId,@Param("type")String type);

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -292,6 +292,9 @@
        <if test="isLineEquip != null and  isLineEquip != ''">
            and t1.is_line_equip = #{isLineEquip}
        </if>
        <if test="isLine != null and  isLine != ''">
            and t1.is_line = #{isLine}
        </if>
        <if test="specificEquipment != null and  specificEquipment != ''">
            and t1.specific_equipment = #{specificEquipment}
        </if>

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java

@@ -117,6 +117,7 @@
                equipment.getWarrantyEnd(),
                equipment.getLineId(),
                equipment.getIsLineEquip(),
                equipment.getIsLine(),
                sql
        ));
    }

 lxzn-module-system/lxzn-system-start/src/main/resources/db/2023_12_11(lnl)/lnl.sql

@@ -32,3 +32,27 @@
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment',
    'COLUMN', N'is_judging'
-- 是否生产线
ALTER TABLE [dbo].[mom_eam_equipment] ADD [is_line] nvarchar NULL
    GO

    EXEC sp_addextendedproperty
    'MS_Description', N'是否生产线（是：yes，否：no）',
    'SCHEMA', N'dbo',
    'TABLE', N'mom_eam_equipment',
    'COLUMN', N'is_line'
-- 修改字段长度
ALTER TABLE [dbo].[mom_eam_equipment] ALTER COLUMN [is_line] nvarchar(32) COLLATE Chinese_PRC_CI_AS NULL
-- 生产线新增编辑删除按钮权限
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734844168171163649', N'1726425666842873858', N'生产线新增编辑删除', NULL, NULL, NULL, NULL, 2, N'line:add&edit&delete', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 15:54:16.2070000', NULL, NULL, 0, NULL, N'1', 0);
-- 故障报修按钮权限
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734845810551558146', N'1647845301102936065', N'故障报修新增编辑按钮权限', NULL, NULL, NULL, NULL, 2, N'report:add&edit', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:00:47.7700000', NULL, NULL, 0, NULL, N'1', 0);
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734846510299877378', N'1647845301102936065', N'故障报修验收按钮权限', NULL, NULL, NULL, NULL, 2, N'report:accept', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:03:34.6030000', NULL, NULL, 0, NULL, N'1', 0);
-- 维修履历按钮权限
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734847324137459714', N'1650423515662295042', N'维修履历领取按钮权限', NULL, NULL, NULL, NULL, 2, N'repair:accept', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:06:48.6370000', NULL, NULL, 0, NULL, N'1', 0);
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734847789482905601', N'1650423515662295042', N'维修履历执行按钮权限', NULL, NULL, NULL, NULL, 2, N'repair:excute', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:08:39.5970000', NULL, NULL, 0, NULL, N'1', 0);
-- 事故登记按钮权限
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734851460430041089', N'1723876722224013314', N'确认按钮权限', NULL, NULL, NULL, NULL, 2, N'quanlity:confirm', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:23:14.8040000', NULL, NULL, 0, NULL, N'1', 0);
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734851932285046785', N'1723878256194232322', N'确认按钮权限', NULL, NULL, NULL, NULL, 2, N'fault:confirm', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:25:07.3090000', NULL, NULL, 0, NULL, N'1', 0);
INSERT INTO [dbo].[sys_permission] ([id], [parent_id], [name], [url], [component], [component_name], [redirect], [menu_type], [perms], [perms_type], [sort_no], [always_show], [icon], [is_route], [is_leaf], [keep_alive], [hidden], [hide_tab], [description], [create_by], [create_time], [update_by], [update_time], [del_flag], [rule_flag], [status], [internal_or_external]) VALUES (N'1734852409726865409', N'1723878256194232322', N'录入按钮权限', NULL, NULL, NULL, NULL, 2, N'fault:update', N'1', NULL, 0, NULL, 1, 1, 0, 0, 0, NULL, N'admin', '2023-12-13 16:27:01.1330000', NULL, NULL, 0, NULL, N'1', 0);