From 3472c98ae1f560d0e326cab0994fe755aeb89d8f Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 30 十月 2023 11:04:20 +0800
Subject: [PATCH] 显示扫码位，上片位当前玻璃信息，添加确认扫码位玻璃功能
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 137 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 116 insertions(+), 21 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 5970b54..5f6f1f4 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
@@ -7,9 +7,13 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.example.springboot.mapper.HomeMapper;
+import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
import com.example.springboot.service.SpianService;
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;
@@ -27,6 +31,10 @@
@Autowired
SpianService spianService;
+ @Autowired
+ SpianMapper spianMapper;
+
+ //鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
public Result selectAll() {
List<StorageCage> storageCagelist = homeMapper.selectAll();
@@ -34,7 +42,7 @@
map.put("list", storageCagelist);
return Result.success(map);
}
-
+ //鏌ヨ鐞嗙墖绗肩幓鐠冩儏鍐�
@GetMapping("/loads")
public Result selectRack() {
List<StorageCage> storageCagelist1 = homeMapper.selectRack1();
@@ -48,7 +56,7 @@
map.put("list4", storageCagelist4);
return Result.success(map);
}
-
+ //鏌ヨ杩�/鍑虹墖浠诲姟
@GetMapping("/loadinout")
public Result selectinout(Integer types) {
List<StorageCage> storageCageinout = homeMapper.selectinout(types);
@@ -56,7 +64,7 @@
map.put("list", storageCageinout);
return Result.success(map);
}
-
+ //鎸夎鍗曞嚭鐗�
@GetMapping("/InsertOrder")
public Result InsertOrder(String orderid) {
short result = homeMapper.SelectOrder(orderid);
@@ -70,34 +78,46 @@
}
return Result.success(map);
}
-
+ //鏍规嵁鐜荤拑id鎵嬪姩涓婄墖
@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 {
- map.put("message2", "200");
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- spianService.selectAll(glassid);
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
}
return Result.success(map);
}
-
+ //鎵嬪姩瀹屾垚杩�/鍑虹墖浠诲姟
@GetMapping("/UpdateTask")
- public Result UpdateTask(Integer types, Integer shelfrack) {
+ public Result UpdateTask(Integer types, Integer shelfrack, String glassid) {
Map<String, Object> map = new HashMap<>();
- homeMapper.UpdateTask(types, shelfrack);
+ homeMapper.UpdateTask(types);
+ StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack);
+ // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
+ homeMapper.UpdateCageTask1(glassid);
+ S7control.getinstance().WriteWord("DB105.14", (short) 0);
} else {
- homeMapper.UpdateCageTask2(shelfrack);
+
+ spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
+ homeMapper.UpdateCageTask2(glassid);
+ S7control.getinstance().WriteWord("DB105.12", (short) 0);
}
map.put("message3", "200");
return Result.success(map);
}
-
+ //鏌ヨ鎶ヨ淇℃伅
@GetMapping("/SelectAlarmmgInfo")
public Result SelectAlarmmgInfo() {
List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
@@ -105,7 +125,7 @@
map.put("alarmmg", alarmmg);
return Result.success(map);
}
-
+ //鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
public Result SelectCageInfo(short cage) {
List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
@@ -113,22 +133,97 @@
map.put("cageinfo", cageinfo);
return Result.success(map);
}
-
+ //鎵嬪姩鍒犻櫎鐞嗙墖绗肩幓鐠�
@GetMapping("/DeleteByGlassID")
- public Result DeleteByGlassID(short 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);
}
-
+ //鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) {
- spianService.selectout2(glassid);
-
Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ 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);
+ }
+ //鍔犺浇灏忚溅浣嶇疆
+ @GetMapping("/Loadcarlist")
+ public Result Loadcarlist() {
+ List<CarPosition> carlist = homeMapper.Loadcarlist();
+ Map<String, Object> map = new HashMap<>();
+ map.put("carlist", carlist);
+ return Result.success(map);
+ }
+ //鏌ヨ纭瀵嗙爜
+ @GetMapping("/SelectPassword")
+ public Result SelectPassword() {
+ String pwdct = homeMapper.SelectPassword();
+ Map<String, Object> map = new HashMap<>();
+ map.put("password", pwdct);
+ return Result.success(map);
+ }
+ //鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
+ @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);
}
+ //鏌ヨ鐜荤拑淇℃伅
+ @PostMapping("/SelectGlass")
+ public Result SelectGlass(String orderid) {
+ Map<String, Object> map = new HashMap<>();
+ List<Glass> glass=homeMapper.SelectGlass(orderid);
+ map.put("glass", glass);
+ return Result.success(map);
+ }
+
+ //鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
+ @PostMapping("/InsertQueueGlassId")
+ public Result InsertQueueGlassId(String glassid) {
+ homeMapper.InsertQueueGlassId(glassid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
}
--
Gitblit v1.8.0