From 182d78dfd33a25e0648f2f566eab1f7e79a83e78 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期五, 27 十月 2023 16:28:10 +0800
Subject: [PATCH] 模块配置和参数翻译

---
 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java |   79 ++++++++++++++++++++++++++++-----------
 1 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index ed33db8..32f0c4a 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -13,6 +13,7 @@
 import com.example.springboot.common.Result;
 import com.example.springboot.component.S7control;
 import com.example.springboot.entity.CarPosition;
+import com.example.springboot.entity.Glass;
 import com.example.springboot.entity.StorageCage;
 import com.example.springboot.entity.alarmmg;
 
@@ -78,14 +79,14 @@
     }
 
     @GetMapping("/Addglassid")
-    public Result Addglassid(short glassid) {
+    public Result Addglassid(String glassid) {
         Map<String, Object> map = new HashMap<>();
-        short taskno = homeMapper.SelectOutTask();
+        short taskno = homeMapper.SelectInTask();
         if (taskno > 0) {
             map.put("message2", "500");
         } else {
             // 璋冪敤浼嶄笂鐗囧嚱鏁�
-            short results = spianService.selectAll(Short.toString(glassid));
+            short results = spianService.selectAll(glassid);
             if (results == 200) {
                 map.put("message2", "200");
             } else if (results == 300) {
@@ -98,19 +99,19 @@
     }
 
     @GetMapping("/UpdateTask")
-    public Result UpdateTask(Integer types, Integer shelfrack, Integer glassid) {
+    public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
         Map<String, Object> map = new HashMap<>();
         homeMapper.UpdateTask(types);
-        StorageCage glass=homeMapper.SelectGlassInfo(glassid);
+        StorageCage glass = homeMapper.SelectGlassInfo(glassid);
         if (types == 0) {
-            spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+            // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
             homeMapper.UpdateCageTask1(glassid);
-            S7control.getinstance().WriteWord("DB105.14",(short)0);
+            S7control.getinstance().WriteWord("DB105.14", (short) 0);
         } else {
-            
-            spianMapper.UpdataOutCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+
+            spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
             homeMapper.UpdateCageTask2(glassid);
-            S7control.getinstance().WriteWord("DB105.12",(short)0);
+            S7control.getinstance().WriteWord("DB105.12", (short) 0);
         }
         map.put("message3", "200");
         return Result.success(map);
@@ -133,10 +134,10 @@
     }
 
     @GetMapping("/DeleteByGlassID")
-    public Result DeleteByGlassID(short glassid) {
-        StorageCage glassinfor= homeMapper.SelectGlassInfo(Integer.valueOf(glassid));
-        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(),glassinfor.getCage(),glassinfor.getCell());
-        homeMapper.DeleteByGlassID(glassid);  
+    public Result DeleteByGlassID(String glassid) {
+        StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid);
+        spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell());
+        homeMapper.DeleteByGlassID(glassid);
         Map<String, Object> map = new HashMap<>();
         map.put("message3", "200");
         return Result.success(map);
@@ -146,14 +147,18 @@
     public Result OutByGlassID(String glassid) {
         Map<String, Object> map = new HashMap<>();
         // 璋冪敤浼嶄笂鐗囧嚱鏁�
-        Short results = spianService.selectout2(glassid);
-        if (results == 200) {
-            map.put("message2", "200");
-        } else if (results == 300) {
-            map.put("message2", "300");
-        } else if (results == 400) {
-            map.put("message2", "400");
+        short result = homeMapper.SelectStorageByGlassId(glassid);
+        if (result > 0) {
+            Short results = spianService.selectout2(glassid);
+            if (results == 200) {
+                map.put("message2", "200");
+            } else if (results == 300) {
+                map.put("message2", "300");
+            } 
+        }else{
+            map.put("message2", "500");
         }
+
         return Result.success(map);
     }
 
@@ -172,6 +177,34 @@
         map.put("password", pwdct);
         return Result.success(map);
     }
-    
-    
+
+    @GetMapping("/SelectGlassByGlassID")
+    public Result SelectGlassByGlassID(String glassid) {
+        Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+        Map<String, Object> map = new HashMap<>();
+        map.put("form", Glass);
+        return Result.success(map);
+    }
+
+    @GetMapping("/Disabled")
+    public Result Disabled(short cage, short cell, short disabled) {
+        homeMapper.Disabled(cage, cell, disabled);
+        Map<String, Object> map = new HashMap<>();
+        map.put("message", "200");
+        return Result.success(map);
+    }
+
+    @PostMapping("/Inglassid")
+    public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+        Map<String, Object> map = new HashMap<>();
+        short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+        if (result > 0) {
+            map.put("message", "300");
+        } else {
+            homeMapper.Inglassid(glass, cage, cell, tier);
+            spianMapper.UpdataAddCage1(glass.getWidth(), cage, cell);
+        }
+        return Result.success(map);
+    }
+
 }

--
Gitblit v1.8.0