CanadaMes-ui/src/api/home.js
@@ -138,4 +138,12 @@ method: 'post', data: "" }) } export function UpdateQueueState() { return request({ url: '/home/UpdateQueueState', method: 'post', data: "" }) } CanadaMes-ui/src/views/home/index.vue
@@ -338,12 +338,12 @@ <el-form :model="form" label-width="100px" style="padding-right: 30px"> <el-form-item style="text-align: center;"> <el-input style="width:15%;" :placeholder="$t('Enter the glass lD')" v-model="glassid1"></el-input> <el-button type="primary" @click="SelectGlassByGlassIDs()">{{ $t('Query') }}</el-button> <el-button type="primary" @click="SelectGlassByGlassIDs()" :disabled="disabled">{{ $t('Query') }}</el-button> </el-form-item> <div style="display: flex;justify-content: space-around;height: 40px;"> <label for="">{{ $t('Scan Code Point') }}</label> <label for="">{{ $t('Upper film position') }}</label> <label for="">{{ $t('Glass Information') }}</label> </div> <div style="display: flex;justify-content: space-around;"> <el-form-item :label="$t('Barcodid')"> @@ -351,9 +351,6 @@ </el-form-item> <el-form-item :label="$t('Barcodid')"> <el-input v-model="form3.glassId" readonly autocomplete="off" /> </el-form-item> <el-form-item :label="$t('Barcodid')"> <el-input v-model="form4.glassId" readonly autocomplete="off" /> </el-form-item> </div> <div style="display: flex;justify-content: space-around;"> @@ -363,9 +360,6 @@ <el-form-item :label="$t('order')"> <el-input v-model="form3.orderId" readonly autocomplete="off" /> </el-form-item> <el-form-item :label="$t('order')"> <el-input v-model="form4.orderId" readonly autocomplete="off" /> </el-form-item> </div> <div style="display: flex;justify-content: space-around;"> <el-form-item :label="$t('length')"> @@ -373,9 +367,6 @@ </el-form-item> <el-form-item :label="$t('length')"> <el-input v-model="form3.height" readonly autocomplete="off" /> </el-form-item> <el-form-item :label="$t('length')"> <el-input v-model="form4.height" readonly autocomplete="off" /> </el-form-item> </div> <div style="display: flex;justify-content: space-around;"> @@ -385,17 +376,12 @@ <el-form-item :label="$t('width')"> <el-input v-model="form3.width" readonly autocomplete="off" /> </el-form-item> <el-form-item :label="$t('width')"> <el-input v-model="form4.width" readonly autocomplete="off" /> </el-form-item> </div> </el-form> <template #footer> <span class="dialog-footer"> <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm') }}</el-button> <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled">{{ $t('confirm') <el-button @click="InsertQueueGlass()" type="primary" :disabled="disabled1">{{ $t('confirm') }}</el-button> <el-button @click="cancel3()">{{ $t('cancel') }}</el-button> </span> @@ -494,7 +480,7 @@ //:disabled="scope.row.glassId > 0 || scope.row.disabled == 1 ? true : false" import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo, SelectCageInfo, DeleteByGlassID, OutByGlassID, Loadcarlist, SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId SelectPassword, SelectGlassByGlassID, Disabled, Inglassid, SelectGlass, InsertQueueGlassId, UpdateQueueState } from "../../api/home"; @@ -528,18 +514,12 @@ number: 800, }, form2: { orderId: "1145", glassId: "112", height: "59.06", width: "48.03" orderId: "", glassId: "", height: "", width: "" }, form3: { orderId: "1", glassId: "2", height: "3", width: "4" }, form4: { orderId: "", glassId: "", height: "", @@ -576,7 +556,8 @@ disabled1: true, currentPage: 1, //默认初始页 pagesize: 15, //每页默认显示的数据 pageCount: 0 pageCount: 0, state: true }; }, created() { @@ -621,16 +602,32 @@ this.tasklist2 = obj.tasklist2[0]; this.alarm = obj.alarmmg[0]; this.loadglassheight = obj.loadglassheight; this.zhuangtai = obj.zhuangtai[0]; this.glassid1 = obj.queid[0]; if (this.glassid1 != "") { this.disabled1=false; this.showform3(); if (obj.zhuangtai != null) { this.zhuangtai = obj.zhuangtai[0]; } this.form2 = obj.form2; this.form2 = obj.form3; // this.glassid1 = obj.queid[0]; if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 0) { this.state = false; this.disabled = true; this.disabled1 = false; this.showform3(); } else if (obj.queid[0] != "" && obj.queid[0] != null && obj.state[0] == 1) { this.state = true; this.disabled = true; this.disabled1 = true; } else { this.state = true; this.disabled = false; this.disabled1 = false; } if (obj.form2 != null && obj.form2 != "") { this.form2 = obj.form2[0]; } if (obj.form3 != null && obj.form3 != "") { this.form3 = obj.form3[0]; } //if (obj.dbconnected == "false") { this.text = this.$t('DataBase Connection failed'); // } @@ -777,7 +774,7 @@ } }, //显示扫码位和上片位 showform3(){ showform3() { this.dialogFormVisible5 = true; }, //获取扫码位和上片位数据 @@ -785,16 +782,19 @@ this.showform3(); SelectGlassByGlassID(this.glassid1).then(res => { if (res.data.form != null) { this.form4 = res.data.form; this.form2 = res.data.form; this.$message.success(this.$t('query was successful')); } else { this.$message.error(this.$t('There is no such glass')); } if (this.form2.glassId == "") { this.disabled = false; } else { this.disabled = true; if (this.form2.length > 0) { if (this.form2.glassId == "") { this.disabled = false; } else { this.disabled = true; } } }); }, selectglassinfo() { @@ -988,12 +988,22 @@ handleCurrentChange: function (currentPage) { this.currentPage = currentPage; }, //手动添加扫码位玻璃 InsertQueueGlass() { InsertQueueGlassId(this.glassid1).then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); } }); if (this.state == true) { InsertQueueGlassId(this.form2.glassId).then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); } }); } else { UpdateQueueState().then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); } }); } } } } springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -56,21 +56,32 @@ // 查询报警信息 List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo(); jsonObject.append("alarmmg", alarmmg); // 读去Plc进片车与出片车位置W List<String> addressList = new ArrayList<String>(); addressList.add("DB106.12"); addressList.add("DB106.0"); List<Short> paramlist = S7control.getinstance().ReadWord(addressList); // 获取进片车状态 List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 获取进片车状态 boolean exist1 = datas1ListState.contains((short) 0); jsonObject.append("zhuangtai", exist1); // // 读去Plc进片车与出片车位置W // List<String> addressList = new ArrayList<String>(); // addressList.add("DB106.12"); // addressList.add("DB106.0"); // List<Short> paramlist = S7control.getinstance().ReadWord(addressList); // if (paramlist != null) { // jsonObject.append("params", paramlist); // } // // 获取进片车状态 // List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8", 1);// 获取进片车状态 // boolean exist1 = datas1ListState.contains((short) 0); // jsonObject.append("zhuangtai", exist1); //获取进片玻璃信息 // List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1); // if (inglassInfo != null) { // if (inglassInfo.size() > 0) // jsonObject.append("loadglassheight", inglassInfo.get(0) * 70); // } // 伍 获取进是否有待确认的玻璃id String queid = spianMapper.Selectqueueid(); String state = spianMapper.Selectqueuestate(); jsonObject.append("queid", queid); jsonObject.append("state", state); // 获取扫码位与上片位玻璃信息 List<Glass> form2 = homeMapper.GetQueueInfo(1); List<Glass> form3 = homeMapper.GetQueueInfo(2); Glass form2 = homeMapper.GetQueueInfo(1); Glass form3 = homeMapper.GetQueueInfo(2); jsonObject.append("form2", form2); jsonObject.append("form3", form3); // List<Short> paramlists = new ArrayList<Short>(); @@ -80,14 +91,7 @@ // paramlists.add(para2); // System.out.println(paramlists); if (paramlist != null) { jsonObject.append("params", paramlist); } List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1); if (inglassInfo != null) { if (inglassInfo.size() > 0) jsonObject.append("loadglassheight", inglassInfo.get(0) * 70); } dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class); boolean dbconnected = false; try { springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -25,18 +25,18 @@ // System.out.println("启动完成"); new PlcHold().start(); // new PlcHold().start(); // new Plcaction().start(); new Plchome().start(); new PlcParameter().start(); // new PlcParameter().start(); new Plcalarm().start(); // new Plcalarm().start(); new Plcsign().start(); // new Plcsign().start(); new Plcstate().start(); // new Plcstate().start(); } } springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -226,4 +226,13 @@ return Result.success(map); } //手动添加扫码位玻璃 @PostMapping("/UpdateQueueState") public Result UpdateQueueState() { homeMapper.UpdateQueueState(); Map<String, Object> map = new HashMap<>(); map.put("message", "200"); return Result.success(map); } } springboot-vue3/src/main/java/com/example/springboot/entity/Glass.java
@@ -2,9 +2,9 @@ public class Glass{ private Integer id; private Short orderId; private double glassWidth; private double glassHeight; private String orderId; private double width; private double height; private String glassId; @@ -19,28 +19,28 @@ return id; } public Short getOrderId() { public String getOrderId() { return orderId; } public void setOrderId(Short orderId) { public void setOrderId(String orderId) { this.orderId = orderId; } public double getWidth() { return glassWidth; public double getwidth() { return width; } public void setHeight(double glassHeight) { this.glassHeight = glassHeight; public void setHeight(double height) { this.height = height; } public double getHeight() { return glassHeight; return height; } public void setWidth(double glassWidth) { this.glassWidth = glassWidth; public void setWidth(double width) { this.width = width; } public String getGlassId() { springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -106,15 +106,18 @@ //查询理片笼中是否有此玻璃 @Select("select count(*) from storage_cage where glass_id=#{glassId}") short SelectStorageByGlassId(String glassId); //根据订单查询玻璃信息 @Select("select * from glass where position(#{orderid} in orderid)") List<Glass> SelectGlass(String orderid); @Select("select * from queue qe inner join glass gl on qe.glassid=gl.glassid where id=#{id}") List<Glass> GetQueueInfo(int id); @Select("update queue set glassid=#{glassid},state=0,time=now() where id=1") //获取上片队列信息 @Select("select gl.* from queue qe inner join glass gl on qe.glassid=gl.glassid where qe.id=#{id}") Glass GetQueueInfo(int id); //手动添加扫码位玻璃 @Select("update queue set glassid=#{glassid},state=0 where id=1") void InsertQueueGlassId(String glassid); //手动添加扫码位玻璃 @Select("update queue set state=1 where id=1") void UpdateQueueState(); } springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -103,8 +103,11 @@ //根据笼子格子层数获取玻璃id @Select("SELECT COUNT(*) FROM `storage_cage` where state=3;") Integer Selectoutstate(); //获取进片队列id @Select("select glassid from queue where type=1 and state=0;") //获取进片队列id @Select("select glassid from queue where type=1") String Selectqueueid(); //获取进片队列id @Select("select state from queue where type=1") String Selectqueuestate(); }
