From a4cc855f17c36f6ceda20100bc491bc6a0071c27 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 11 七月 2024 10:33:06 +0800
Subject: [PATCH] 下片:人工下片表字段改为其他 大理片:新增读取plc数据计时功能

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downworkstation/controller/DownWorkstationController.java |   44 +++++++++++++++++++++++++++-----------------
 1 files changed, 27 insertions(+), 17 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 eee88eb..ddf347d 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,6 +2,7 @@
 
 
 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 io.swagger.annotations.Api;
@@ -25,7 +26,7 @@
  */
 
 @RestController
-@Api(tags = "宸ヤ綅")
+@Api(description = "宸ヤ綅")
 @RequestMapping("/downWorkStation")
 public class DownWorkstationController {
 
@@ -37,7 +38,7 @@
     @GetMapping("/getone")
     public ResponseEntity<?> 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);
@@ -74,20 +75,13 @@
     }
 
 
-
-//缁戝畾鏋跺瓙
-@ApiOperation("缁戝畾鏋跺瓙")
+    //缁戝畾鏋跺瓙
+    @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 ResponseEntity<Map<String, Object>> updateFlowCardId(@RequestBody DownWorkRequest request) {
 
-        // 鏌ヨ瀵瑰簲 flowCardId 鐨勭幓鐠冧俊鎭�绘暟閲�
-        int glassInfoCount = glassInfoService.getGlassInfoCountByFlowCardId(flowCardId);
-
-        // 鏇存柊 down_workstation 琛ㄤ腑鐨勬�绘暟閲�
-        downWorkstationService.updateFlowCardIdAndCount(flowCardId, glassInfoCount, workstationId);
+        // 缁戝畾鏋跺瓙
+        downWorkstationService.updateFlowCardIdAndCount(request.getFlowCardId(),  request.getWorkstationId(), request.getLayer());
 
         // 鏋勫缓鍝嶅簲鏁版嵁
         Map<String, Object> responseData = new HashMap<>();
@@ -131,12 +125,12 @@
 
 
 
-    @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�")
+    @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�1")
     @GetMapping("/getwo")
     public ResponseEntity<Map<String, Object>> getwo() {
         Map<String, Object> responseData = new HashMap<>();
         try {
-            List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation();
+            List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(1,3);
             responseData.put("code", 200);
             responseData.put("msg", "鎴愬姛");
             responseData.put("data", data);
@@ -149,7 +143,23 @@
         }
     }
 
-
+    @ApiOperation("鑾峰彇宸ヤ綅鏄剧ず鍥�2")
+    @GetMapping("/getwo2")
+    public ResponseEntity<Map<String, Object>> getw2o() {
+        Map<String, Object> responseData = new HashMap<>();
+        try {
+            List<Map<String, Object>> data = downWorkstationService.getTotalGlassDimensionsByWorkstation(4,6);
+            responseData.put("code", 200);
+            responseData.put("msg", "鎴愬姛");
+            responseData.put("data", data);
+            return ResponseEntity.ok(responseData);
+        } catch (Exception e) {
+            responseData.put("code", 500);
+            responseData.put("msg", "澶辫触");
+            responseData.put("data", null);
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseData);
+        }
+    }
 
 
 

--
Gitblit v1.8.0