From afbddf62e45bce6fd9428cddec36382c75cee53a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 07 十二月 2023 08:38:09 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 178 +++++++++++++++++++++++++---------------------------------
1 files changed, 77 insertions(+), 101 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 c773316..25d72ac 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
@@ -1,30 +1,31 @@
package com.example.springboot.controller;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.logging.log4j.util.PropertySource.Comparator;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
import com.example.springboot.service.HomeService;
-import com.example.springboot.service.MultiFieldComparator;
+import com.example.springboot.service.JdbcConnections;
+import com.example.springboot.service.North_Glass_Buffer1Service;
+import com.example.springboot.service.OutSliceServive;
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 com.example.springboot.entity.Queue;
import org.springframework.web.bind.annotation.*;
-
@RestController
@RequestMapping("/home")
@@ -40,6 +41,15 @@
@Autowired
SpianMapper spianMapper;
+
+ @Autowired
+ OutSliceServive outSliceServive;
+
+ @Autowired
+ North_Glass_Buffer1Service north_Glass_Buffer1Service;
+
+ @Autowired
+ private JdbcConnections jdbcConnections;
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
@@ -62,18 +72,6 @@
map.put("list2", storageCagelist2);
map.put("list3", storageCagelist3);
map.put("list4", storageCagelist4);
- return Result.success(map);
- }
-
- // 鏌ヨ杩�/鍑虹墖浠诲姟
- @GetMapping("/loadinout")
- public Result selectinout(Integer types) {
- List<StorageCage> storageCageinout = homeMapper.selectinout(types);
- for (StorageCage storageCage : storageCageinout) {
- storageCage.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(storageCage.getGlassId()));
- }
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCageinout);
return Result.success(map);
}
@@ -142,11 +140,8 @@
// 鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
+ 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()));
- }
Map<String, Object> map = new HashMap<>();
map.put("cageinfo", cageinfo);
return Result.success(map);
@@ -165,21 +160,20 @@
// 鏍规嵁鐜荤拑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());
+ String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode());
+ int sequence=homeMapper.SelectMaxSquence();
+ homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(),
+ north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(),sequence,position);
+ map.put("message2", "200");
} else {
map.put("message2", "500");
}
-
return Result.success(map);
}
@@ -203,10 +197,12 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
+ public Result SelectGlassByGlassID(String glassid) throws SQLException {
+ Queue queue = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdQueue(glassid, "", "");
Map<String, Object> map = new HashMap<>();
- map.put("form", north_glass_buffer1s);
+ if (glassid != "") {
+ map.put("form", queue);
+ }
return Result.success(map);
}
@@ -221,38 +217,38 @@
// 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
@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);
}
// 鏌ヨ鐜荤拑淇℃伅
@PostMapping("/SelectGlass")
- public Result SelectGlass(String orderid) {
+ public Result SelectGlass(String orderid) throws SQLException {
Map<String, Object> map = new HashMap<>();
- List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
+ List<north_glass_buffer1> glass = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("", orderid, "");
map.put("glass", glass);
return Result.success(map);
}
// 鎵嬪姩娣诲姞鎵爜浣嶇幓鐠�
@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);
- //璋冪敤浼嶅瓨鍌ㄨ繃绋�
- spianMapper.selectAll(glassid);
+ homeMapper.InsertQueueGlassId(queue, id);
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(queue.getglassId());
map.put("message", "200");
}
return Result.success(map);
@@ -287,87 +283,67 @@
// 鏍规嵁閾濇id鑾峰彇瀵瑰簲鐜荤拑淇℃伅
@PostMapping("/SelectAluminumFrameInfoById")
- public Result SelectAluminumFrameInfoById(String FrameBarcode) {
- List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode);
- String flip=homeMapper.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()));
- }
+ public Result SelectAluminumFrameInfoById(String FrameBarcode) throws SQLException {
+ String flip = jdbcConnections.SelectFlipByFrameBarcode(FrameBarcode);
+ List<north_glass_buffer1> listAluminumFrame=north_Glass_Buffer1Service.SelectAluminumFrameInfoById(FrameBarcode);
Map<String, Object> map = new HashMap<>();
map.put("listAluminumFrame", listAluminumFrame);
map.put("flip", flip);
return Result.success(map);
}
-
-
// 鏌ヨ鍑虹墖闃熷垪鏁版嵁
@PostMapping("/SelectProductionqueue")
- public Result SelectProductionqueue() {
+ public Result SelectProductionqueue() throws SQLException {
List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
for (Out_slice out_slice : listoutslice) {
- out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(out_slice.getGlassId()));
+ out_slice
+ .setnorth_glass_buffer1s(jdbcConnections.SelectGlassByGlassIdOrderIdFrameId(out_slice.getGlassId(), "", ""));
out_slice.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
}
-
- //HashMap<String,List<Out_slice>> map=new HashMap<String,List<Out_slice>>();
- // HashMap map=new HashMap<>();
- // for (Out_slice out_slice : listoutslice) {
- // String key_=out_slice.getState()+"-";
- // if (map.get(key_)==null) {
- // List<Out_slice> lists=new ArrayList<Out_slice>();
- // lists.add(out_slice);
- // map.put(key_, lists);
- // }else{
- // List<Out_slice> lists=(List<Out_slice>)map.get(key_);
- // lists.add(out_slice);
- // map.put(key_,lists);
- // }
- // }
- // System.out.println(map);
-
- // List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
- // List<Out_slice> list=new ArrayList<Out_slice>();
- // for (Out_slice out_slice : listskey) {
- // if (list.isEmpty()) {
- // list.add(out_slice);
- // }else{
- // for (int i=0;i<list.size();i++) {
- // Out_slice out_slice2=list.get(i);
- // if(out_slice.getID()>out_slice2.getID()){
- // continue;
- // }else{
- // list.add(i,out_slice2);
- // }
- // }
- // }
- // }
- //Collections.sort(listoutslice,new MultiFieldComparator());
-
Map<String, Object> maps = new HashMap<>();
maps.put("listoutslice", listoutslice);
+ // Plchome.isAllowQueue=false;
return Result.success(maps);
+
}
// 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
@PostMapping("/DeleteProductionQueueGlass")
- public Result DeleteProductionQueueGlass(Short id) {
- homeMapper.DeleteProductionQueueGlass(id);
+ public Result DeleteProductionQueueGlass(String FrameNo) {
+ homeMapper.DeleteProductionQueueGlass(FrameNo);
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
}
- //
+ // 娣诲姞閾濇id瀵瑰簲鐜荤拑鍒板嚭鐗囬槦鍒�
@PostMapping("/AddOutSliceS")
- 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]);
+ public Result AddOutSliceS(@RequestBody String[][] AluminumFrames) throws SQLException {
+ outSliceServive.AddOutSliceS(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());
}
}
- System.out.println(AluminumFrames);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ // 淇敼鍑虹墖闃熷垪鐘舵�佷笌鍑虹墖闃熷垪璋冨簭
+ @PostMapping("/isConfirmStates")
+ public Result isConfirmStates(Boolean isConfirmStates) {
+ Plchome.isConfirm = isConfirmStates;
Map<String, Object> map = new HashMap<>();
map.put("message", "200");
return Result.success(map);
--
Gitblit v1.8.0