Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

zhangyong

2024-11-26 31a6849672a6ccac2289fc3bd8fbacdd13c99634

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

@@ -53,6 +53,8 @@
        List<UpPattenUsage> upPattenUsages=null;
        UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
        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);