From 8f93d32b15cff5287a07649da92bd5b6276c14e2 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期三, 26 六月 2024 22:13:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java | 4
src/main/java/com/zy/asrs/service/BasJarService.java | 2
src/main/java/com/zy/core/thread/JarThread.java | 13 +
src/main/resources/mapper/BasJarMapper.xml | 7
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 111 +++++++++++--
src/main/java/com/zy/asrs/mapper/BasJarMapper.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java | 4
src/main/resources/mapper/BasJarMastMapper.xml | 16 -
src/main/java/com/zy/core/cache/MessageQueue.java | 14 +
src/main/resources/mapper/WrkMastExecuteMapper.xml | 14 +
src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java | 4
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6
src/main/java/com/zy/core/thread/SteThread.java | 2
src/main/webapp/static/js/console.map23.js | 4
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 77 +++------
src/main/resources/application.yml | 152 +++++++-----------
src/main/java/com/zy/asrs/utils/SteAndJarUtil.java | 2
17 files changed, 231 insertions(+), 203 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasJarMapper.java b/src/main/java/com/zy/asrs/mapper/BasJarMapper.java
index 4d38599..f977f4f 100644
--- a/src/main/java/com/zy/asrs/mapper/BasJarMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasJarMapper.java
@@ -10,6 +10,4 @@
@Repository
public interface BasJarMapper extends BaseMapper<BasJar> {
- BasJar selectByJarNo(@Param("jarNo") Integer jarNo);
-
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
index a87b6de..070d820 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastExecuteMapper.java
@@ -12,9 +12,9 @@
@Repository
public interface WrkMastExecuteMapper extends BaseMapper<WrkMastExecute> {
- WrkMastExecute getWrkMastByWrkNo(@Param("wrkNo") Long wrkNo);
+ WrkMastExecute getWrkMastExecuteByWrkNo(@Param("wrkNo") Long wrkNo);
- List<WrkMastExecute> getWrkMastByJarId(@Param("jarId") Integer jarId);
+ List<WrkMastExecute> getWrkMastExecuteByJarNo(@Param("jarId") Integer jarId);
List<WrkMastExecute> selectWrkMastExecuteByType(@Param("type") Integer type);
diff --git a/src/main/java/com/zy/asrs/service/BasJarService.java b/src/main/java/com/zy/asrs/service/BasJarService.java
index 2787a98..1e9a633 100644
--- a/src/main/java/com/zy/asrs/service/BasJarService.java
+++ b/src/main/java/com/zy/asrs/service/BasJarService.java
@@ -7,6 +7,4 @@
public interface BasJarService extends IService<BasJar> {
- BasJar selectByJarNo(Integer jarNo);
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java
index 4cc6601..7be688b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasJarServiceImpl.java
@@ -9,8 +9,4 @@
@Service("basJarService")
public class BasJarServiceImpl extends ServiceImpl<BasJarMapper, BasJar> implements BasJarService {
- @Override
- public BasJar selectByJarNo(Integer jarNo){
- return this.baseMapper.selectByJarNo(jarNo);
- };
}
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 6f1a206..358e743 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4522,8 +4522,7 @@
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
}
-
- if (basJar.getJarMode()!=1 && basJar.getJarMode()!=0){
+ if (basJar.getJarMode()!=2){
return false;
}
@@ -4796,7 +4795,7 @@
for (BasJarMast basJarMast : basJarMastList){
JarSlave.StaStn staStn = null;
for (JarSlave.StaStn staStn1 : jarSlave.getJarInSta()){
- if (staStn1.getStaNo().equals(basJarMast.getEnterStaNo())){
+ if (staStn1.getStaNo().equals(basJarMast.getJarEnterStaNo())){
staStn = staStn1;
}
}
@@ -4848,16 +4847,15 @@
//闂ㄤ綔涓� 鏃�
//鑷姩銆佺┖闂层�佸彸闂ㄥ叧闂�� Other宸﹂棬鍏抽棴
- if (jarProtocol.isAutoing() && !jarProtocol.isRightDoor() && jarProtocol.jarErr==0
- && jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0
- && !jarOtherProtocol.isLeftDoor() && jarOtherProtocol.leftDoorOpen==0 && jarOtherProtocol.leftDoorClose==0){
+ if (jarProtocol.isAutoing() && jarProtocol.jarErr==0
+ && jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0){
if (!jarProtocol.isLeftDoor() && basJarMast.getStatus()==0){
//鐢熸垚寮�闂ㄤ换鍔� OpenTheDoor
if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getEnterSteNo(),basJar.getEnterRgvNo(),1,1})){
log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
}
return true;
- } else if (jarProtocol.statusType == JarStatusType.WAITING3 && jarProtocol.isLeftDoor()){
+ } else if ((jarProtocol.statusType == JarStatusType.WAITING3 || jarProtocol.statusType == JarStatusType.MOVING) && jarProtocol.isLeftDoor()){
//鐢熸垚鍏ョ～鍖栫綈浠诲姟
if (!jarWrkMastExecuteGenerateExecute(basJar,basJarMast,basJar.getJarNo(),new int[]{basJar.getEnterSteNo(),basJar.getEnterRgvNo(),5,1})){
log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
@@ -5325,7 +5323,7 @@
}
}
} catch (Exception e){
-
+ log.error("JarWrkMastExecute浠诲姟鍒涘缓===>Action==>涓嬪彂"+e.getMessage());
}
}
@@ -5352,7 +5350,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -5469,7 +5467,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -5586,7 +5584,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -5597,7 +5595,7 @@
// return false;
// }
- DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocolRGV = devpThread.getStation().get(basJar.getEnterRgvNo());
if (staProtocolRGV == null) {
return false;
@@ -5639,8 +5637,8 @@
}
//璋冭溅 == > 鍙栬揣
if (jarRgvGetTake(wrkMastExecute
- ,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarEnterStaNo())==1
- ,SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarEnterStaNo())==2)){
+ ,SteAndJarUtil.getRgvStaRow(wrkMastExecute.getJarEnterStaNo())==1
+ ,SteAndJarUtil.getRgvStaRow(wrkMastExecute.getJarEnterStaNo())==3)){
log.error("骞宠 杞GV鍛戒护涓嬪彂澶辫触锛宺gv鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
}
@@ -5698,7 +5696,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -5808,7 +5806,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -5824,7 +5822,7 @@
return false;
}
- BasJar basJarOther = basJarMapper.selectByJarNo(jarProtocolOther.getJarNo());
+ BasJar basJarOther = basJarMapper.selectById(jarProtocolOther.getJarNo());
if (Cools.isEmpty(basJarOther)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocolOther.getJarNo());
return false;
@@ -5966,7 +5964,7 @@
// return false;
// }
- BasJar basJar = basJarMapper.selectByJarNo(wrkMastExecute.getJarId());
+ BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
if (Cools.isEmpty(basJar)){
log.error("{}鍙峰喎鍗存Ы鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
return false;
@@ -6080,7 +6078,7 @@
return false;
}
- BasJar basJar = basJarMapper.selectByJarNo(jarProtocol.getJarNo());
+ BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
return false;
@@ -6442,6 +6440,9 @@
public synchronized boolean jarWrkMastExecuteGenerateJarComplete(Integer sign) {
try{
for (JarSlave jarSlave : slaveProperties.getJar()) {
+ if (jarSlave.getId()>4){
+ continue;
+ }
// 鑾峰彇纭寲缃愪俊鎭�
JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getId());
JarProtocol jarProtocol = jarThread.getJarProtocol();
@@ -6458,7 +6459,9 @@
}
//WAITING2(4, "纭寲瀹屾垚"),
if (jarProtocol.getJarErr()==0 && jarProtocol.getStatusType().equals(JarStatusType.WAITING2)
- && jarProtocol.isRightDoor() && jarProtocol.isLeftDoor() ){
+ && jarProtocol.isRightDoor() && jarProtocol.isLeftDoor()
+ && jarProtocol.leftDoorOpen==0 && jarProtocol.leftDoorClose==0 && jarProtocol.rightDoorOpen==0 && jarProtocol.rightDoorClose==0
+ ){
List<BasJarMast> basJarMastList = basJarMastService.getJarMastByJarIdAndStatusList(jarSlave.getId(), new ArrayList<Integer>() {{
add(5);//纭寲涓�
}});
@@ -6469,6 +6472,74 @@
if (basJarMastList.size()!=integer){
log.error("{}鍙风～鍖栫綈纭寲瀹屾垚淇敼纭寲妗ｆ鐘舵�佺粨鏋滄暟閲忎笉涓�鑷达紒锛侊紒鏌ヨ璧勬枡鏁伴噺={}锛屾洿鏂拌繑鍥炴暟閲�={}",jarProtocol.getJarNo(),basJarMastList.size(),integer);
}
+ } else if (jarProtocol.getJarErr()==0
+ && jarProtocol.isRightDoor() && jarProtocol.isLeftDoor()
+ && jarProtocol.leftDoorOpen!=1 && jarProtocol.leftDoorOpen!=3
+ && jarProtocol.rightDoorOpen!=1 && jarProtocol.rightDoorOpen!=3
+ && (jarProtocol.leftDoorOpen==2 || jarProtocol.rightDoorOpen==2)){
+ WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
+ wrkMastExecuteSou.setWrkType(3);
+ List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
+ if (wrkMastExecuteList.isEmpty()){
+ WrkMastExecute execute = new WrkMastExecute();
+ execute.setJarId(jarProtocol.getJarNo());
+ //鐩存帴鍏抽棬
+ if (jarDoorTake(execute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
+ log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ execute.getJarId(), JSON.toJSON(execute), JSON.toJSON(jarProtocol),sign);
+ }
+ return true;
+ }
+ for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
+ if (wrkMastExecute.getIoType() == 1 || wrkMastExecute.getIoType() == 3){
+ //鐩存帴鍏抽棬
+ if (jarDoorTake(wrkMastExecute,JarTaskModeType.OPEN_THE_DOOR_COMPLETE)){
+ log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ }
+ wrkMastExecute.setWrkSts(4);
+ if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ return false;
+ }
+ return true;
+ }
+ }
+ } else if (jarProtocol.getJarErr()==0
+ && jarProtocol.isRightDoor() && jarProtocol.isLeftDoor()
+ && jarProtocol.leftDoorClose!=1 && jarProtocol.leftDoorClose!=3
+ && jarProtocol.rightDoorClose!=1 && jarProtocol.rightDoorClose!=3
+ && (jarProtocol.leftDoorClose==2 || jarProtocol.rightDoorClose==2)){
+ WrkMastExecute wrkMastExecuteSou = new WrkMastExecute();
+ wrkMastExecuteSou.setWrkType(3);
+ List<WrkMastExecute> wrkMastExecuteList = wrkMastExecuteService.selectWrkMastExecuteByWrk(wrkMastExecuteSou);
+ if (wrkMastExecuteList.isEmpty()){
+ WrkMastExecute execute = new WrkMastExecute();
+ execute.setJarId(jarProtocol.getJarNo());
+ //鐩存帴鍏抽棬
+ if (jarDoorTake(execute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
+ log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ execute.getJarId(), JSON.toJSON(execute), JSON.toJSON(jarProtocol),sign);
+ }
+ return true;
+ }
+ for (WrkMastExecute wrkMastExecute : wrkMastExecuteList){
+ if (wrkMastExecute.getIoType() == 2 || wrkMastExecute.getIoType() == 4){
+ //鐩存帴鍏抽棬
+ if (jarDoorTake(wrkMastExecute,JarTaskModeType.CLOSE_THE_DOOR_COMPLETE)){
+ log.error("纭寲缃怞ar鍛戒护涓嬪彂澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ wrkMastExecute.getJarId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ }
+ wrkMastExecute.setWrkSts(4);
+ if (wrkMastExecuteService.updateById(wrkMastExecute)){
+ log.error("骞宠 杞gv鍛戒护涓嬪彂澶辫触===>鏇存柊wrkMastExecute澶辫触锛宩ar鍙�={},浠诲姟鏁版嵁={},纭寲缃愭暟鎹�={},sign={}",
+ wrkMastExecute.getSteId(), JSON.toJSON(wrkMastExecute), JSON.toJSON(jarProtocol),sign);
+ return false;
+ }
+ return true;
+ }
+ }
}
}
return true;
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
index d540eb7..900a52a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastExecuteServiceImpl.java
@@ -13,12 +13,12 @@
@Override
public WrkMastExecute getWrkMastExecuteByWrkNo(Long wrkNo) {
- return this.baseMapper.getWrkMastByWrkNo(wrkNo);
+ return this.baseMapper.getWrkMastExecuteByWrkNo(wrkNo);
}
@Override
public List<WrkMastExecute> getWrkMastExecuteByJarNo(Integer jarId) {
- return this.baseMapper.getWrkMastByJarId(jarId);
+ return this.baseMapper.getWrkMastExecuteByJarNo(jarId);
}
@Override
diff --git a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
index 22d1cfa..86c594a 100644
--- a/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
+++ b/src/main/java/com/zy/asrs/utils/SteAndJarUtil.java
@@ -57,7 +57,7 @@
return 1;
case 612:
case 619:
- return 2;
+ return 3;
}
return 0;
}
diff --git a/src/main/java/com/zy/core/cache/MessageQueue.java b/src/main/java/com/zy/core/cache/MessageQueue.java
index 8d2a461..2e40597 100644
--- a/src/main/java/com/zy/core/cache/MessageQueue.java
+++ b/src/main/java/com/zy/core/cache/MessageQueue.java
@@ -30,6 +30,8 @@
// 鍙拌溅mq浜ゆ崲鏈�
private static final Map<Integer, ConcurrentLinkedQueue<Task>> CAR_EXCHANGE = new ConcurrentHashMap<>();
+ private static final Map<Integer, ConcurrentLinkedQueue<Task>> JAR_EXCHANGE = new ConcurrentHashMap<>();
+
/**
* mq 浜ゆ崲鏈哄垵濮嬪寲
*/
@@ -56,6 +58,9 @@
case Car:
CAR_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
break;
+ case Jar:
+ JAR_EXCHANGE.put(slave.getId(), new ConcurrentLinkedQueue<>());
+ break;
default:
break;
}
@@ -81,6 +86,8 @@
return SCALE_EXCHANGE.get(id).offer(task);
case Car:
return CAR_EXCHANGE.get(id).offer(task);
+ case Jar:
+ return JAR_EXCHANGE.get(id).offer(task);
default:
return false;
}
@@ -106,6 +113,8 @@
return SCALE_EXCHANGE.get(id).poll();
case Car:
return CAR_EXCHANGE.get(id).poll();
+ case Jar:
+ return JAR_EXCHANGE.get(id).poll();
default:
return null;
}
@@ -130,6 +139,8 @@
return SCALE_EXCHANGE.get(id).peek();
case Car:
return CAR_EXCHANGE.get(id).peek();
+ case Jar:
+ return JAR_EXCHANGE.get(id).peek();
default:
return null;
}
@@ -158,6 +169,9 @@
case Car:
CAR_EXCHANGE.get(id).clear();
break;
+ case Jar:
+ JAR_EXCHANGE.get(id).clear();
+ break;
default:
break;
}
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 9471b80..c0a5e5d 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -20,7 +20,6 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.JarSlave;
import com.zy.core.model.Task;
-import com.zy.core.model.command.CrnCommand;
import com.zy.core.model.command.JarCommand;
import com.zy.core.model.protocol.JarProtocol;
import lombok.Data;
@@ -64,7 +63,7 @@
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write(null);
+ write((JarCommand) task.getData());
break;
default:
break;
@@ -155,6 +154,16 @@
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
+
+//
+// jarProtocol.setMode(2);//妯″紡
+// jarProtocol.setStatus((short)1);//鐘舵��
+// jarProtocol.setLeftDoorOpen(0);//open the left door //杩涙枡闂�
+// jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
+// jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
+// jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasJarService service = SpringUtils.getBean(BasJarService.class);
if (null != service) {
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 902fb2b..91adc3e 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -194,9 +194,9 @@
*/
private void readStatus(){
try {
- if (true){
- return;
- }
+// if (true){
+// return;
+// }
OperateResultExOne<byte[]> result = new OperateResultExOne<byte[]>();
if (slave.getId()>2 && slave.getId()<6){
result = siemensNet.Read("DB101.0", (short) 66);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 76c9777..0ea4c8f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -200,6 +200,9 @@
case 9:
write9((StaProtocol)task.getData());
break;
+ case 10:
+ write10((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -554,30 +557,28 @@
boolean rgv4 = staProtocol.isRGV4();
boolean rgv5 = staProtocol.isRGV5();
OperateResult result1 = null;
- OperateResult result2 = null;
String resultV1 = "";
- String resultV2 = "";
switch (staProtocol.getSiteId()){
case 623:
- resultV1 = "1804";
- resultV2 = "1804";
+ resultV1 = "DB100.1804";
break;
case 624:
- resultV1 = "1810";
- resultV2 = "1810";
+ resultV1 = "DB100.1810";
break;
case 625:
- resultV1 = "1816";
- resultV2 = "1816";
+ resultV1 = "DB100.1816";
break;
case 626:
- resultV1 = "1822";
- resultV2 = "1822";
+ resultV1 = "DB100.1822";
break;
default:
return;
}
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
//纭寲缃愪换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
try {
Thread.sleep(200);
@@ -590,7 +591,11 @@
try{
if(!result1.IsSuccess){
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
Thread.sleep(100);
writeCount++;
continue;
@@ -598,56 +603,26 @@
OperateResultExOne<byte[]> resultRead1 = siemensS7Net.Read(resultV1, (short) 2);
if (resultRead1.IsSuccess) {
boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead1.Content, 0, 1);
- boolean status1 = status[rgv4? 4:3];
- if (status1 == rgv4?rgv5:rgv4){
+ if (status[rgv4? 3:4]){
break;
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
+ } else {
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
+ }
Thread.sleep(100);
writeCount++;
continue;
}
} else {
log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result1 = siemensS7Net.Write(rgv4?resultV1+".4":resultV1+".3", rgv4?rgv5:rgv4);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- }catch (Exception e){
- log.error("鍐欏叆RGV鏁版嵁鍚庡洖璇诲嚭閿�,寮傚父锛�"+e);
- }
- writeCount++;
- } while (writeCount<6);
-
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- writeCount = 1;
- do {
- try{
- if(!result2.IsSuccess){
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- Thread.sleep(100);
- writeCount++;
- continue;
- }
- OperateResultExOne<byte[]> resultRead2 = siemensS7Net.Read(resultV2, (short) 1);
- if (resultRead2.IsSuccess) {
- boolean[] status = siemensS7Net.getByteTransform().TransBool(resultRead2.Content, 0, 1);
- boolean status1 = status[rgv4? 3:4];
- if (status1 == rgv4?rgv4:rgv5){
- break;
+ if (rgv4){
+ result1 = siemensS7Net.Write(resultV1+".3", rgv4);
} else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
- Thread.sleep(100);
- writeCount++;
- continue;
+ result1 = siemensS7Net.Write(resultV1+".4", rgv5);
}
- } else {
- log.error("鍐欏叆RGV鏁版嵁澶辫触锛岄噸鏂颁笅鍙戜换鍔� 鍐欏叆鐩存帴澶辫触 ===>> [id:{}],{},[鍐欏叆娆℃暟:{}]", slave.getId(), JSON.toJSON(staProtocol),writeCount);
- result2 = siemensS7Net.Write(rgv4?resultV2+".3":resultV2+".4", rgv4?rgv4:rgv5);
Thread.sleep(100);
writeCount++;
continue;
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index 223aa17..651a4c3 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -123,7 +123,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 27);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) 28);
if (result.IsSuccess) {
if (null == steProtocol) {
steProtocol = new SteProtocol();
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b722f2b..9f1ee57 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -284,50 +284,50 @@
rgvNo: 623
steNo: 1
jarRegin: 1
- burial: 1
+ burial: 5
staNoEnter[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 113
- row: 1
+ staNo: 612
+ row: 3
staNoEnter[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
- row: 3
+ staNo: 615
+ row: 1
# 鍏ョ～鍖栫綈RGV
enterRgv[1]:
rgvNo: 624
- steNo: 1
+ steNo: 2
jarRegin: 1
- burial: 1
+ burial: 6
staNoEnter[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 113
- row: 1
+ staNo: 619
+ row: 3
staNoEnter[1]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
- row: 3
+ staNo: 622
+ row: 1
# 鍑虹～鍖栫綈RGV
endRgv[0]:
rgvNo: 625
steNo: 1
jarNo: 1
jarRegin: 1
- burial: 1
+ burial: 5
staNoEnd[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
+ staNo: 627
row: 1
# 鍑虹～鍖栫綈RGV
endRgv[1]:
rgvNo: 626
- steNo: 1
- jarNo: 1
+ steNo: 2
+ jarNo: 3
jarRegin: 1
- burial: 1
+ burial: 6
staNoEnd[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 114
+ staNo: 628
row: 1
# 鏉＄爜鎵弿浠�
@@ -371,23 +371,16 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 612
+ rgvNo: 623
+ steNo: 1
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
@@ -398,7 +391,7 @@
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
rgvNo: 625
- row: 2
+ row: 1
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
@@ -407,8 +400,8 @@
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 3
- row: 2
+ steNo: 1
+ row: 1
# JAR2
jar[1]:
id: 2
@@ -418,44 +411,37 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 615
+ rgvNo: 623
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 623
- rgvNo: 102
- steNo: 102
+ staNo: 627
+ rgvNo: 625
+ steNo: 1
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 625
+ rgvNo: 623
row: 1
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
- row: 2
+ rgvNo: 625
+ row: 1
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
+ steNo: 1
row: 1
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
- row: 2
+ steNo: 1
+ row: 1
# JAR3
jar[2]:
id: 3
@@ -465,43 +451,36 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ rgvNo: 624
row: 1
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ rgvNo: 626
row: 2
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
- row: 1
+ steNo: 2
+ row: 2
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 173
+ steNo: 2
row: 2
# JAR4
jar[3]:
@@ -512,39 +491,32 @@
# 纭寲缃愬叆搴撶珯鐐�
jarInSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 101
- rgvNo: 102
- steNo: 102
- row: 1
- # 纭寲缃愬叆搴撶珯鐐�
- jarInSta[1]:
- devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
- row: 1
+ staNo: 619
+ rgvNo: 624
+ steNo: 2
+ row: 3
# 纭寲缃愬嚭搴撶珯鐐�
jarOutSta[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- staNo: 102
- rgvNo: 102
- steNo: 102
+ staNo: 628
+ rgvNo: 626
+ steNo: 2
row: 1
# 纭寲缃愬叆搴揜GV
jarInRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 623
+ rgvNo: 624
row: 1
# 纭寲缃愬嚭搴揜GV
jarOutRgv[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- rgvNo: 173
+ rgvNo: 626
row: 2
# 纭寲缃愬叆搴撶┛姊澘
jarInSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
- steNo: 1
- row: 1
+ steNo: 2
+ row: 2
# 纭寲缃愬嚭搴撶┛姊澘
jarOutSte[0]:
devpPlcId: ${wcs-slave.devp[1].id}
diff --git a/src/main/resources/mapper/BasJarMapper.xml b/src/main/resources/mapper/BasJarMapper.xml
index 59d31b4..d7138f5 100644
--- a/src/main/resources/mapper/BasJarMapper.xml
+++ b/src/main/resources/mapper/BasJarMapper.xml
@@ -27,11 +27,4 @@
</resultMap>
- <select id="selectByJarNo" resultMap="BaseResultMap">
- select top 1 * from asr_bas_jar
- where 1=1
- and jar_no=0
- order by id
- </select>
-
</mapper>
diff --git a/src/main/resources/mapper/BasJarMastMapper.xml b/src/main/resources/mapper/BasJarMastMapper.xml
index 9eab836..ae49b0b 100644
--- a/src/main/resources/mapper/BasJarMastMapper.xml
+++ b/src/main/resources/mapper/BasJarMastMapper.xml
@@ -88,17 +88,11 @@
</select>
<select id="selectJarMastOperationByStatusList" resultType="Integer">
- select count(1) from asr_bas_jar_mast
- where 1=1
- and
- (
- status in
- <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
- #{status}
- </foreach>
- )
- and jar_id = #{jarId}
- order by jar_loc_digit desc
+ SELECT count(1) FROM [dbo].[asr_bas_jar_mast] WHERE status in
+ <foreach collection="statusList" item="status" index="index" open="(" close=")" separator=",">
+ #{status}
+ </foreach>
+ AND jar_id = #{jarId}
</select>
<update id="updateStatus">
diff --git a/src/main/resources/mapper/WrkMastExecuteMapper.xml b/src/main/resources/mapper/WrkMastExecuteMapper.xml
index 2e3950d..67ce9cc 100644
--- a/src/main/resources/mapper/WrkMastExecuteMapper.xml
+++ b/src/main/resources/mapper/WrkMastExecuteMapper.xml
@@ -59,10 +59,10 @@
<select id="getWrkMastExecuteByWrkNo" resultMap="BaseResultMap">
select top 1 * from jar_wrk_mast_execute
where 1=1
- and jar_id = #{jarId}
+ and wrk_no = #{wrkNo}
</select>
- <select id="getWrkMastExecuteByJarId" resultMap="BaseResultMap">
+ <select id="getWrkMastExecuteByJarNo" resultMap="BaseResultMap">
select * from jar_wrk_mast_execute
where 1=1
and jar_id = #{jarId}
@@ -78,7 +78,15 @@
<select id="selectWrkMastExecuteByTypeAndIoTyperAndWrkType" resultMap="BaseResultMap">
select * from jar_wrk_mast_execute
where 1=1
- <include refid="batchSeq"></include>
+ <if test="type != null">
+ and type = #{type}
+ </if>
+ <if test="ioType != null">
+ and io_type = #{ioType}
+ </if>
+ <if test="wrkType != null">
+ and wrk_type = #{wrkType}
+ </if>
</select>
<select id="selectWrkMastExecuteByWrk" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/console.map23.js b/src/main/webapp/static/js/console.map23.js
index f0cb6cc..44414de 100644
--- a/src/main/webapp/static/js/console.map23.js
+++ b/src/main/webapp/static/js/console.map23.js
@@ -339,8 +339,8 @@
"height": 6
}, {
"type": "stn",
- "id": "site-624",
- "text": "624",
+ "id": "site-626",
+ "text": "626",
"top": 540,
"left": 930,
"width": 49,
--
Gitblit v1.9.1