ZengTao
2025-05-20 bda66fa3ff0a5d0fb8acd8af0013d5bdb4197093
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -50,17 +50,19 @@
    @PostMapping("/selectUpPattenUsage") //查询现在上片机的玻璃信息
    @ResponseBody
    public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
        List<UpPattenUsage> upPattenUsages=null;
        List<UpPattenUsage> upPattenUsages = null;
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        if(upPattenUsage == null){
        if (upPattenUsage == null) {
//            return Result.build(200, "失败无数据", null);
//            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
            upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
        }else {
            upPattenUsages= upPattenUsageService.selectUpPattenUsage(upPattenUsage);
        } else {
            upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
        }
        if (!upPattenUsages.isEmpty()) {
            return Result.build(200, "成功", upPattenUsages);
        }else {
        } else {
            return Result.build(100, "失败", upPattenUsages);
        }
@@ -83,7 +85,14 @@
    @PostMapping("/setUpPattenRequest")
    public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
        log.info("查询上片信息:{}", request);
        return Result.build(200, "查询成功", upPattenUsageService.setRawGlassTaskRequest(request));
        if (request.getStationCell() == 5) {
            return Result.build(200, "查询1号线", upPattenUsageService.setRawGlassTaskRequest(request));
        } else if (request.getStationCell() == 6) {
            return Result.build(200, "查询2号线", upPattenUsageService.setRawGlassTaskRequest2(request));
        } else {
            return Result.build(100, "查询失败", null);
        }
    }
}