From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 434a8c5..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
@@ -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);
+ }
+
}
}
--
Gitblit v1.8.0