From 689b10dd99adf31b5e2737f5c949fc5c132f8001 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 14 十二月 2023 14:04:25 +0800
Subject: [PATCH] 修改倒计时显示，添加显示急停状态，等待复位
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 169 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 97 insertions(+), 72 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
index 1c6f951..7f56ab3 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java
@@ -1,4 +1,5 @@
package com.example.springboot.service;
+
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
@@ -37,10 +38,10 @@
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
- adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
+ adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
+ adddresslist.add("DB105.8");// 杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
-
+
List<Short> datas = new ArrayList<>();
// String orderid="A001";
@@ -64,7 +65,7 @@
}
// 鍒ゆ柇閫変腑绗煎瓙鏄惁鏈夊悎閫傚搴︾┖鏍�
// 鏈夊悎閫傜┖鏍兼椂杩涚墖
- if (cages1 != null && cages >= 1&&storageCage2.getDisabled()==0) {
+ if (cages1 != null && cages >= 1 && storageCage2.getDisabled() == 0) {
ids = cages1.getId();// 鏁版嵁搴揑D
tiers = cages1.getTier();// 鍐呭鐗�
cells = cages1.getCell();// 鏍煎瓙鍙�
@@ -73,37 +74,36 @@
widths = glasslist.getglasslengthmm();
// 鎵ц杩涚墖
- datas.add((short) 1000);//璧峰浣嶇疆
- datas.add((short) prcid);//鐩爣浣嶇疆
- datas.add((short) widths);//杩涚墖鐜荤拑瀹�
- datas.add((short) prctier); //鐜荤拑鏁�
- datas.add((short) 1);//浠诲姟鍚姩
- //鑾峰彇璇ユ牸瀛愬唴鏄惁鏈夌幓鐠�
- int cellint=spianMapper.selectcell(cage1,cells);
- if(cellint==1){
- //灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
- spianMapper.UpdateDBCage(ids, cage1, cells,1);
- //灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
- //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2);
- spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids-1, 2);
+ datas.add((short) 1000);// 璧峰浣嶇疆
+ datas.add((short) prcid);// 鐩爣浣嶇疆
+ datas.add((short) widths);// 杩涚墖鐜荤拑瀹�
+ datas.add((short) prctier); // 鐜荤拑鏁�
+ datas.add((short) 1);// 浠诲姟鍚姩
+ // 鑾峰彇璇ユ牸瀛愬唴鏄惁鏈夌幓鐠�
+ int cellint = spianMapper.selectcell(cage1, cells);
+ if (cellint == 1) {
+ // 灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
+ spianMapper.UpdateDBCage(ids, cage1, cells, 1);
+ // 灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
+ // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids-1, 2);
+ spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids - 1, 2);
spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
- System.out.println("姹囨姤鏃朵换鍔" + datas);
-
- }else{
- // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
- //spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
- spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1,cells, ids, 2);
- spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
- spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(),prctier);// 鏂板浠诲姟
- S7control.getinstance().WriteWord(adddresslist, datas);
- System.out.println("姹囨姤鏃朵换鍔" + datas);
+ System.out.println("鍑虹墖浠诲姟|" + datas);
+ } else {
+ // 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
+ // spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage2(orderids, glassid, glasslist, cage1, cells, ids, 2);
+ spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString(), prctier);// 鏂板浠诲姟
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ System.out.println("鍑虹墖浠诲姟|" + datas);
- // S7control.getinstance().WriteByte("DB105.16",glassid);
+ // S7control.getinstance().WriteByte("DB105.16",glassid);
}
- outmesid(glassid,"DB105.20");
+ outmesid(glassid, "DB105.20");
return (200);
}
@@ -113,11 +113,10 @@
}
-
public Short selectout2(String glassid) {
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
- char[] a=glassid.toCharArray();
+ char[] a = glassid.toCharArray();
adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
@@ -148,19 +147,19 @@
datas.add((short) 1000);
datas.add((short) state);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.OverOutSlice(glassid, 1);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
-
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,state);// 鏂板浠诲姟
+ spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, state);// 鏂板浠诲姟
// int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
if (state == 2) {
spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
-
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+ outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
return (200);// 缁撴潫
} else {
@@ -173,12 +172,13 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid,1);// 鏂板浠诲姟
+ spianMapper.OverOutSlice(glassid, 1);// 鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
+ spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid, 1);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
- spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
- outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
+ spianMapper.UpdataGlassCageState(glassid, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ spianMapper.OverOutSlice(glassid, 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ System.out.println("鍑虹墖浠诲姟|" + datas);
+ outmesid(glassid, "DB105.34");// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -203,16 +203,17 @@
datas.add((short) 1);
// 鏇存崲鐜荤拑鐨勭瀛�
String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
- spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid,2);// 鏂板璋冨害浠诲姟
- //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ //spianMapper.UpdataGlassCageState(glassids, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid, 2);// 鏂板璋冨害浠诲姟
+ // spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -231,16 +232,17 @@
datas.add((short) 2);
datas.add((short) 1);
String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
- spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid,2);// 鏂板璋冨害浠诲姟
- //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
- spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid, 2);// 鏂板璋冨害浠诲姟
+ // spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ spianMapper.UpdateDBCage(ids, cage, cell, 2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ //spianMapper.UpdataGlassCageState(glassids, 3);// 鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
+ System.out.println("鍑虹墖浠诲姟|" + datas);
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids, "DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200);// 缁撴潫
}
@@ -248,44 +250,67 @@
}
}
- //娲惧彂浠诲姟鐜荤拑id
- public void outmesid(String glassid,String address) {
- //System.out.println("outmesid:" + glassid);
+
+ // 娲惧彂浠诲姟鐜荤拑id
+ public void outmesid(String glassid, String address) {
+ // System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
- char ds[]=glassid.toCharArray();
+ char ds[] = glassid.toCharArray();
for (char iditem : ds) {
- glassidlist.add((byte)iditem);
+ glassidlist.add((byte) iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
- //鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
- public StringBuilder queGlassid(String address,int count) {
+
+ // 鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
+ public StringBuilder queGlassid(String address, int count) {
StringBuilder writedstrIdOut = new StringBuilder();
byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
- if (writedglassidbytesOut != null) {
- // 鑾峰彇鐜荤拑id
- for (byte iditem : writedglassidbytesOut) {
- writedstrIdOut.append((char) iditem);
+ if (writedglassidbytesOut != null) {
+ // 鑾峰彇鐜荤拑id
+ for (byte iditem : writedglassidbytesOut) {
+ writedstrIdOut.append((char) iditem);
+ }
}
- }
return writedstrIdOut;
}
- //char鏁扮粍杞寲鎴恇it鏁扮粍
- public static byte[] toBytes(char[] chars) {
+
+ // char鏁扮粍杞寲鎴恇it鏁扮粍
+ public static byte[] toBytes(char[] chars) {
String s = new String(chars);
return s.getBytes(StandardCharsets.UTF_8);
}
- //bit鏁扮粍杞寲鎴恈har鏁扮粍
+
+ // bit鏁扮粍杞寲鎴恈har鏁扮粍
public static char[] toChars(byte[] bytes) {
String s = new String(bytes, StandardCharsets.UTF_8);
return s.toCharArray();
}
- //鍒ゆ柇闆嗗悎閲屾槸鍚︿负1
- public boolean listbool(String address) {
- List<Short> list = S7control.getinstance().ReadWord(address, 1);//杩斿洖涓簍ure鏃朵负1
- boolean listbool = list.contains((short) 1);
+
+ // 鍒ゆ柇闆嗗悎閲屾槸鍚︿负1
+ public boolean listbool(String address) {
+ List<Short> list = S7control.getinstance().ReadWord(address, 1);// 杩斿洖涓簍ure鏃朵负1
+ boolean listbool = list.contains((short) 1);
return listbool;
}
+
+ // 鏍规嵁鐜荤拑id瀹屾垚鍦ㄨ繘琛屼腑鐨勪换鍔�
+ public void overtask(String glassid) {
+ spianMapper.UpdateCageOver(glassid, 0);// 鏇存敼绗煎瓙琛ㄥ嚭鐗囩姸鎬�
+ spianMapper.UpdatetaskOut(glassid); // 瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰繘鐗囦换鍔�
+ spianMapper.OverOutSlice(glassid, 2);// 瀹屾垚鍑虹墖闃熷垪浠诲姟
+ spianMapper.UpdataGlassCage(glassid, 0);// 娓呴櫎鍑虹墖鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdateCageadd(glassid,1);
+ String barcode = spianMapper.SelectBarcode(glassid);// 鑾峰彇璇ョ幓鐠冪殑閾濇id
+ spianMapper.UpdateAddQueue(glassid);// 鎶婅繘鐗囩殑鐜荤拑鏇存柊鍒板嚭鐗囬槦鍒椾腑
+ if (barcode != null) {
+ int barcodeState = spianMapper.SelectOverState(barcode);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
+ if (barcodeState == 2) {// 褰撹閾濇鎵�鏈夌殑鐜荤拑閮芥槸瀹屾垚鐘舵�佹椂鍒犻櫎鍦ㄥ嚭鐗囬槦鍒楃殑鏁版嵁
+ spianMapper.DeleteQueue(barcode);
+ }
+ }
+
+ }
}
--
Gitblit v1.8.0