From 73db5fb7f98e13e37ff5f43ec8977fb1f0cfcb9b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 25 七月 2024 12:34:34 +0800
Subject: [PATCH] 大理片:修改进片逻辑，卧转立启动，详情表中新增一条状态为0的玻璃信息，进片任务完成后将状态改为100 下片：下片异常问题解决
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java | 119 +++++++++++++++++++++++++++++------------------------------
1 files changed, 58 insertions(+), 61 deletions(-)
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
index 9ff8dbc..2c15c6c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java
@@ -2,20 +2,21 @@
import com.mes.downworkstation.entity.DownWorkstation;
+import com.mes.downworkstation.entity.request.DownWorkRequest;
import com.mes.downworkstation.service.DownWorkstationService;
import com.mes.glassinfo.service.GlassInfoService;
+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.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* <p>
- * 鍓嶇鎺у埗鍣�
+ * 鍓嶇鎺у埗鍣�
* </p>
*
* @author zhoush
@@ -23,7 +24,8 @@
*/
@RestController
-@RequestMapping("/api/downWorkstation")
+@Api(description = "宸ヤ綅")
+@RequestMapping("/downWorkStation")
public class DownWorkstationController {
@Autowired
@@ -31,74 +33,47 @@
@Autowired
private GlassInfoService glassInfoService;
+ @ApiOperation("鑾峰彇宸ヤ綅淇℃伅")
@GetMapping("/getone")
- public ResponseEntity<?> getOneDownWorkstations() {
+ public Result getOneDownWorkstations() {
try {
- List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1,5);
+ List<DownWorkstation> data = downWorkstationService.getoneDownWorkstations(1, 6);
// 鏋勫缓绗﹀悎棰勬湡鏍煎紡鐨勫搷搴旀暟鎹�
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("code", 200);
- responseData.put("msg", "鎴愬姛");
- responseData.put("data", data);
- // 杩斿洖 ResponseEntity 瀵硅薄锛屽寘鍚搷搴旀暟鎹拰鐘舵�佺爜
- return ResponseEntity.ok(responseData);
+ return Result.build(200, "鑾峰彇宸ヤ綅淇℃伅鎴愬姛", data);
} catch (Exception e) {
e.printStackTrace();
// 濡傛灉鍑虹幇寮傚父锛岃繑鍥為敊璇俊鎭�
- Map<String, Object> errorResponse = new HashMap<>();
- errorResponse.put("code", 500);
- errorResponse.put("msg", "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
- return ResponseEntity.status(500).body(errorResponse);
+ return Result.build(500, "鑾峰彇宸ヤ綅淇℃伅澶辫触", 1);
}
}
- @GetMapping("/gettwo")
- public List<DownWorkstation> gettwoDownWorkstations() {
- return downWorkstationService.getoneDownWorkstations(6,10);
- }
+ @ApiOperation("鑾峰彇娴佺▼鍗″彿")
@GetMapping("/getflowCardId")
- public ResponseEntity<Map<String, Object>> getflowCardId() {
- Map<String, Object> responseData = new HashMap<>();
+ public Result getflowCardId() {
+
try {
List<Map<String, Object>> data = glassInfoService.getFlowCardId();
- responseData.put("code", 200);
- responseData.put("msg", "鎴愬姛");
- responseData.put("data", data);
- return ResponseEntity.ok(responseData);
+ return Result.build(200, "鑾峰彇娴佺▼鍗″彿鎴愬姛", data);
} catch (Exception e) {
- responseData.put("code", 500);
- responseData.put("msg", "澶辫触");
- responseData.put("data", null);
- return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseData);
+ return Result.build(500, "鑾峰彇娴佺▼鍗″彿澶辫触", 1);
}
}
-
-//缁戝畾鏋跺瓙
+ //缁戝畾鏋跺瓙
+ @ApiOperation("缁戝畾鏋跺瓙")
@PostMapping("/updateFlowCardId")
- public ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody Map<String, Object> requestData) {
- // 浠� requestData 涓幏鍙栦紶鍏ョ殑 flowCardId
- String flowCardId = (String) requestData.get("flowCardId");
- int workstationId = (int) requestData.get("workstationId");
+ public Result updateFlowCardId(@RequestBody DownWorkRequest request) {
- // 鏌ヨ瀵瑰簲 flowCardId 鐨勭幓鐠冧俊鎭�绘暟閲�
- int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
+ // 缁戝畾鏋跺瓙
+ downWorkstationService.updateFlowCardIdAndCount(request.getFlowCardId(), request.getWorkstationId(), request.getLayer());
- // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
- downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
-
- // 鏋勫缓鍝嶅簲鏁版嵁
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("message", "updated successfully");
- responseData.put("code", 200);
- // 杩斿洖澶勭悊缁撴灉
- return ResponseEntity.ok(responseData);
+ return Result.build(200, "缁戝畾鏋跺瓙鎴愬姛", 1);
}
-
+ @ApiOperation("娓呴櫎宸ヤ綅淇℃伅")
@PostMapping("/clear")
- public ResponseEntity<Map<String, Object>> clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
+ public Result clearWorkstationInfo(@RequestBody Map<String, Object> requestData) {
// 璋冪敤 DownWorkstationService 涓殑鏂规硶娓呴櫎鎸囧畾宸ヤ綅ID鐨勪俊鎭�
int workstationId = (int) requestData.get("workstationId");
@@ -108,18 +83,10 @@
if (downWorkstations == totalWorkstations) {
downWorkstationService.clearFlowCardId(workstationId);
- Map<String, Object> responseData = new HashMap<>();
- responseData.put("message", "cleared successfully");
- responseData.put("code", 200);
- // 杩斿洖澶勭悊缁撴灉
- return ResponseEntity.ok(responseData);
- }
- else {
+ return Result.build(200, "娓呴櫎宸ヤ綅淇℃伅鎴愬姛", 1);
+ } else {
// 濡傛灉鎬绘暟閲忓拰钀芥灦鏁伴噺涓嶄竴鑷达紝杩斿洖閿欒鍝嶅簲
- Map<String, Object> errorResponse = new HashMap<>();
- errorResponse.put("message", "Total workstations count does not match down workstations count.");
- errorResponse.put("code", 400);
- return ResponseEntity.badRequest().body(errorResponse);
+ return Result.build(500, "娓呴櫎宸ヤ綅淇℃伅澶辫触", 1);
}
@@ -128,8 +95,38 @@
}
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
+ @GetMapping("/getwo")
+ public Result getwo() {
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(1, 3);
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�1鎴愬姛", data);
+ } catch (Exception e) {
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�1澶辫触", 1);
+ }
+ }
+ @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
+ @GetMapping("/getwo2")
+ public Result getwo2() {
+
+ try {
+ List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(4, 6);
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�2鎴愬姛", data);
+ } catch (Exception e) {
+ return Result.build(200, "鑾峰彇宸ヤ綅鏄剧ず鍥�2澶辫触", 1);
+
+ }
+ }
+
+ @ApiOperation(" 鍔熻兘锛氬宸ヤ綅杩涜銆愬惎鐢�/绂佺敤銆�")
+ @PostMapping("/updateDownWorkstation")
+ @ResponseBody
+ public Result updateDownWorkstation(@RequestBody DownWorkstation downWorkstation) {
+ boolean isSucess = downWorkstationService.updateDownWorkstationstate(downWorkstation);
+ return Result.build(200, "鏇存崲鎴愬姛", isSucess);
+ }
}
--
Gitblit v1.8.0