From b6901c795d8640776818e7d2be6a3396b4a2f535 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 13 九月 2023 14:44:39 +0800
Subject: [PATCH] 增加任务表数据,更改理片笼逻辑
---
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 104 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 16 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 2d8f2f3..b1001ea 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
@@ -34,18 +34,26 @@
int prcid = cageout.getPrcId();// prcid
int prcid2;
int ids;
+ int cages;
+ int cells;
double glasswidth = cageout.getGlassWidth();
// 鍒ゆ柇鐜荤拑鍐呭鐗�
if (tier == 2) {
// 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
-
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+
+
+
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(datas);
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
@@ -57,7 +65,11 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
@@ -69,9 +81,15 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
+ cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
+
+
// 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
datas.add((short) prcid2);
@@ -79,15 +97,19 @@
datas.add((short) 1);
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 2);//瀹屾垚浠诲姟
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
// 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),1000 );//鏂板鍑虹墖浠诲姟
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
S7control.getinstance().WriteWord(adddresslist, datas);
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -98,16 +120,20 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
+ cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
// 杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 2);//瀹屾垚浠诲姟
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
// 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
// 濉叆鍑虹墖鏁版嵁
@@ -115,7 +141,11 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),1000 );//鏂板鍑虹墖浠诲姟
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹嚭鐗�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
}
@@ -136,11 +166,10 @@
int prcid;
int tiers;
int prctier;
-
+
+
Glass glasslist = spianMapper.selectGlass(glassid);
- if (glasslist == null) {
- return (300);
- }
+
double widths = glasslist.getWidth();
Short orderids = glasslist.getOrderId();
@@ -169,6 +198,11 @@
tiers = cages1.getTier();// 鍐呭鐗�
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
+ spianMapper.Inserttask(0, 0, 1000, ids);//鏂板浠诲姟
+
+ if (glasslist == null) {
+ return (300);
+ }
prctier = spianMapper.selectsum(cage1, cells);// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
// 鏈夊悎閫傜┖鏍兼椂杩涚墖
if (cages > 1 && cages1.getTier() != null) {
@@ -179,6 +213,8 @@
datas.add((short) 1);
// 鏁版嵁搴撲慨鏀圭瀛愯〃鏂板涓�鏉＄幓鐠�
spianMapper.UpdataAddCage(orderids, glassid, widths, cage1, cells, ids, 1);
+ spianMapper.UpdataAddCage1(widths, cage1, cells);//鍑忓皯鏍煎瓙瀹藉害
+ spianMapper.Updatetask(1, 0);//瀹屾垚浠诲姟
S7control.getinstance().WriteWord(adddresslist, datas);
return (200);
@@ -186,7 +222,7 @@
}
}
- return (300);
+ return (400);
}
@@ -201,30 +237,48 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
- int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+ int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell = cageout.getCell();// 鍑虹墖鏍煎彿
int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
int prcid = cageout.getPrcId();// prcid
int prcid2;
int ids;
+ int cages;
+ int cells;
double glasswidth = cageout.getGlassWidth();
// 鍒ゆ柇鐜荤拑鍐呭鐗�
if (tier == 2) {
// 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
-
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+
+
+
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(datas);
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
// 鍒ゆ柇鍐呯墖鏄惁闇�瑕佽皟鎷�
if (state == 0) {
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);
+ datas.add((short) prcid);
+ datas.add((short) 1000);
+ datas.add((short) 1);
+ datas.add((short) 1);
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, tier, 0);//娓呴櫎鏍煎瓙鐜荤拑淇℃伅
+ S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success("鐘舵�佷负0,鐩存帴鍑虹墖");
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
@@ -236,9 +290,15 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峆RCID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
+ cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
+
+
// 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
datas.add((short) prcid2);
@@ -246,15 +306,19 @@
datas.add((short) 1);
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 2);//瀹屾垚浠诲姟
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
// 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�,濉叆鍑虹墖鏁版嵁
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),1000 );//鏂板鍑虹墖浠诲姟
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
S7control.getinstance().WriteWord(adddresslist, datas);
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
-
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
@@ -265,16 +329,20 @@
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
ids = cagecell.getId();// 璋冩嫧鐩爣浣岻D
+ cages=cagecell.getCage();//璋冩嫧鐩爣浣嶇瀛�
+ cells=cagecell.getCell();//璋冩嫧鐩爣浣嶆牸瀛�
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
// 杞Щ鍘熻皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
- spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹�
// 浼犺緭mes鏁版嵁,鍧愭爣锛屾暟鎹�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 2);//瀹屾垚浠诲姟
datas.clear(); // 娓呯┖鏁翠釜鍒楄〃
// 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
// 濉叆鍑虹墖鏁版嵁
@@ -282,7 +350,11 @@
datas.add((short) 1000);
datas.add((short) 1);
datas.add((short) 1);
+ spianMapper.Inserttask(2, 0,cageout.getId(),1000 );//鏂板鍑虹墖浠诲姟
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎鍘熸牸瀛愭暟鎹嚭鐗�
+ spianMapper.UpdataOutCage1(glasswidth, cage, cell);//澧炲姞鍘熸牸瀛愬搴�
S7control.getinstance().WriteWord(adddresslist, datas);
+ spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
return Result.success(cagecell); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
}
--
Gitblit v1.8.0