From 8a0ae6d19d78d2295a10b1cc97bfe17e651234ea Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 01 十二月 2023 08:08:28 +0800
Subject: [PATCH] 更新理片笼逻辑
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 797c9ff..a9ce8c3 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
@@ -90,14 +90,16 @@
//灏嗗鐗囩幓鐠冪殑鏁版嵁鏇存柊鍒板唴鐗�
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);
@@ -162,8 +164,7 @@
north_glass_buffer1 qglass = spianMapper.SelectQueueGlass(i);
width = qglass.getglasslengthmm();// 鏍煎瓙鍓╀綑瀹藉害
glassid=qglass.getbarcode();
- spianMapper.UpdataAddqueCage(qglass.getordernumber(), qglass.getbarcode(), width, cage1, cells, i,
- 1);
+ 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());// 鏂板浠诲姟
}
@@ -221,7 +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");
+ outmesid(glassid,"DB105.20");//娲惧彂杩涚墖id
// S7control.getinstance().WriteWord(adddresslist, datas);
break;
// S7control.getinstance().WriteByte("DB105.16",glassid);
@@ -436,6 +437,7 @@
spianMapper.UpdateDBCage1(cage, cell);// 灏嗗唴鐗囨暟鎹洿鏂板埌澶栫墖閲�
spianMapper.UpdateDBCage2(cage, cell);// 娓呴櫎鍐呯墖鏁版嵁
}
+
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
outmesid(glassid,"DB105.34");// 娲惧彂鍑虹墖ID
@@ -454,6 +456,7 @@
spianMapper.Inserttask(1, 0, cageout.getId(), 1000, glassid);// 鏂板浠诲姟
spianMapper.UpdataOutCage1(glasswidth, cage, cell);// 澧炲姞鍘熸牸瀛愬搴�
spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 3);// 娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ spianMapper.OverOutSlice(glassid,2);//瀹屾垚鍑虹墖闃熷垪浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);// 娲惧彂鍑虹墖杞︿换鍔�
return (200);// 缁撴潫
@@ -536,9 +539,9 @@
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) {
--
Gitblit v1.8.0