| CanadaMes-ui/src/lang/locales/en-US.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| CanadaMes-ui/src/views/home/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
CanadaMes-ui/src/lang/locales/en-US.json
@@ -3,8 +3,8 @@ "ip":"192.168.10.21", "Abort":"Abort", "Current scan":"Current scan", "Interior Out Bypass: Right":"Exterior Out Bypass: Right", "Exterior Out Bypass: Left":"Interior Out Bypass: Left", "Interior Out Bypass: Right":"Interior Out Bypass: Right", "Exterior Out Bypass: Left":"Exterior Out Bypass: Left", "Remove Frame":"Remove Frame", "Mes Connection failed":"Mes Connection failed", "Plc1 Connection failed":"Plc1 Connection failed", CanadaMes-ui/src/views/home/index.vue
@@ -1674,16 +1674,13 @@ confirmButtonText: this.$t('Yes'), cancelButtonText: this.$t('No'), type: 'warning' }).then(({ value }) => { if (this.password == value) { }).then(() => { UpdateTask(type, glassid, cell).then(res => { if (res.data.message3 == 200) { this.$message.success(this.$t('Operation successful')); } }); } else { this.$message.error(this.$t('Password error'));//密码错误 } }).catch(() => { this.$message({ type: 'info', @@ -1713,17 +1710,13 @@ confirmButtonText: this.$t('Yes'), cancelButtonText: this.$t('No'), type: 'warning' }).then(({ value }) => { if (this.password == value) { }).then(() => { if (state == 1) { DeleteByGlassID(glassid).then(res => { if (res.data.message3 == 200) { this.$message.success(this.$t('Operation successful')); } }); } else { this.$message.error(this.$t('No delete allowed')); } } else { this.$message.error(this.$t('Password error'));//密码错误 } @@ -1743,8 +1736,7 @@ confirmButtonText: this.$t('Yes'), cancelButtonText: this.$t('No'), type: 'warning' }).then(({ value }) => { if (this.password == value) { }).then(() => { if (state == 1) { OutByGlassID(glassid).then(res => { if (res.data.message2 == 200) { @@ -1760,9 +1752,6 @@ this.$message.error(this.$t('This glass is already in the Queue')); } }); } else { this.$message.error(this.$t('No out allowed')); } } else { this.$message.error(this.$t('Password error'));//密码错误 } @@ -1781,15 +1770,11 @@ confirmButtonText: this.$t('Yes'), cancelButtonText: this.$t('No'), type: 'warning' }).then(({ value }) => { if (this.password == value) { }).then(() => { this.insertcage = cage; this.insertcell = cell; this.inserttier = tier; this.showform(2); } else { this.$message.error(this.$t('Password error'));//密码错误 } }).catch(() => { this.$message({ type: 'info', @@ -1833,14 +1818,12 @@ confirmButtonText: this.$t('Yes'), cancelButtonText: this.$t('No'), type: 'warning' }).then(({ value }) => { if (this.password == value) { }).then(() => { Disabled(cage, cell, disabled).then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); } }); } }).catch(() => { this.$message({ type: 'info', @@ -1858,7 +1841,6 @@ cancelButtonText: this.$t('No'), type: 'warning' }).then(() => { // if (this.password == value) { DeleteProductionQueueGlass(id).then(res => { if (res.data.message == 200) { this.$message.success(this.$t('Operation successful')); @@ -1866,7 +1848,6 @@ this.$message.error(this.$t('This frame has glass that is currently outing')); } }); // } }).catch(() => { this.$message({ type: 'info', springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -148,64 +148,64 @@ jsonObject.append("CurrentFrame", CurrentFrame); try { // 铝框线交互 // if (S7controlLK.getinstance().CheckConnected() == true) { // E02玻璃id // log.info("frame1"+S7controlLK.getinstance().CheckConnected()); String E02id=""; try { E02id= S7controlLK.getinstance().readStrings("DB17.40"); plc2=true; } catch (Exception e) { // TODO: handle exception plc2=false; e.printStackTrace(); } // try { // // 铝框线交互 // // if (S7controlLK.getinstance().CheckConnected() == true) { // // E02玻璃id // // log.info("frame1"+S7controlLK.getinstance().CheckConnected()); // String E02id=""; // try { // E02id= S7controlLK.getinstance().readStrings("DB17.40"); // plc2=true; // } catch (Exception e) { // // TODO: handle exception // plc2=false; // e.printStackTrace(); // } jsonObject.append("Plc2", plc2); // log.info("铝框线读取2"+S7controlLK.getinstance().CheckConnected()); // jsonObject.append("Plc2", plc2); // // log.info("铝框线读取2"+S7controlLK.getinstance().CheckConnected()); // log.info("E02id"+E02id); outSliceServive.FrameStateUpdate(E02id); if (CurrentFrame != null) { S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0"); } // else{ // S7controlLK.getinstance().writeStrings("", "DB17.0"); // } String J01id = S7controlLK.getinstance().readStrings("DB17.22"); List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1); Short framerequest = liststate.get(0); // log.info("liststate:" + liststate); if (framerequest == 1) { // 铝框id String position; try { position = dbserve.SelectPositionByFrameBarcode(J01id); } catch (SQLException e) { // TODO Auto-generated catch block position = "0"; e.printStackTrace(); } Short send; if (position.equals("1")) { send = 1; } else { send = 2; } if (J01id != null) { int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态 if (barcodeState == 0) {// 当该铝框所有的玻璃都是完成状态时删除在出片队列的数据 spianMapper.DeleteQueue(J01id); // log.info("deleteoutslice:" + J01id); } } S7controlLK.getinstance().WriteWord("DB17.38", (short) send); } } catch (Exception e) { e.printStackTrace(); } // // log.info("E02id"+E02id); // outSliceServive.FrameStateUpdate(E02id); // if (CurrentFrame != null) { // S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0"); // } // // else{ // // S7controlLK.getinstance().writeStrings("", "DB17.0"); // // } // String J01id = S7controlLK.getinstance().readStrings("DB17.22"); // List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1); // Short framerequest = liststate.get(0); // // log.info("liststate:" + liststate); // if (framerequest == 1) { // // 铝框id // String position; // try { // position = dbserve.SelectPositionByFrameBarcode(J01id); // } catch (SQLException e) { // // TODO Auto-generated catch block // position = "0"; // e.printStackTrace(); // } // Short send; // if (position.equals("1")) { // send = 1; // } else { // send = 2; // } // if (J01id != null) { // int barcodeState = spianMapper.SelectOverState(J01id);// 获取该铝框的状态 // if (barcodeState == 0) {// 当该铝框所有的玻璃都是完成状态时删除在出片队列的数据 // spianMapper.DeleteQueue(J01id); // // log.info("deleteoutslice:" + J01id); // } // } // S7controlLK.getinstance().WriteWord("DB17.38", (short) send); // } // } catch (Exception e) { // e.printStackTrace(); // } if (S7control.getinstance().CheckConnected() == true) {
@@ -250,7 +250,7 @@ Map<String, Object> map = new HashMap<>(); short result = homeMapper.SelectStorageByGlassId(queue.getglassId()); Double cagewidth = homeMapper.SelectCageWidth(cage, cell); if (cagewidth - queue.getglasswidth() - 400 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) { if (cagewidth - queue.getglasswidth() - 600 < 0 || (cagewidth == 2750 && queue.getglasswidth() > cagewidth)) { map.put("message", "400"); } else { if (result > 0) { springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -91,7 +91,7 @@ // 判断是否是第二片需要加间隔物 prctier = spianMapper.selectsum(cage1, storageCage2.getCell());// 传给prc的格子内玻璃数 if (prctier > 0) { cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 400); cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths + 600); } else { cages1 = spianMapper.selectCage1(cage1, storageCage2.getCell(), widths); }
