From 67d83ac627910e213cda55b8702cb5d6ad79f435 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期三, 29 十一月 2023 08:48:52 +0800 Subject: [PATCH] 更新本地 --- springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 101 insertions(+), 15 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..9e66cf1 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,5 +1,6 @@ package com.example.springboot.controller; +import java.sql.SQLException; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -9,15 +10,17 @@ 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.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.*; + @RestController @RequestMapping("/home") @@ -34,6 +37,9 @@ @Autowired SpianMapper spianMapper; + @Autowired + private JdbcConnections jdbcConnections; + // 鏌ヨ鐞嗙墖绗间娇鐢ㄦ儏鍐� @GetMapping("/load") public Result selectAll() { @@ -60,8 +66,14 @@ // 鏌ヨ杩�/鍑虹墖浠诲姟 @GetMapping("/loadinout") - public Result selectinout(Integer types) { + 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); @@ -110,11 +122,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,8 +144,13 @@ // 鏌ヨ鐞嗙墖绗艰鎯� @GetMapping("/SelectCageInfo") - public Result SelectCageInfo(short cage) { + public Result SelectCageInfo(short 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); @@ -192,10 +207,16 @@ // 鏍规嵁鐜荤拑id鏌ヨ鐜荤拑淇℃伅 @GetMapping("/SelectGlassByGlassID") - public Result SelectGlassByGlassID(String glassid) { - Glass Glass = homeMapper.SelectGlassByGlassID(glassid); + 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, "", ""); Map<String, Object> map = new HashMap<>(); - map.put("form", Glass); + if(glassid!=""){ + + map.put("form", north_glass_buffer1s); + + } return Result.success(map); } @@ -210,23 +231,23 @@ // 鎵嬪姩寰�鐞嗙墖绗兼坊鍔犵幓鐠� @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); } // 鏌ヨ鐜荤拑淇℃伅 @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); } @@ -240,6 +261,8 @@ map.put("message", "300"); } else { homeMapper.InsertQueueGlassId(glassid, id); + //璋冪敤浼嶅瓨鍌ㄨ繃绋� + spianService.selectAll(glassid); map.put("message", "200"); } return Result.success(map); @@ -263,4 +286,67 @@ 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 { + + // List<north_glass_buffer1> listAluminumFrame = homeMapper.SelectAluminumFrameInfoById(FrameBarcode); + List<north_glass_buffer1> listAluminumFrame = jdbcConnections.SelectGlassByGlassIdOrderIdFrameIds("","",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() 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); + 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