From 11b9b5a2cfd5b23e80ce6a3be3f9b341a2cd1be0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 13 九月 2023 17:36:55 +0800
Subject: [PATCH] 增加小车任务逻辑判断
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java | 42 ++++++-
springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java | 8 +
springboot-vue3/src/main/java/com/example/springboot/service/SpianService.java | 176 +++++++++++++++-------------------
springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java | 25 +++-
4 files changed, 136 insertions(+), 115 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
index f45e84f..1e678c9 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcHold.java
@@ -1,6 +1,7 @@
package com.example.springboot.component;
import java.sql.SQLException;
+import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +10,7 @@
import com.example.springboot.service.SpianService;
import com.example.springboot.entity.Glass;
import com.example.springboot.mapper.AlarmMapper;
+import com.example.springboot.mapper.SpianMapper;
public class PlcHold extends Thread {
@@ -16,7 +18,7 @@
@Autowired
private JdbcConnections jdbcConnections;
-
+ private SpianMapper spianMapper;
private SpianService spianService;
@@ -32,6 +34,7 @@
e.printStackTrace();
}
spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
jdbcConnections = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
//鏍规嵁鐜荤拑id鑾峰彇璁㈠崟鍙�
@@ -45,10 +48,11 @@
}
- spianService.selectout("11");
+ //spianService.selectout("11");
//鍒ゆ柇杩涚墖璇锋眰
List<Short> datas1List=S7control.getinstance().ReadWord("DB106.24", 1);
List<Short> datas1ListState=S7control.getinstance().ReadWord("DB106.8", 1);
+
if(datas1List!=null &&datas1ListState!=null){
//鑾峰彇prc杩涚墖璇锋眰鏁版嵁
boolean exist = datas1List.contains((short)1);
@@ -64,16 +68,36 @@
for(Short list1:datas1ListID){
spianService.selectAll((short)list1);
+ }
+ }
+ //System.out.println(exist);
+ }
+ }
+
+ List<Short> outlist=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖杞︾姸鎬�
+ List<Short> outlist2=S7control.getinstance().ReadWord("DB106.20", 1); //鍑虹墖浠诲姟瀹屾垚
+
+
+ List<Short>ceshi1=new ArrayList<Short>();//鍑虹墖杞︾姸鎬�
+ List<Short>ceshi2=new ArrayList<Short>();//鍑虹墖浠诲姟瀹屾垚
+ ceshi1.add((short)0);
+ ceshi2.add((short)1);
+ if(ceshi1!=null && ceshi2!=null){
+ //鍒ゆ柇鎸夎鍗曞嚭鐗�
+ boolean outstate = ceshi1.contains((short)0);
+ boolean outstate2 = ceshi1.contains((short)1);
+ if(outstate=true){ //鍑虹墖杞︾姸鎬佺┖闂叉椂
+ if(outstate2=true){ //鍑虹墖杞︿换鍔″畬鎴愭椂
+ String orderid=spianMapper.SelectOrderout();
+ if(orderid!=null){
+ spianService.selectout(orderid);
+ }
+
}
}
-
+
+ }
-
-
- //System.out.println(exist);
- }
- }
-
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
index 01b46fd..c7318f2 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java
@@ -79,12 +79,12 @@
map.put("message2", "500");
} else {
// 璋冪敤浼嶄笂鐗囧嚱鏁�
- short results= spianService.selectAll(glassid);
- if(results==200){
+ short results = spianService.selectAll(glassid);
+ if (results == 200) {
map.put("message2", "200");
- }else if(results==300){
+ } else if (results == 300) {
map.put("message2", "300");
- }else if(results==400){
+ } else if (results == 400) {
map.put("message2", "400");
}
}
@@ -96,9 +96,9 @@
Map<String, Object> map = new HashMap<>();
homeMapper.UpdateTask(types, shelfrack);
if (types == 0) {
- homeMapper.UpdateCageTask1(shelfrack,glassid);
+ homeMapper.UpdateCageTask1(shelfrack, glassid);
} else {
- homeMapper.UpdateCageTask2(shelfrack,glassid);
+ homeMapper.UpdateCageTask2(shelfrack, glassid);
}
map.put("message3", "200");
return Result.success(map);
@@ -131,9 +131,18 @@
@GetMapping("/OutByGlassID")
public Result OutByGlassID(String glassid) {
spianService.selectout2(glassid);
-
+
Map<String, Object> map = new HashMap<>();
- map.put("message3", "200");
+
+ // 璋冪敤浼嶄笂鐗囧嚱鏁�
+ Short results = spianService.selectout2(glassid);
+ if (results == 200) {
+ map.put("message2", "200");
+ } else if (results == 300) {
+ map.put("message2", "300");
+ } else if (results == 400) {
+ map.put("message2", "400");
+ }
return Result.success(map);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
index 1c29c80..ae9b6a6 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/SpianMapper.java
@@ -67,7 +67,7 @@
@Update("update storage_cage set width=width+#{width} where cage=#{cage} and cell=#{cell};")
void UpdataOutCage1(double width,int cage,int cell);
//璋冩嫧鏇存崲绗煎瓙淇℃伅
- @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.width=a.width-b.glasswidth,a.state=1 where a.id=#{id1}")
+ @Update("update storage_cage as a,(select*from storage_cage b where b.cage=#{cage} and b.cell=#{cell} and b.tier=2)as b set a.glass_id=b.glass_id,a.order_id=b.order_id,a.state=1 where a.id=#{id1}")
void UpdateDBCage(int id1,int cage,int cell);
// @Insert("insert into user(name, date, address, user_no) values (#{name}, #{date}, #{address}, #{userNo})")
// void insert (Spian spian);
@@ -77,4 +77,10 @@
//淇敼浠诲姟琛�
@Update("update storage_task set task_state=#{state} where task_type=#{type} and task_state=0;")
void Updatetask(int state,int type);
+ //淇敼浠诲姟琛�
+ @Update("update storage_task set task_state=1 where (task_type=1 or task_type=2) and task_state=0;")
+ void UpdatetaskOut();
+ //鏌ヨ鎸夎鍗曞嚭鐗�
+ @Select("select order_id state from order_out where state=0")
+ String SelectOrderout();
}
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 b1001ea..f0fa53a 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
@@ -19,6 +19,8 @@
// @GetMapping("/all2")
public Result selectout(String orderid) {
+
+ spianMapper.UpdatetaskOut(); //瀹屾垚涓婁竴娆″嚭鐗囨垨鑰呰皟搴︿换鍔�
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
@@ -28,6 +30,13 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut(orderid);
+ if(cageout==null){
+ return Result.success("200");
+ }
+
+
+
+
int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell = cageout.getCell();// 鍑虹墖鏍煎彿
int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
@@ -41,10 +50,6 @@
if (tier == 2) {
// 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
-
-
-
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
@@ -52,9 +57,12 @@
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);
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return Result.success(datas);//缁撴潫
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
@@ -68,9 +76,12 @@
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,鐩存帴鍑虹墖");
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
+ return Result.success(datas);//缁撴潫
+
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
if (cage < 6) {
@@ -83,34 +94,25 @@
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);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
// 浼犺緭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); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return Result.success(cagecell); //缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
@@ -128,25 +130,14 @@
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(); // 娓呯┖鏁翠釜鍒楄〃
- // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
- // 濉叆鍑虹墖鏁版嵁
- 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); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return Result.success(cagecell); //缁撴潫
}
@@ -198,11 +189,12 @@
tiers = cages1.getTier();// 鍐呭鐗�
cells = cages1.getCell();// 鏍煎瓙鍙�
prcid = cages1.getPrcId();// 浼犵粰prc鐨勭洰鏍囧湴id
- spianMapper.Inserttask(0, 0, 1000, ids);//鏂板浠诲姟
+
if (glasslist == null) {
return (300);
}
+ spianMapper.Inserttask(0, 0, 1000, ids);//鏂板浠诲姟
prctier = spianMapper.selectsum(cage1, cells);// 浼犵粰prc鐨勬牸瀛愬唴鐜荤拑鏁�
// 鏈夊悎閫傜┖鏍兼椂杩涚墖
if (cages > 1 && cages1.getTier() != null) {
@@ -227,7 +219,7 @@
}
// @GetMapping("/all2")
- public Result selectout2(String glassid) {
+ public Short selectout2(String glassid) {
// 瀹氫箟PRC鏁版嵁浼犻�佹暟缁�
List<String> adddresslist = new ArrayList<>();
adddresslist.add("DB105.6");// 鍑虹墖杞﹁捣濮嬩綅缃�
@@ -237,7 +229,15 @@
List<Short> datas = new ArrayList<>();
// 鑾峰彇浼樺厛鍑虹墖鐨勪綅缃�
StorageCage cageout = spianMapper.selectOut2(glassid);
- int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
+
+ if(cageout==null){
+ return (300);
+ }
+
+
+
+
+ int cage = cageout.getCage(); // 鍌ㄥ瓨鍑虹墖浣嶇疆锛岀瀛愭牸瀛愬嚑鍙风幓鐠�
int cell = cageout.getCell();// 鍑虹墖鏍煎彿
int tier = cageout.getTier();// 鍑虹墖鍐呭鐗�
int prcid = cageout.getPrcId();// prcid
@@ -250,10 +250,6 @@
if (tier == 2) {
// 鍒ゆ柇鐜荤拑鍙洿鎺ュ嚭鐗囨椂
// 淇敼鏁版嵁搴撶瀛愯〃(鍑虹墖)
- spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
-
-
-
datas.add((short) prcid);
datas.add((short) 1000);
datas.add((short) 1);
@@ -261,9 +257,12 @@
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);
+ spianMapper.Inserttask(1, 0,cageout.getId(),1000 );//鏂板浠诲姟
+
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return (200);//缁撴潫
} else {
// 鑾峰彇鏍煎瓙鐨勭幓鐠冩暟閲�
int state = spianMapper.selectGlassState(cage, cell);
@@ -277,54 +276,49 @@
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,鐩存帴鍑虹墖");
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ //spianMapper.Updatetask(1, 1);//瀹屾垚浠诲姟
+ return (200);//缁撴潫
+
} else {
// 鐜荤拑闇�瑕佽皟鎷ㄦ椂锛屽垽鏂睘浜庡摢涓崐鍖虹殑绗煎瓙
if (cage < 6) {
StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 0, 6);
if (cagecell == null) {
- return Result.success(cagecell);
+ return (300);
}
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
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);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+
// 濉叆璋冩嫧鏁版嵁
datas.add((short) prcid);// 璋冩嫧澶栫墖璧峰浣嶇疆
datas.add((short) prcid2);
datas.add((short) 2);
datas.add((short) 1);
+ // 鏇存崲鐜荤拑鐨勭瀛�
+ spianMapper.UpdataAddCage1(glasswidth, cages, cells);//鍑忓皯鏂版牸瀛愬搴�
+ spianMapper.UpdateDBCage(ids, cage, cell);// 灏嗗師鏍煎瓙鏁版嵁鏇存柊鍒版柊鏍煎瓙閲�
+ spianMapper.UpdataGlassCage("", "", glasswidth, cage, cell, 2, 0);// 娓呴櫎琚皟鎷ㄦ牸瀛愭暟鎹�
+ spianMapper.Inserttask(2, 0,cageout.getId(),ids );//鏂板璋冨害浠诲姟
// 浼犺緭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); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return (200); //缁撴潫
} else {// 绗煎瓙鍙峰ぇ浜�5鏃�
StorageCage cagecell = spianMapper.selectGlassCage(cage, glasswidth, 5, 11);
if (cagecell == null) {
- return Result.success(cagecell);
+ return (300);
}
// 鑾峰彇璋冩嫧浣嶇疆杩涜璋冩嫧
prcid2 = cagecell.getPrcId();// 璋冩嫧鐩爣浣峱rcID
@@ -337,28 +331,16 @@
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(); // 娓呯┖鏁翠釜鍒楄〃
- // 鍒ゆ柇璋冩嫧缁撴潫鍚庡啀娆″嚭鐗�
- // 濉叆鍑虹墖鏁版嵁
- 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); // 璋冩嫧浣嶇疆鐨勫弬鏁板唴瀹�
+ S7control.getinstance().WriteWord("DB106.22", (short)0); //鍑虹墖浠诲姟瀹屾垚鏀规垚0
+ S7control.getinstance().WriteWord("DB106.20", (short)1); //鍑虹墖杞︾姸鎬佹敼鎴愬繖纰�
+ S7control.getinstance().WriteWord(adddresslist, datas);//娲惧彂鍑虹墖杞︿换鍔�
+ return (200);//缁撴潫
}
-
}
}
--
Gitblit v1.8.0