修正破损接口，指定版图查询更新

wu

2025-02-27 597694f4d57a16aeb1bdccdebfcb5375abc1fce9

修正破损接口，指定版图查询更新

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java

@@ -186,7 +186,7 @@
        damage.setLine(deviceId);
        damage.setType(type);
        damage.setRemark(remark);
        damage.setStatus(0);
        damage.setStatus(1);
        this.insertDamage(damage);
    }

@@ -216,7 +216,7 @@
            glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
            GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoSelectWrapper);
            BeanUtils.copyProperties(glassInfo, damage);

            damage.setStatus(1);
            LambdaQueryWrapper<WorkAssignment> workAssignmentSelectWrapper = new LambdaQueryWrapper<>();
            workAssignmentSelectWrapper
                    .eq(WorkAssignment::getLine, damage.getLine())

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/glassinfo/entity/GlassInfo.java

@@ -1,6 +1,7 @@
package com.mes.glassinfo.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -165,6 +166,7 @@
    /**
     * 状态
     */
    @TableField(exist = false)
    private Integer status;



 hangzhoumesParent/common/servicebase/src/main/java/com/mes/temperingglass/service/impl/TemperingGlassInfoServiceImpl.java

@@ -70,7 +70,8 @@
    public List<TemperingGlassInfo> selectOutGlass() {
        //获取出炉中的玻璃信息
        QueryWrapper<TemperingGlassInfo> wrap = new QueryWrapper<>();
        wrap.select("Top 1 *").eq("state", 3);
        wrap.select("Top 1 *").eq("state", 4)
                .orderByDesc("id");
        TemperingGlassInfo glass = temperingMapper.selectOne(wrap);
        //根据工程号和版图获取数据
        if (glass != null) {
@@ -84,7 +85,7 @@
        //获取过旋转台最大的钢化版图id
        QueryWrapper<TemperingGlassInfo> wapper = new QueryWrapper<>();
        wapper.select("Top 1 *").eq("state", 4)
                .orderByDesc("tempering_layout_id,engineer_id");
                .orderByDesc("id");
        //根据最大的版图id显示钢化后的版图信息
        TemperingGlassInfo glassinfo = temperingMapper.selectOne(wapper);
        if (glassinfo == null) {

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/controller/TemperingGlassInfoController.java

@@ -54,11 +54,10 @@
        temperingGlassInfo.setState(damage.getStatus());
        temperingGlassInfo.setGlassId(damage.getGlassId());
        int result=temperingGlassInfoService.updateTemperingState(temperingGlassInfo);
//        if(damage.getStatus()>5) {
//            damage.setType(damage.getStatus());
//            damage.setStatus(1);
//            damageService.insertDamage(damage);
//        }
        if (damage.getStatus() > 5) {
            damageService.autoSubmitReport(damage.getGlassId(), damage.getLine()
                    , damage.getWorkingProcedure(), "钢化炉", damage.getStatus());
        }
        return Result.build(200, "破损成功", result);
    }