From af5edce322ff326356a32011e140182846c5dbed Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 28 十一月 2023 08:02:15 +0800
Subject: [PATCH] 测试后调整理片逻辑
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 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 8bad256..f97d3a1 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
@@ -45,8 +45,10 @@
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.0");// 杩涚墖杞﹁捣濮嬩綅缃�
adddresslist.add("DB105.2");// 杩涚墖杞︾洰鏍囦綅缃�
- adddresslist.add("DB105.4");// 杩涚墖绗肩幓鐠冩暟
- adddresslist.add("DB105.12");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+ adddresslist.add("DB105.4");// 杩涚墖鐜荤拑瀹�
+ adddresslist.add("DB105.8");//杩涚墖绗煎唴宸叉湁鐜荤拑鏁�
+ adddresslist.add("DB105.16");// 杩涚墖杞﹀惎鍔� 1涓哄惎鍔�
+
List<Short> datas = new ArrayList<>();
// String orderid="A001";
@@ -79,10 +81,11 @@
widths = glasslist.getglasslengthmm();
// 鎵ц杩涚墖
- datas.add((short) 1000);
- datas.add((short) prcid);
- datas.add((short) prctier);
- datas.add((short) 1);
+ 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){
@@ -392,10 +395,12 @@
// 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涓哄惎鍔�
+ char[] a=glassid.toCharArray();
+
+ 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.selectOut2(glassid);
@@ -438,16 +443,16 @@
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
// 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
- if (state == 0) {
+ if (state == 1) {
// spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ outmesid(glassid);// 娲惧彂鍑虹墖ID
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
- outmesid(glassid);// 娲惧彂鍑虹墖ID
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -519,19 +524,20 @@
}
//娲惧彂璋冩嫧浠诲姟鐜荤拑id
public void outmesid(String glassid) {
- System.out.println("outmesid:" + glassid);
+ //System.out.println("outmesid:" + glassid);
List<Byte> glassidlist = new ArrayList();
- for (char iditem : glassid.toCharArray()) {
- glassidlist.add(Byte.valueOf(String.valueOf(iditem)));
+ char ds[]=glassid.toCharArray();
+ for (char iditem : ds) {
+ glassidlist.add((byte)iditem);
}
byte[] bytes = Bytes.toArray(glassidlist);
System.out.println("outmesidbytes:" + bytes.length);
- S7control.getinstance().WriteByte("DB105.30", bytes);// 娲惧彂鍑虹墖id
+ S7control.getinstance().WriteByte("DB105.34", bytes);// 娲惧彂鍑虹墖id
}
//鑾峰彇鍦板潃鍐呯殑鐜荤拑id杞瓧绗︿覆
public StringBuilder queGlassid(String address) {
StringBuilder writedstrIdOut = new StringBuilder();
- byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 13);
+ byte[] writedglassidbytesOut = S7control.getinstance().ReadByte(address, 14);
if (writedglassidbytesOut != null) {
// 鑾峰彇鐜荤拑id
for (byte iditem : writedglassidbytesOut) {
--
Gitblit v1.8.0