增加小片状态字段，指定工程增加破损表联查状态

wu

2025-02-26 7936e00bd4831912f99e352e8de9752004bb3603

增加小片状态字段，指定工程增加破损表联查状态

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

@@ -162,6 +162,10 @@
     * 除膜方式
     */
    private Integer filmRemove;
    /**
     * 状态
     */
    private Integer status;


}

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.mapper.GlassInfoMapper;
import com.mes.temperingglass.entity.TemperingGlassInfo;
@@ -150,10 +151,18 @@

    @Override
    public List<GlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
        wrapper.eq("engineer_id", glassInfo.getEngineerId())
                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
                .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
        return glassInfoMapper.selectList(wrapper);
        List<GlassInfo> glassInfos = null;
        glassInfos = glassInfoMapper.selectJoinList(GlassInfo.class, new MPJQueryWrapper<GlassInfo>()
                .select("IFNULL(b.status, 0) AS status,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id")
                .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" +
                        "ON t.glass_id = b.glass_id")
                .eq("engineer_id", glassInfo.getEngineerId())
                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId()));
        return glassInfos;
//        QueryWrapper<GlassInfo> wrapper = new QueryWrapper<>();
//        wrapper.eq("engineer_id", glassInfo.getEngineerId())
//                .eq("tempering_layout_id", glassInfo.getTemperingLayoutId())
//                .select("engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,glass_id");
//        return glassInfoMapper.selectList(wrapper);
    }
}

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml

@@ -14,3 +14,13 @@
mes:
  width: 2800
  height: 5000
kangaroohy:
  milo:
    enabled: false
    primary: default
    config:
      default:
        endpoint: opc.tcp://10.153.19.150:49320
        security-policy: basic256sha256
        username: admin
        password: 1qaz2wsx3edc4rfv