From 1479f77b88e355ce2c7c073458d919c8e06baa18 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:10:11 +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 | 157 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 121 insertions(+), 36 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..90285e6 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,29 @@
package com.example.springboot.controller;
+import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
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.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.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 com.example.springboot.entity.Queue;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +41,15 @@
@Autowired
SpianMapper spianMapper;
+
+ @Autowired
+ OutSliceServive outSliceServive;
+
+ @Autowired
+ North_Glass_Buffer1Service north_Glass_Buffer1Service;
+
+ @Autowired
+ private JdbcConnections jdbcConnections;
// 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐�
@GetMapping("/load")
@@ -55,15 +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);
- Map<String, Object> map = new HashMap<>();
- map.put("list", storageCageinout);
return Result.success(map);
}
@@ -110,11 +118,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);
@@ -134,7 +140,7 @@
// 鏌ヨ鐞嗙墖绗艰鎯�
@GetMapping("/SelectCageInfo")
- public Result SelectCageInfo(short cage) {
+ public Result SelectCageInfo(String cage) throws SQLException {
List<StorageCage> cageinfo = homeMapper.SelectCageInfo(cage);
Map<String, Object> map = new HashMap<>();
map.put("cageinfo", cageinfo);
@@ -154,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);
}
@@ -192,10 +197,12 @@
// 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅
@GetMapping("/SelectGlassByGlassID")
- public Result SelectGlassByGlassID(String glassid) {
- Glass Glass = homeMapper.SelectGlassByGlassID(glassid);
+ public Result SelectGlassByGlassID(String glassid) throws SQLException {
+ Queue queue = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIdQueue(glassid, "", "");
Map<String, Object> map = new HashMap<>();
- map.put("form", Glass);
+ if (glassid != "") {
+ map.put("form", queue);
+ }
return Result.success(map);
}
@@ -210,36 +217,38 @@
// 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠�
@PostMapping("/Inglassid")
- public Result Inglassid(short cage, short cell, short tier, @RequestBody Glass glass) {
+ public Result Inglassid(short cage, short cell, short tier, @RequestBody Queue queue) {
Map<String, Object> map = new HashMap<>();
- short result = homeMapper.SelectStorageByGlassId(glass.getGlassId());
+ short result = homeMapper.SelectStorageByGlassId(queue.getglassId());
if (result > 0) {
map.put("message", "300");
} else {
- homeMapper.Inglassid(glass, cage, cell, tier);
- spianMapper.UpdataAddCage1(glass.getwidth(), 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<Glass> 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);
+ homeMapper.InsertQueueGlassId(queue, id);
+ // 璋冪敤浼嶅瓨鍌ㄨ繃绋�
+ spianService.selectAll(queue.getglassId());
map.put("message", "200");
}
return Result.success(map);
@@ -263,4 +272,80 @@
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) 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() 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.setstorageCage(homeMapper.SelectStorageGlassById(out_slice.getGlassId()));
+ }
+ Map<String, Object> maps = new HashMap<>();
+ maps.put("listoutslice", listoutslice);
+ // Plchome.isAllowQueue=false;
+ return Result.success(maps);
+
+ }
+
+ // 鏍规嵁鐜荤拑id鍒犻櫎鍑虹墖闃熷垪鐜荤拑
+ @PostMapping("/DeleteProductionQueueGlass")
+ 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) {
+ 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());
+ }
+ }
+ 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