From 31a6849672a6ccac2289fc3bd8fbacdd13c99634 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期二, 26 十一月 2024 13:24:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
index e05b9da..6ea664c 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java
@@ -51,11 +51,11 @@
@ResponseBody
public Result<List<UpPattenUsage>> selectUpPattenUsage(@RequestBody Engineering engineering) {
List<UpPattenUsage> upPattenUsages = null;
- UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell()
- );
+ UpPattenUsage upPattenUsage = upPattenUsageService.selectedEngineering(engineering.getEngineerId());
if (upPattenUsage == null) {
- return Result.build(200, "澶辫触鏃犳暟鎹�", null);
- //upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+// return Result.build(200, "澶辫触鏃犳暟鎹�", null);
+// upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId(), engineering.getFilmRemove(), engineering.getStationCell());
+ upPattenUsages = upPattenUsageService.selectSaveUpPattenUsage(engineering.getEngineerId());
} else {
upPattenUsages = upPattenUsageService.selectUpPattenUsage(upPattenUsage);
}
--
Gitblit v1.8.0