From 4c90307d46d6d7daee39cca3ca2d9e87b9018401 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 05 十二月 2023 11:39:53 +0800
Subject: [PATCH] 主界面调整为根据分辨率显示下方图片大小
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 84 ++++++++++++++++++++++++------------------
1 files changed, 48 insertions(+), 36 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 f97d3a1..2f1045f 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
@@ -22,8 +22,6 @@
private SpianMapper spianMapper;
// @GetMapping("/all")
- // 杩涚墖浠诲姟,浼犺鍗昳d
- // 鎸夎鍗曚紭鍏堣繘鐗�
public Short selectAll(String glassid) {
int cage1;
@@ -92,20 +90,23 @@
//灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
spianMapper.UpdateDBCage(ids, cage1, cells,1);
//灏嗘柊鍏ョ殑鐜荤拑瀛樺叆澶栫墖
- spianMapper.UpdataAddCage(orderids.toString(), glassid, widths, cage1, cells, ids-1, 2);
+ //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());// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
+
}else{
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
- spianMapper.UpdataAddCage(orderids.toString(), glassid, widths, cage1, cells, ids, 2);
+ //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());// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
// S7control.getinstance().WriteByte("DB105.16",glassid);
}
-
+ outmesid(glassid,"DB105.20");
return (200);
}
@@ -157,12 +158,13 @@
ids = cages1.getId();// 鏁版嵁搴揑D
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ String glassid="";
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
for (int i = 2; i > 0; i--) {
north_glass_buffer1 qglass = spianMapper.SelectQueueGlass(i);
width = qglass.getglasslengthmm();// 鏍煎瓙鍓╀綑瀹藉害
- spianMapper.UpdataAddqueCage(qglass.getordernumber(), qglass.getbarcode(), width, cage1, cells, i,
- 1);
+ glassid=qglass.getbarcode();
+ spianMapper.UpdataAddqueCage(qglass.getordernumber(), qglass.getbarcode(), width, cage1, cells, i,1);
spianMapper.UpdataAddCage1(width, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
spianMapper.Inserttask(0, 0, 1000, ids, qglass.getbarcode().toString());// 鏂板浠诲姟
}
@@ -172,7 +174,7 @@
datas.add((short) 0);
datas.add((short) 1);
S7control.getinstance().WriteWord(adddresslist, datas);
-
+ outmesid(glassid,"DB105.20");
return (200);
}
@@ -220,6 +222,7 @@
spianMapper.UpdataAddCage(orderid, glassid, widths, cage1, cells, ids, 2);
spianMapper.UpdataAddCage1(widths, cage1, cells);// 鍑忓皯鏍煎瓙瀹藉害
spianMapper.Inserttask(0, 0, 1000, ids, glassid.toString());// 鏂板浠诲姟
+ outmesid(glassid,"DB105.20");//娲惧彂杩涚墖id
// S7control.getinstance().WriteWord(adddresslist, datas);
break;
// S7control.getinstance().WriteByte("DB105.16",glassid);
@@ -241,10 +244,10 @@
// spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔★紝鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
- adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
- adddresslist.add("DB105.8");// 鍑虹墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.10");// 鍑虹墖绗肩幓鐠冩暟
- adddresslist.add("DB105.14");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
+ adddresslist.add("DB105.10");// 鍑虹墖杞﹁捣濮嬩綅缃�
+ adddresslist.add("DB105.12");// 鍑虹墖杞︾洰鏍囦綅缃�
+ adddresslist.add("DB105.14");// 鍑虹墖绗肩幓鐠冩暟
+ adddresslist.add("DB105.18");// 鍑虹墖杞﹀惎鍔� 1涓哄惎鍔�
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut(orderid);
@@ -288,10 +291,10 @@
datas.add((short) 1);
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, orderid);// 鏂板浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);// 娲惧彂鍑虹墖ID
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
if (pd != null) {
cage = pd.getCage();
cell = pd.getCage();
@@ -312,7 +315,7 @@
datas.add((short) 1);
spianMapper.Inserttask(1, 0,prcid, 1000, orderid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
//S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
//outmesid(glassid);// 娲惧彂鍑虹墖ID
if (pd != null) {
@@ -347,12 +350,12 @@
spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
System.out.println(datas);
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return Result.success(cagecell); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -375,11 +378,11 @@
spianMapper.Inserttask(2, 0, cageout.getId(), ids, orderid);// 鏂板璋冨害浠诲姟
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return Result.success(cagecell); // 缁撴潫
}
@@ -392,7 +395,6 @@
public Short selectout2(String glassid) {
- // spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�,鏀瑰埌plchold閲岋紝鍑虹墖鎴栬皟搴︿换鍔″畬鎴愮珛鍗虫敼鍙樼粨鏉熶换鍔★紱
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
char[] a=glassid.toCharArray();
@@ -426,17 +428,19 @@
datas.add((short) 1000);
datas.add((short) state);
datas.add((short) 1);
-
+ spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
// int state = spianMapper.selectGlassState(cage, cell);//鑾峰彇鏍煎瓙鏁伴噺
if (state == 2) {
spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
+
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassid);// 娲惧彂鍑虹墖ID
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
return (200);// 缁撴潫
} else {
@@ -449,10 +453,12 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
- outmesid(glassid);// 娲惧彂鍑虹墖ID
+ spianMapper.OverOutSlice(glassid, 1);//鏇存柊鍑虹墖闃熷垪浠诲姟鐘舵�佷负杩涜涓�
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.UpdataGlassCageState(glassid,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
+ spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
+ outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -480,13 +486,13 @@
spianMapper.UpdateDBCage(ids, cage, cell,2);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
spianMapper.UpdataAddCage1(glasswidth, cages, cells);// 鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
spianMapper.Inserttask(2, 0, cageout.getId(), ids, glassid);// 鏂板璋冨害浠诲姟
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ //spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200); // 缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -506,15 +512,15 @@
datas.add((short) 1);
String glassids = spianMapper.SelectGlassid(cage, cell); // 鑾峰彇琚皟鎷ㄧ殑鐜荤拑id
spianMapper.Inserttask(2, 0, cageout.getId() + 1, ids, glassid);// 鏂板璋冨害浠诲姟
- spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板鍑虹墖浠诲姟
+ //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.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 3);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataGlassCageState(glassids,3);//鏇存敼绗煎瓙琛ㄧ殑鐜荤拑鐘舵��
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
- outmesid(glassids);// 娲惧彂璋冩嫧鐜荤拑ID
+ outmesid(glassids,"DB105.34");// 娲惧彂璋冩嫧鐜荤拑ID
return (200);// 缁撴潫
}
@@ -522,8 +528,8 @@
}
}
- //娲惧彂璋冩嫧浠诲姟鐜荤拑id
- public void outmesid(String glassid) {
+ //娲惧彂浠诲姟鐜荤拑id
+ public void outmesid(String glassid,String address) {
//System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
char ds[]=glassid.toCharArray();
@@ -532,12 +538,12 @@
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte("DB105.34", bytes);// 娲惧彂鍑虹墖id
+ S7control.getinstance().WriteByte(address, bytes);// 娲惧彂鍑虹墖id
}
//鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
- public StringBuilder queGlassid(String address) {
+ public StringBuilder queGlassid(String address,int count) {
StringBuilder writedstrIdOut = new StringBuilder();
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 14);
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, count);
if (writedglassidbytesOut != null) {
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytesOut) {
@@ -556,4 +562,10 @@
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);
+ return listbool;
+ }
}
--
Gitblit v1.8.0