From 223e7f20dcfbb3ac0b19051228b89565a8d5aa10 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 16 五月 2024 14:01:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 021c443..52ef0df 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -297,8 +297,10 @@
rgvThread.setPakMk(true);
}
WrkMastSta wrkMastSta = wrkMastStaMapper.selectById(rgvProtocol.getTaskNo1());
- wrkMastSta.setWrkSts(3);
- wrkMastStaMapper.updateById(wrkMastSta);
+ if (!Cools.isEmpty(wrkMastSta)){
+ wrkMastSta.setWrkSts(3);
+ wrkMastStaMapper.updateById(wrkMastSta);
+ }
}
}
@@ -396,7 +398,7 @@
// System.out.println(JSON.toJSONString(staProtocol));
if (staProtocol.isAutoing()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,1);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -404,7 +406,7 @@
}
}else if (staProtocol.isLoading()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,3);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -412,7 +414,7 @@
}
}else if (staProtocol.isInEnable()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,5);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -420,7 +422,7 @@
}
}else if (staProtocol.isOutEnable()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),2,7);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -429,7 +431,7 @@
}
if (staProtocol.isEmptyMk()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),1,10);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -438,7 +440,7 @@
}
if (staProtocol.isFullPlt()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),3,10);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -447,7 +449,7 @@
}
if (staProtocol.isCar()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),5,10);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -456,7 +458,7 @@
}
if (staProtocol.isLow()){
WrkMastSta wrkMastSta = new WrkMastSta(new Date(),7,10);
- Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().eq("wrk_no", wrkMastSta.getWrkNo()));
+ Integer count = wrkMastStaMapper.selectCount(new EntityWrapper<WrkMastSta>().ne("wrk_sts",3).eq("wrk_no", wrkMastSta.getWrkNo()));
if (count==0){
wrkMastSta.setType(1);
wrkMastSta.setWrkType(3);
@@ -523,7 +525,7 @@
rgvCommand.setTaskMode1(RgvTaskModeType.FETCH_PUT); // 宸ヤ綅1浠诲姟妯″紡: 鍙栨斁璐�
rgvCommand.setSourceStaNo1(wrkMastSta.getStaStart().shortValue()); //宸ヤ綅1璧风偣
rgvCommand.setDestinationStaNo1(wrkMastSta.getStaEnd().shortValue()); //宸ヤ綅1鐩爣绔欑偣
- rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
+ rgvCommand.setCommand((short) 0); //宸ヤ綅1浠诲姟纭
if (!MessageQueue.offer(SlaveType.Rgv, rgvId, new Task(4, rgvCommand))) {
//step=2,宸ヤ綅1銆�2鍐欎换鍔★紱 step=4锛屽伐浣�1鍐欎换鍔★紱 step=5锛屽伐浣�2鍐欎换鍔�
log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
--
Gitblit v1.9.1