art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改

zhangherong

2025-03-07 9de1d40d3a61ce166c63a2c07d02d89bf8bdabd0

art: 选择设备查询逻辑修改， 点检工单新增时产线逻辑修改

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

@@ -301,6 +301,10 @@
                                                   HttpServletRequest req) {
         QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
         Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
         List<String> userWorkCenterIds = getUserWorkCenterIds();
         if(userWorkCenterIds != null && userWorkCenterIds.size() > 0){
             equipment.setUserWorkCenterIds(userWorkCenterIds);
         }
         IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
         return Result.OK(pageList);
     }

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

@@ -221,10 +221,16 @@
        }else{
            //生产线设备，按照生产线来进行点检
            String lineId = equipment.getLineId();
            if(StringUtils.isBlank(lineId)){
                return Result.error("生产线设备没有关联到产线编号");
            }
            List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
                    .eq(DailyInspectionStandard::getEquipmentId, lineId)
                    .eq(DailyInspectionStandard::getVersionStatus, "2")
                    .eq(DailyInspectionStandard::getDelFlag, "0").list();
            if(CollectionUtils.isEmpty(dailyInspectionStandards)){
                return Result.error("设备对应的产线没有配置点检标准");
            }
            if(dailyInspectionStandards.size()>0) {
                DailyInspectionStandard dailyInspectionStandard = dailyInspectionStandards.get(0);
                //保存点检工单子表数据

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

@@ -423,6 +423,8 @@
    private String yseNoMaintenance2Standard;
    @TableField(exist = false)
    private String yseNoMaintenance3Standard;
    @TableField(exist = false)
    private List<String> userWorkCenterIds;


}

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

@@ -86,7 +86,8 @@
                                       @Param("isLine")String isLine,
                                        @Param("equipmentCategoryId")String equipmentCategoryId,
                                       @Param("equipNums") List<String> equipNums,
                                       @Param("sql")String sql
                                       @Param("sql")String sql,
                                       @Param("userWorkCenterIds")List<String> userWorkCenterIds
    );

    List<Equipment> getEquipmentTZList(   Page<Equipment> page,

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

@@ -325,6 +325,12 @@
        <if test="lineId != null and lineId != ''">
            and t1.line_id = #{lineId}
        </if>
        <if test="userWorkCenterIds != null and userWorkCenterIds.size > 0">
            and t1.work_center_id in
            <foreach collection="userWorkCenterIds" open="(" separator="," close=")" item="workCenterId">
                #{workCenterId}
            </foreach>
        </if>
        order by t1.create_time desc
    </select>


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

@@ -138,7 +138,8 @@
                equipment.getIsLine(),
                equipment.getEquipmentCategoryId(),
                equipNums,
                sql
                sql,
                equipment.getUserWorkCenterIds()
        ));
    }