From b4ff04d7dd22f0e48bf386cd422e885aef08fed7 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 22 五月 2025 15:03:10 +0800
Subject: [PATCH] OPC通讯修改为S7通讯
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 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..1462b10 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);
}
@@ -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);
+ }
+
}
}
--
Gitblit v1.8.0