From 86eb351c3eda127933902c927623c043eeb7210b Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期三, 29 十一月 2023 11:00:47 +0800
Subject: [PATCH] 测试后修改地址，添加界面缺少的下发与读写功能
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 117 insertions(+), 10 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 04444d3..565ae8d 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,21 +1,27 @@
package com.example.springboot.controller;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
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 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.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;
+import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.Out_slice;
import org.springframework.web.bind.annotation.*;
@@ -62,6 +68,9 @@
@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);
@@ -110,11 +119,9 @@
homeMapper.UpdateTask(types);
StorageCage glass = homeMapper.SelectGlassInfo(glassid);
if (types == 0) {
- // spianMapper.UpdataAddCage1(glass.getGlassWidth(),glass.getCage(),glass.getCell());
homeMapper.UpdateCageTask1(glassid);
S7control.getinstance().WriteWord("DB105.14", (short) 0);
} else {
-
spianMapper.UpdataOutCage1(glass.getGlassWidth(), glass.getCage(), glass.getCell());
homeMapper.UpdateCageTask2(glassid);
S7control.getinstance().WriteWord("DB105.12", (short) 0);
@@ -136,6 +143,9 @@
@GetMapping("/SelectCageInfo")
public Result SelectCageInfo(short cage) {
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);
@@ -193,9 +203,9 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
public Result SelectGlassByGlassID(String glassid) {
- Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+ north_glass_buffer1 north_glass_buffer1s = homeMapper.SelectGlassByGlassID(glassid);
Map<String, Object> map = new HashMap<>();
- map.put("form", Glass);
+ map.put("form", north_glass_buffer1s);
return Result.success(map);
}
@@ -210,14 +220,15 @@
// 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
@PostMapping("/Inglassid")
- public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody north_glass_buffer1 north_glass_buffer1s) {
Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+ short result = homeMapper.SelectStorageByGlassId(north_glass_buffer1s.getbarcode());
if (result > 0) {
map.put("message", "300");
} else {
- homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getwidth(), cage, cell);
+ // homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
+ // spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage,
+ // cell);
}
return Result.success(map);
}
@@ -226,7 +237,7 @@
@PostMapping("/SelectGlass")
public Result SelectGlass(String orderid) {
Map<String, Object> map = new HashMap<>();
- List<Glass> glass = homeMapper.SelectGlass(orderid);
+ List<north_glass_buffer1> glass = homeMapper.SelectGlass(orderid);
map.put("glass", glass);
return Result.success(map);
}
@@ -240,6 +251,8 @@
map.put("message", "300");
} else {
homeMapper.InsertQueueGlassId(glassid, id);
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianMapper.selectAll(glassid);
map.put("message", "200");
}
return Result.success(map);
@@ -263,4 +276,98 @@
return Result.success(map);
}
+ // 鏌ヨ姝よ鍗曞湪鐞嗙墖绗奸噷鐨勭幓鐠冩暟
+ @PostMapping("/SelectGlassNo")
+ public Result SelectGlassNo(String orderid) {
+ Short count = homeMapper.SelectGlassNo(orderid);
+ Map<String, Object> map = new HashMap<>();
+ map.put("count", count);
+ return Result.success(map);
+ }
+
+ // 鏍规嵁閾濇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()));
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("listAluminumFrame", listAluminumFrame);
+ map.put("flip", flip);
+ return Result.success(map);
+ }
+
+ // 鏌ヨ鍑虹墖闃熷垪鏁版嵁
+ @PostMapping("/SelectProductionqueue")
+ public Result SelectProductionqueue() {
+ List<Out_slice> listoutslice = homeMapper.SelectProductionqueue();
+ for (Out_slice out_slice : listoutslice) {
+ out_slice.setnorth_glass_buffer1s(homeMapper.SelectBoxNo(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);
+ return Result.success(maps);
+ }
+
+ // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteProductionQueueGlass")
+ public Result DeleteProductionQueueGlass(Short id) {
+ homeMapper.DeleteProductionQueueGlass(id);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
+
+ //
+ @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]);
+ }
+ }
+ System.out.println(AluminumFrames);
+ Map<String, Object> map = new HashMap<>();
+ map.put("message", "200");
+ return Result.success(map);
+ }
}
--
Gitblit v1.8.0