xg

“linengliang”

2024-03-13 2fe791b0054a29abed3177e24de70fdb59de2cc6

xg

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

@@ -306,11 +306,13 @@
    private List<EquipmentProcessParameters> processEditTableList;
    @TableField(exist = false)
    private List<EquipmentPrecisionParameters> precisionEditTableList;
    /**工区*/
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_area",dicText = "name",orderNum = "39", name = "工区")
    private String factoryModelId;
    /**中心*/
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "产线",orderNum = "40")
    @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    private String workCenterId;
    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
    @Excel(name = "质保开始日期", width = 15,orderNum = "37",format = "yyyy-MM-dd")
@@ -403,6 +405,9 @@
    private String equipmentId;
    @TableField(exist = false)
    private List<Equipment> keyEquipmentUpdateList;
    /**工段*/
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    private String areaId;


}

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

@@ -72,6 +72,7 @@
                                       @Param("model")String model,
                                       @Param("workCenterId")String workCenterId,
                                       @Param("factoryModelId")String factoryModelId,
                                        @Param("areaId")String areaId,
                                       @Param("manageId")String manageId,
                                       @Param("useId")String useId,
                                       @Param("equipmentImportanceId")String equipmentImportanceId,

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

@@ -254,6 +254,7 @@
        t1.id showId,
        t1.is_line_equip isLineEquip,
        t1.is_judging isJudging,
        t1.area_id areaId,
        t3.sumOfEquipment
    from mom_eam_equipment t1
    left join (select  * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
@@ -274,6 +275,10 @@
        <if test="workCenterId != null and workCenterId != ''">
            and t1.work_center_id = #{workCenterId}
        </if>
--         根据areaId查询设备
        <if test="areaId != null and areaId != ''">
            and t1.area_id = #{areaId}
        </if>
        <if test="factoryModelId != null and factoryModelId != ''">
            and t1.factory_model_id = #{factoryModelId}
        </if>

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

@@ -115,6 +115,7 @@
                equipment.getModel(),
                equipment.getWorkCenterId(),
                equipment.getFactoryModelId(),
                equipment.getAreaId(),
                equipment.getManageId(),
                equipment.getUseId(),
                equipment.getEquipmentImportanceId(),