zhoushihao
2025-09-04 374cb4977dd66509794e80d181d9448e7e4be5c8
1、掰片识别一键破损功能
4个文件已修改
33 ■■■■■ 已修改文件
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/request/DamageRequest.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/entity/request/DamageRequest.java
@@ -15,6 +15,12 @@
@Data
public class DamageRequest {
    @ApiModelProperty("工程号")
    private String engineerId;
    @ApiModelProperty("原片号")
    private int patternSequence;
    @ApiModelProperty("玻璃ID")
    @NotBlank(message = "玻璃ID不能为空")
    private String glassId;
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/EdgStorageCageDetailsService.java
@@ -114,4 +114,6 @@
    List<EdgSlotRemainVO> querySlotRemainWidth(int cellLength, int glassGap);
    List<PieChartVO> queryPieChart();
    Boolean identControlsByPatternSequence(DamageRequest request);
}
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/edgstoragecage/service/impl/EdgStorageCageDetailsServiceImpl.java
@@ -380,4 +380,17 @@
    public List<PieChartVO> queryPieChart() {
        return this.baseMapper.queryPieChart();
    }
    @Override
    public Boolean identControlsByPatternSequence(DamageRequest request) {
        List<GlassInfo> glassInfos = glassInfoService.list(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getEngineerId, request.getEngineerId())
                .eq(GlassInfo::getPatternSequence, request.getPatternSequence()));
        for (GlassInfo info : glassInfos) {
            //掰片报破损
            damageService.autoSubmitReport(info.getGlassId(), request.getLine(), request.getWorkingProcedure(), "切割", request.getState());
        }
        return Boolean.TRUE;
    }
}
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -2,7 +2,6 @@
import cn.hutool.json.JSONObject;
import com.mes.damage.entity.request.DamageRequest;
import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
@@ -10,7 +9,10 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@@ -62,6 +64,12 @@
        return Result.build(200, "成功", edgStorageCageDetailsService.identControls(request));
    }
    @ApiOperation("识别操作一键执行:   破损/拿走     参数(ID,功能[9:拿走,8:破损])")
    @PostMapping("/identControlsByPatternSequence")
    public Result<Boolean> identControlsByPatternSequence(@RequestBody DamageRequest request) {
        return Result.build(200, "成功", edgStorageCageDetailsService.identControlsByPatternSequence(request));
    }
    @ApiOperation("磨边任务 参数()")
    @PostMapping("/selectEdgTask")
    public Result selectEdgTask(@RequestBody Map<String, String> arguments) {