增加破损返回数据，破损请求类增加字段

wu

2025-02-28 914278f6110c03250d24ed0f1f4a7d5675a228e5

增加破损返回数据，破损请求类增加字段

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

@@ -155,8 +155,8 @@
    public List<LoadGlassInfo> selectTemperingGlass(GlassInfo glassInfo) {
        List<LoadGlassInfo> glassInfos = null;
        glassInfos = glassInfoMapper.selectJoinList(LoadGlassInfo.class, new MPJQueryWrapper<GlassInfo>()
                .select("IFNULL(b.status, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
                .leftJoin("(SELECT glass_id, MAX(status) AS status FROM damage GROUP BY glass_id) b\n" +
                .select("IFNULL(b.state, 0) AS state,engineer_id,tempering_layout_id,width,height,tempering_feed_sequence,x_coordinate,y_coordinate,angle,t.glass_id,t.flow_card_id")
                .leftJoin("(SELECT glass_id, MAX(type) AS state 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()));

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

@@ -50,7 +50,7 @@

    @ApiOperation("//钢化破损拿走放回")
    @PostMapping("/updateTemperingState") //钢化后显示出炉的版图信息
    public Result <Integer> updateTemperingState(@RequestBody DamageRequest damage) {
    public Result<List<LoadGlassInfo>> updateTemperingState(@RequestBody DamageRequest damage) {
        TemperingGlassInfo temperingGlassInfo=new TemperingGlassInfo();
        temperingGlassInfo.setState(damage.getState());
        temperingGlassInfo.setGlassId(damage.getGlassId());
@@ -59,7 +59,11 @@
            damageService.autoSubmitReport(damage.getGlassId(), damage.getLine()
                    , damage.getWorkingProcedure(), "钢化炉", damage.getState());
        }
        return Result.build(200, "破损成功", result);
        GlassInfo glassInfo = new GlassInfo();
        glassInfo.setEngineerId(damage.getEngineerId());
        glassInfo.setTemperingLayoutId(damage.getTemperingLayoutId());
        List<LoadGlassInfo> glass = temperingGlassInfoService.selectTemperingGlass(glassInfo);
        return Result.build(200, "破损成功", glass);
    }

    @ApiOperation("//查询当前工程号所有的炉号")

 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/temperingglass/eneity/request/DamageRequest.java

@@ -31,4 +31,12 @@
     * 状态：8破损  9拿走
     */
    private Integer state;
    /**
     * 工程号
     */
    private String engineerId;
    /**
     * 钢化版图id
     */
    private Integer temperingLayoutId;
}