From a5ba96bea69ffca37f985c9503c654bf79cf9ef8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 30 十一月 2023 16:57:37 +0800
Subject: [PATCH] 完善主界面，添加笼子表分页与根据玻璃id查询
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 113 +++++++++++++++++++++++++-------------------------------
1 files changed, 51 insertions(+), 62 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 9e66cf1..99f4c1c 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,14 +13,16 @@
import com.example.springboot.service.JdbcConnections;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
+import com.example.springboot.component.Plchome;
import com.example.springboot.component.S7control;
import com.example.springboot.entity.CarPosition;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
import com.example.springboot.entity.Out_slice;
-import org.springframework.web.bind.annotation.*;
+import com.example.springboot.entity.Queue;
+import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/home")
@@ -39,7 +41,7 @@
@Autowired
private JdbcConnections jdbcConnections;
-
+
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
public Result selectAll() {
@@ -61,21 +63,6 @@
map.put("list2", storageCagelist2);
map.put("list3", storageCagelist3);
map.put("list4", storageCagelist4);
- return Result.success(map);
- }
-
- // 鏌ヨ杩�/鍑虹墖浠诲姟
- @GetMapping("/loadinout")
- public Result selectinout(Integer types) throws SQLException{
- List<StorageCage> storageCageinout = homeMapper.selectinout(types);
-
- for (StorageCage storageCage : storageCageinout) {
- storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
- // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- }
-
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCageinout);
return Result.success(map);
}
@@ -144,13 +131,8 @@
// 鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) throws SQLException {
+ public Result SelectCageInfo(String cage) throws SQLException {
List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
- for (StorageCage storageCage : cageinfo) {
- // storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- storageCage.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(storageCage.getGlassId(), "", ""));
-
- }
Map<String, Object> map = new HashMap<>();
map.put("cageinfo", cageinfo);
return Result.success(map);
@@ -169,21 +151,18 @@
// 鏍规嵁鐜荤拑id鎵嬪姩鍑虹墖
@GetMapping("/OutByGlassID")
- public Result OutByGlassID(String glassid) {
+ public Result OutByGlassID(String glassid) throws SQLException {
Map<String, Object> map = new HashMap<>();
- // 璋冪敤浼嶄笂鐗囧嚱鏁�
- 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");
- }
+ Out_slice result = homeMapper.SelectQueueByglassid(glassid);
+ if (result == null) {
+ north_glass_buffer1 north_glass_buffer1 = jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ String flip = jdbcConnections.SelectFlipByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
+ north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString());
+ map.put("message2", "200");
} else {
map.put("message2", "500");
}
-
return Result.success(map);
}
@@ -208,14 +187,10 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
public Result SelectGlassByGlassID(String glassid) throws SQLException {
- // north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
-
- north_glass_buffer1 north_glass_buffer1s=jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(glassid, "", "");
+ Queue queue = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdQueue(glassid, "", "");
Map<String, Object> map = new HashMap<>();
- if(glassid!=""){
-
- map.put("form", north_glass_buffer1s);
-
+ if (glassid != "") {
+ map.put("form", queue);
}
return Result.success(map);
}
@@ -231,14 +206,14 @@
// 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
@PostMapping("/Inglassid")
- public Result Inglassid(short cage, short cell, short tier, @RequestBody north_glass_buffer1 north_glass_buffer1s) {
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody Queue queue) {
Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(north_glass_buffer1s.getbarcode());
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
if (result > 0) {
map.put("message", "300");
} else {
- homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
- spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthmm(), cage, cell);
+ homeMapper.Inglassid(queue, cage, cell, tier);
+ spianMapper.UpdataAddCage1(queue.getglasswidth(), cage, cell);
}
return Result.success(map);
}
@@ -254,15 +229,15 @@
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@PostMapping("/InsertQueueGlassId")
- public Result InsertQueueGlassId(String glassid, Short id) {
+ public Result InsertQueueGlassId(Short id, @RequestBody Queue queue) {
Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glassid);
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
if (result > 0) {
map.put("message", "300");
} else {
- homeMapper.InsertQueueGlassId(glassid, id);
- //璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianService.selectAll(glassid);
+ homeMapper.InsertQueueGlassId(queue, id);
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(queue.getglassId());
map.put("message", "200");
}
return Result.success(map);
@@ -298,10 +273,8 @@
// 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
@PostMapping("/SelectAluminumFrameInfoById")
public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
-
- // List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
- List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("","",FrameBarcode);
- String flip=homeMapper.SelectFlipByFrameBarcode(FrameBarcode);
+ List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdss(FrameBarcode);
+ String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
for (north_glass_buffer1 north_glass_buffer1 : listAluminumFrame) {
north_glass_buffer1.setstorageCage(homeMapper.SelectStorageGlassById(north_glass_buffer1.getbarcode()));
north_glass_buffer1.setOut_slice(homeMapper.SelectQueueByglassid(north_glass_buffer1.getbarcode()));
@@ -311,20 +284,21 @@
map.put("flip", flip);
return Result.success(map);
}
-
-
// 鏌ヨ鍑虹墖闃熷垪鏁版嵁
@PostMapping("/SelectProductionqueue")
public Result SelectProductionqueue() throws SQLException {
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
for (Out_slice out_slice : listoutslice) {
- out_slice.setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
+ out_slice
+ .setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
Map<String, Object> maps = new HashMap<>();
maps.put("listoutslice", listoutslice);
+ // Plchome.isAllowQueue=false;
return Result.success(maps);
+
}
// 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@@ -336,15 +310,30 @@
return Result.success(map);
}
- //
+ // 娣诲姞鍑虹墖
@PostMapping("/AddOutSliceS")
- public Result AddOutSliceS(@RequestBody String[][] AluminumFrames ) {
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) {
for (String[] item : AluminumFrames) {
- if(item[1]=="true"){
- homeMapper.AddOutSliceS(item[0],item[2],item[3],item[4],item[5]);
+ if (item[1] == "true") {
+ homeMapper.AddOutSliceS(item[0], item[2], item[3], item[4], item[5]);
}
}
- System.out.println(AluminumFrames);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ @PostMapping("/isAllowQueues")
+ public Result isAllowQueues(Boolean isAllowQueue, @RequestBody List<Out_slice> out_slice) {
+
+ Plchome.isAllowQueue = isAllowQueue;
+ if (isAllowQueue == true) {
+ for (Out_slice out_slice2 : out_slice) {
+ homeMapper.UpdateOutSliceSequence(out_slice2.getGlassId(),out_slice2.getSequence());
+ }
+ }
+
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
--
Gitblit v1.8.0