update

Lius

2025-01-15 aed7113be920129211fd7cd63c963301bbf40581

update

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcPartProcessInfo.java

@@ -34,19 +34,19 @@
    /**
     * 设备编号
     */
    @Excel(name = "设备编号", width = 15)
    @Excel(name = "设备编号", width = 20)
    @ApiModelProperty(value = "设备编号")
    private String equipmentId;
    /**
     * 零件号
     */
    @Excel(name = "零件号", width = 15)
    @Excel(name = "零件号", width = 20)
    @ApiModelProperty(value = "零件号")
    private String partId;
    /**
     * 标准加工时长（min）
     */
    @Excel(name = "标准加工时长（min）", width = 15)
    @Excel(name = "标准加工时长（min）", width = 20)
    @ApiModelProperty(value = "标准加工时长（min）")
    private Integer standardProcessLong;
    /**
@@ -64,7 +64,7 @@
    /**
     * 加工总时长(min)
     */
    @Excel(name = "加工总时长(min)", width = 15)
    @Excel(name = "加工总时长(min)", width = 18)
    @ApiModelProperty(value = "加工总时长(min)")
    private Integer totalProcessLong;


 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentMapper.xml

@@ -107,6 +107,7 @@
        <foreach collection="equipmentIds" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
        ORDER BY t1.equipment_id
    </select>

    <!--根据部门id查询设备id集合-->

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

@@ -463,23 +463,24 @@
            }
            result.put("runData", runData);

            //坐标信息
            // 查询坐标信息
            EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
            if (equipmentXYZ != null) {
                Map<String, Object> map = new HashMap<>();
                map.put("xmachine", equipmentXYZ.getXMachine());
                map.put("ymachine", equipmentXYZ.getYMachine());
                map.put("zmachine", equipmentXYZ.getZMachine());
                map.put("amachine", equipmentXYZ.getAMachine());
                map.put("bmachine", equipmentXYZ.getBMachine());
            if (!mdcEquipmentDetailedDto.getDriveType().equals("ZUOLAN") || !mdcEquipmentDetailedDto.getDriveType().equals("CurrentState")) {
                EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipmentDetailedDto.getEquipmentId());
                if (equipmentXYZ != null) {
                    Map<String, Object> map = new HashMap<>();
                    map.put("xmachine", equipmentXYZ.getXMachine());
                    map.put("ymachine", equipmentXYZ.getYMachine());
                    map.put("zmachine", equipmentXYZ.getZMachine());
                    map.put("amachine", equipmentXYZ.getAMachine());
                    map.put("bmachine", equipmentXYZ.getBMachine());

                map.put("xabsolute", equipmentXYZ.getXAbsolute());
                map.put("yabsolute", equipmentXYZ.getYAbsolute());
                map.put("zabsolute", equipmentXYZ.getZAbsolute());
                map.put("aabsolute", equipmentXYZ.getAAbsolute());
                map.put("babsolute", equipmentXYZ.getBAbsolute());
                result.put("xyzList", map);
                    map.put("xabsolute", equipmentXYZ.getXAbsolute());
                    map.put("yabsolute", equipmentXYZ.getYAbsolute());
                    map.put("zabsolute", equipmentXYZ.getZAbsolute());
                    map.put("aabsolute", equipmentXYZ.getAAbsolute());
                    map.put("babsolute", equipmentXYZ.getBAbsolute());
                    result.put("xyzList", map);
                }
            }

        }