From 899813196f304b8e837f0dcff059b0110c82e110 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 16:07:38 +0800
Subject: [PATCH] Merge branch 'aerjiliya' of http://10.153.19.25:10105/r/YiWuProject into aerjiliya
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 27 +++++++++++++++++++++++----
1 files changed, 23 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 6ea664c..d7454fd 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
@@ -30,9 +30,9 @@
@Autowired
private UpPattenUsageService upPattenUsageService;
@Autowired
- private GlassInfoService glassInfoService;
+ private GlassInfoService glassInfoService;
@Autowired
- private EngineeringService engineeringService;
+ private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
@@ -66,7 +66,7 @@
return Result.build(100, "澶辫触", upPattenUsages);
}
- }
+ }
@ApiOperation("鍒囨崲鍘熺墖涓婄墖鐘舵��")
@PostMapping("/updateGlassState") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@@ -85,7 +85,26 @@
@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);
+ }
+
+ }
+
+ @ApiOperation("娣诲姞浠诲姟")
+ @PostMapping("/insertTask")
+ public Result insertTask(Integer quantity, Integer slot) {
+ return Result.build(200, "娣诲姞鎴愬姛", upPattenUsageService.insertTask(quantity, slot));
+ }
+
+ @ApiOperation("鍒犻櫎浠诲姟")
+ @PostMapping("/deleteTask")
+ public Result deleteUpPattenTask(String id) {
+ return Result.build(200, "鍒犻櫎鎴愬姛", upPattenUsageService.deleteUpPattenTask(id));
}
}
--
Gitblit v1.8.0