From b6eb0edc58567aca4d303f4928389bf25fe025ba Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 29 十一月 2023 11:04:27 +0800
Subject: [PATCH] 电气后端逻辑修改
---
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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..0017925 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,7 +13,7 @@
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.MultiFieldComparator;
import com.example.springboot.service.SpianService;
import com.example.springboot.common.Result;
import com.example.springboot.component.S7control;
@@ -228,7 +228,7 @@
map.put("message", "300");
} else {
homeMapper.Inglassid(north_glass_buffer1s, cage, cell, tier);
- spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthMm(), cage, cell);
+ spianMapper.UpdataAddCage1(north_glass_buffer1s.getglasslengthmm(), cage, cell);
}
return Result.success(map);
}
@@ -291,8 +291,8 @@
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()));
+// 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);
@@ -313,15 +313,15 @@
//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()+"-";
+ // for (Out_slice Out_slice.java : listoutslice) {
+ // String key_=Out_slice.java.getState()+"-";
// if (map.get(key_)==null) {
// List<Out_slice> lists=new ArrayList<Out_slice>();
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_, lists);
// }else{
// List<Out_slice> lists=(List<Out_slice>)map.get(key_);
- // lists.add(out_slice);
+ // lists.add(Out_slice.java);
// map.put(key_,lists);
// }
// }
@@ -329,13 +329,13 @@
// List<Out_slice> listskey=(List<Out_slice>)map.get("1-");
// List<Out_slice> list=new ArrayList<Out_slice>();
- // for (Out_slice out_slice : listskey) {
+ // for (Out_slice Out_slice.java : listskey) {
// if (list.isEmpty()) {
- // list.add(out_slice);
+ // list.add(Out_slice.java);
// }else{
// for (int i=0;i<list.size();i++) {
// Out_slice out_slice2=list.get(i);
- // if(out_slice.getID()>out_slice2.getID()){
+ // if(Out_slice.java.getID()>out_slice2.getID()){
// continue;
// }else{
// list.add(i,out_slice2);
--
Gitblit v1.8.0