From 21092d29c1c0cd1003bb32bf91fddae265a8baea Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期三, 20 十一月 2024 08:41:11 +0800
Subject: [PATCH] 1、卧理单条磨边线对接完成,另一条线等待IP确认 2、大理片笼提交部分代码
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/uppattenusage/controller/UpPattenUsageController.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 3d98ea2..434a8c5 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
@@ -2,7 +2,6 @@
import com.mes.engineering.entity.Engineering;
import com.mes.engineering.service.EngineeringService;
-import com.mes.glassinfo.entity.GlassInfo;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.pp.service.OptimizeProjectService;
import com.mes.uppattenusage.entity.UpPattenUsage;
@@ -36,6 +35,8 @@
private EngineeringService engineeringService;
@Autowired
private OptimizeProjectService optimizeProjectService;
+
+
@ApiOperation("鏄剧ず閫夋嫨鐨勫伐绋嬩俊鎭�")
@GetMapping("/prioritylist") //鏌ヨ鐜板湪涓婄墖鏈虹殑鐜荤拑淇℃伅
@ResponseBody
@@ -70,13 +71,19 @@
@ResponseBody
public Result<Boolean> updateGlassState(@RequestBody UpPattenUsage upPattenUsage) {
Boolean whether = upPattenUsageService.updateGlassState(upPattenUsage);
- if (whether){
+ if (whether) {
return Result.build(200, "鎴愬姛", whether);
- }else {
+ } else {
return Result.build(100, "澶辫触", whether);
}
}
+ @ApiOperation("璁剧疆涓婄墖鏌ヨ鏉′欢")
+ @PostMapping("/setUpPattenRequest")
+ public Result setRawGlassTaskRequest(@RequestBody Engineering request) {
+ log.info("鏌ヨ涓婄墖淇℃伅:{}", request);
+ return Result.build(200, "鏌ヨ鎴愬姛", upPattenUsageService.setRawGlassTaskRequest(request));
+ }
}
--
Gitblit v1.8.0