Merge remote-tracking branch 'origin/master'

zhoushihao

2025-05-12 fbd31387721424c65b173cbb23b03202f3e7dce6

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java

@@ -85,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);
        }

    }
}