From 28ecfb8e416d8f610b58ad4172ab7214535c6786 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 五月 2025 16:12:31 +0800
Subject: [PATCH] 中空三条线创建任务界面新增客户名称显示；仓储模块原片仓储详情编辑新增回显
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java | 62 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
index 85e1ef5..b99bef0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/taskcache/controller/TaskCacheController.java
@@ -1,14 +1,15 @@
package com.mes.taskcache.controller;
+import cn.hutool.json.JSONObject;
+import com.mes.damage.entity.request.DamageRequest;
+import com.mes.edgstoragecage.entity.vo.CutDrawingVO;
import com.mes.edgstoragecage.service.EdgStorageCageDetailsService;
-import com.mes.edgstoragecage.service.EdgStorageCageService;
-import com.mes.pp.entity.OptimizeDetail;
-import com.mes.taskcache.entity.TaskCache;
import com.mes.taskcache.service.TaskCacheService;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -16,7 +17,7 @@
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -31,39 +32,42 @@
private EdgStorageCageDetailsService edgStorageCageDetailsService;
@Autowired
- private EdgStorageCageService edgStorageCageService;
- @Autowired
private TaskCacheService taskCacheService;
- @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
- @PostMapping("/cutTerritory")
- @ResponseBody
- public Result cutTerritory(String current) {
- List<Map<String, Object>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
- return Result.build(200,"鎴愬姛",h);
+ @ApiOperation("鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙� 鍙傛暟(宸ョ▼鍙�)")
+ @PostMapping("/temperingTerritory")
+ public Result temperingTerritory(String current) {
+ List<Map<String, Object>> h = edgStorageCageDetailsService.selectTemperingTerritory(current);
+ return Result.build(200, "鎴愬姛", h);
}
- @ApiOperation("璇嗗埆鏄剧ず 褰撳墠鐗堝浘 鍙傛暟()")
- @PostMapping("/currentCutTerritory")
- @ResponseBody
- public Result currentCutTerritory() {
- List<Map<String, Object>> h = edgStorageCageDetailsService.selectCutTerritory();
- return Result.build(200,"鎴愬姛",h);
- }
- @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[200锛氭嬁璧帮紝201:鐮存崯]锛�")
- @PostMapping("/identControls")
- @ResponseBody
- public Result identControls(@RequestParam(name = "identId", required = false) String identId,@RequestParam(name = "controlsId", required = false) int controlsId) {
- boolean issucess = edgStorageCageDetailsService.identWorn(identId,controlsId);
- return Result.build(200,"鎴愬姛",issucess);
+ @ApiOperation("鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁宸ョ▼鍙峰強鐗堝簭锛岀増搴忛粯璁や负1")
+ @PostMapping("/queryCutDrawingByEngineerId")
+ public Result queryCutDrawingByEngineerId(String engineerId, int patternSequence) {
+// List<List<Map<String, Object>>> h = edgStorageCageDetailsService.selectCurrentCutTerritory(current);
+ Map<String, Object> map = edgStorageCageDetailsService.queryCutDrawingByEngineerId(engineerId, patternSequence);
+ return Result.build(200, "鎴愬姛", map);
+ }
+
+ @ApiOperation("璇嗗埆鏄剧ず:褰撳墠鐗堝浘,闇�瑕佸綋鍓嶅崸寮忕悊鐗囪澶噄d銆佷笂鐗囩嚎璺�")
+ @PostMapping("/queryCurrentCutDrawing")
+ public Result<JSONObject> queryCurrentCutDrawing(int deviceId, int stationCell) {
+ JSONObject jsonObject = edgStorageCageDetailsService.queryCurrentCutDrawing(deviceId, stationCell);
+ return Result.build(200, "鎴愬姛", jsonObject);
+ }
+
+ @ApiOperation("璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D,鍔熻兘[9锛氭嬁璧帮紝8:鐮存崯]锛�")
+ @PostMapping("/identControls")
+ public Result<String> identControls(@RequestBody @Validated DamageRequest request) {
+ return Result.build(200, "鎴愬姛", edgStorageCageDetailsService.identControls(request));
}
@ApiOperation("纾ㄨ竟浠诲姟 鍙傛暟()")
@PostMapping("/selectEdgTask")
- @ResponseBody
- public Result selectEdgTask(String line) {
- List<TaskCache> EdgTasks = taskCacheService.selectEdgInfo(line);
- return Result.build(200,"鎴愬姛",EdgTasks);
+ public Result selectEdgTask(@RequestBody Map<String, String> arguments) {
+ String line = arguments.get("line");
+ List<Map<String, Object>> EdgTasks = taskCacheService.selectEdgInfo(line);
+ return Result.build(200, "鎴愬姛", EdgTasks);
}
}
--
Gitblit v1.8.0