springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,25 +17,25 @@ // System.out.println("启动完成"); new PlcHold().start(); // new PlcHold().start(); new Plchome().start(); new Plcalarm().start(); // new Plcalarm().start(); new Plcsign().start(); // new Plcsign().start(); new Plcstate().start(); new PlcPositioning1().start(); // new Plcstate().start(); // new PlcPositioning1().start(); new PlcParameter2().start(); // new PlcParameter2().start(); new PLCAutomaticParameterSetting().start(); // new PLCAutomaticParameterSetting().start(); new PlcManualonePosition().start(); new PlcManualonePosition2().start(); new PlcServoManualone().start(); new PLCManualJog().start(); // new PlcManualonePosition().start(); // new PlcManualonePosition2().start(); // new PlcServoManualone().start(); // new PLCManualJog().start(); } } springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -22,6 +22,7 @@ import com.example.springboot.service.OutSliceServive; import com.example.springboot.service.PermissionService; import com.example.springboot.service.SpianService; import com.example.springboot.service.StorageCageService; import cn.hutool.core.util.StrUtil; @@ -47,22 +48,23 @@ @RequestMapping("/home") public class HomeController { @Autowired static HomeMapper homeMapper; @Autowired HomeService storageRackService; @Autowired static SpianService spianService; @Autowired SpianMapper spianMapper; @Autowired static OutSliceServive outSliceServive; @Autowired StorageCageService storageCageService; @Autowired North_Glass_Buffer1Service north_Glass_Buffer1Service; @@ -82,6 +84,8 @@ // 查询理片笼使用情况 @GetMapping("/load") public Result selectAll() { // storageCageService.EndTask(1); // UpdateTask(2,0,"X12345610402GV"); List<StorageCage> storageCagelist = homeMapper.selectAll(); Map<String, Object> map = new HashMap<>(); map.put("list", storageCagelist); @@ -142,44 +146,18 @@ // 手动完成进/出片任务 终止进片/出片任务 @GetMapping("/UpdateTask") public static Result UpdateTask(Integer types, Integer shelfrack, String glassid) { public Result UpdateTask(Integer types, Integer shelfrack, String glassid) { storageCageService.UpdateTask(types, shelfrack, glassid); Map<String, Object> map = new HashMap<>(); if (types == 0) {// 完成进片 spianService.overtask(glassid); } else if (types == 1) {// 完成出片 spianService.overtask(glassid); } else if (types == 2) {// 终止进片任务 outSliceServive.StopTask(glassid, 0); // 发送终止进片任务信号 } else {// 终止出片任务 outSliceServive.StopTask(glassid, 1); } map.put("message3", "200"); return Result.success(map); } //终止进片/出片任务 @GetMapping("/EndTask") public static Result EndTask(int types) { if (types == 0) {// 终止进片任务 List<StorageTask> cageList = homeMapper.SelectTaskByState(types); for (StorageTask storageTask : cageList) { outSliceServive.StopTask(storageTask.getGlassId(), types); } // 发送终止进片任务信号 } else {// 终止出片任务 List<StorageCage> storageCages =homeMapper.selectinout(types); for (StorageCage storageCage : storageCages) { List<StorageCage> storageCagess=homeMapper.SelectStoragesGlassById(storageCage.getGlassId()); for (StorageCage storageCagez : storageCagess) { if (storageCagez.getState().equals("2")) {//调拨进片 outSliceServive.StopTask(storageCagez.getGlassId(), 0); }else{//出片 outSliceServive.StopTask(storageCagez.getGlassId(), types); } } } } public Result EndTask(int types) { storageCageService.EndTask(types); Map<String, Object> map = new HashMap<>(); map.put("message3", "200"); return Result.success(map); @@ -206,7 +184,7 @@ // 手动删除理片笼玻璃 @GetMapping("/DeleteByGlassID") public Result DeleteByGlassID(String glassid) { outSliceServive.DeleteByGlassID(glassid); outSliceServive.DeleteByGlassIDs(glassid); Map<String, Object> map = new HashMap<>(); map.put("message3", "200"); return Result.success(map); @@ -215,6 +193,7 @@ // 根据玻璃id手动出片 @GetMapping("/OutByGlassID") public Result OutByGlassID(String glassid) throws SQLException { Map<String, Object> map = new HashMap<>(); Out_slice result = homeMapper.SelectQueueByglassid(glassid); if (result == null) { @@ -224,7 +203,6 @@ String position = jdbcConnections.SelectPositionByFrameBarcode(north_glass_buffer1.getFrameBarcode()); if (position != null) { int sequence = homeMapper.SelectMaxSquence(); homeMapper.AddOutSliceS(glassid, flip, north_glass_buffer1.getFrameBarcode(), north_glass_buffer1.getglasslengthmm().toString(), north_glass_buffer1.getglassheightmm().toString(), sequence, position, (short) 0, north_glass_buffer1.getordernumber(), north_glass_buffer1.getlistnumber(), @@ -238,7 +216,6 @@ } else { map.put("message2", "400"); } } else { map.put("message2", "500"); } springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -72,7 +72,7 @@ List<StorageCage> SelectCageInfo(String cage); // 手动完成出片任务修改笼子数据 @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null where glass_id=#{glassid}") @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,glasswidthmm=null,glassheightmm=null,listid=null,boxid=null,FrameBarcode=null where glass_id=#{glassid}") void DeleteByGlassID(String glassid); //查询小车位置 springboot-vue3/src/main/java/com/example/springboot/service/OutSliceServive.java
@@ -74,16 +74,19 @@ public void StopTask(String glassid, int i) { if (i == 0) {// 进片终止 spianService.overtask(glassid); DeleteByGlassID(glassid); DeleteByGlassIDs(glassid); homeMapper.UpdateOutSliceGlass(glassid); } else {// 出片终止 spianMapper.UpdatetaskOut(glassid);//完成出片任务 spianMapper.UpdataGlassCage(glassid, 0);// 清除出片格子玻璃信息 spianMapper.UpdateCageOver(glassid, 0);// 更改笼子表出片状态 homeMapper.UpdateOutSliceGlass(glassid);//修改出片队列此玻璃状态为缺失 } } //删除笼内玻璃还原宽度 public void DeleteByGlassID(String glassid) { public void DeleteByGlassIDs(String glassid) { StorageCage glassinfor = homeMapper.SelectGlassInfo(glassid); spianMapper.UpdataOutCage1(glassinfor.getGlassWidth(), glassinfor.getCage(), glassinfor.getCell()); homeMapper.DeleteByGlassID(glassid); springboot-vue3/src/main/java/com/example/springboot/service/StorageCageService.java
New file @@ -0,0 +1,58 @@ package com.example.springboot.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.example.springboot.entity.StorageCage; import com.example.springboot.entity.StorageTask; import com.example.springboot.mapper.HomeMapper; @Service public class StorageCageService { @Autowired private HomeMapper homeMapper; @Autowired private OutSliceServive outSliceServive; @Autowired private SpianService spianService; public void EndTask(int types) { if (types == 0) {// 终止进片任务 List<StorageTask> cageList = homeMapper.SelectTaskByState(types); for (StorageTask storageTask : cageList) { outSliceServive.StopTask(storageTask.getGlassId(), types); } // 发送终止进片任务信号 } else {// 终止出片任务 List<StorageCage> storageCages = homeMapper.selectinout(3); for (StorageCage storageCage : storageCages) { List<StorageCage> storageCagess = homeMapper.SelectStoragesGlassById(storageCage.getGlassId()); for (StorageCage storageCagez : storageCagess) { if (storageCagez.getState().equals("2")) {// 调拨进片 outSliceServive.StopTask(storageCagez.getGlassId(), 0); } else {// 出片 outSliceServive.StopTask(storageCagez.getGlassId(), types); } } } } } public void UpdateTask(Integer types, Integer shelfrack, String glassid) { if (types == 0) {// 完成进片 spianService.overtask(glassid); } else if (types == 1) {// 完成出片 spianService.overtask(glassid); } else if (types == 2) {// 终止进片任务 outSliceServive.StopTask(glassid, 0); // 发送终止进片任务信号 } else {// 终止出片任务 outSliceServive.StopTask(glassid, 1); } } }
