From 0b522af315780054b37f78460191b49f88e0598a Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期五, 28 六月 2024 16:58:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 5 +
src/main/webapp/static/images/zy-logo.png | 0
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 147 ++++++++++++++++++++++++++++++++----
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 2
src/main/webapp/static/images/logo.png | 0
src/main/java/com/zy/core/MainProcess.java | 70 ++++++++--------
src/main/webapp/static/images/favicon.ico | 0
7 files changed, 172 insertions(+), 52 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 e83ec31..19179d0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -4421,6 +4421,9 @@
*/
public synchronized void jarMastGenerate() {
for (JarSlave jarSlave : slaveProperties.getJar()) {
+ if (jarSlave.getId()>4){
+ continue;
+ }
try{
if (wrkMastExecuteService.getWrkMastExecuteByJarIdCount(jarSlave.getId())!=0){
continue;
@@ -4509,6 +4512,14 @@
return false;
}
if (jarProtocol.modeType != JarModeType.AUTO){
+ return false;
+ }
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
return false;
}
@@ -4626,6 +4637,10 @@
if (jarProtocol.modeType != JarModeType.AUTO){
continue;
}
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ continue;
+ }
JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
@@ -4701,6 +4716,10 @@
signExecute[jarSlave.getId()-5] = true;
continue;
}
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ continue;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
@@ -4743,6 +4762,10 @@
continue;
}
if (jarProtocol.modeType != JarModeType.AUTO){
+ continue;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
continue;
}
@@ -4836,7 +4859,13 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2) || jarProtocol.statusType .equals(JarStatusType.SOS)){
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ continue;
+ }
JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
if (jarOtherProtocol == null) {
@@ -4862,15 +4891,16 @@
log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
}
return true;
- } else if ((jarProtocol.statusType == JarStatusType.WAITING3 || jarProtocol.statusType == JarStatusType.MOVING) && jarProtocol.isLeftDoor()){
+ } else if (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));
}
return true;
- } else if (jarProtocol.statusType == JarStatusType.IDLE && jarProtocol.isLeftDoor()){
- log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬬～鍖栫綈绌洪棽浣嗘槸闂ㄦ湭鍏�===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
}
+// else if (jarProtocol.statusType == JarStatusType.IDLE && jarProtocol.isLeftDoor()){
+// log.error("JarWrkMastExecute浠诲姟鍒涘缓===>鎵ц寮傚父===銆嬬～鍖栫綈绌洪棽浣嗘槸闂ㄦ湭鍏�===銆嬪紓甯告暟鎹細BasJar:"+ JSON.toJSONString(basJar)+";BasJarMast:"+JSON.toJSONString(basJarMast));
+// }
}
return false;
} else {
@@ -4924,6 +4954,14 @@
return false;
}
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2) || jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -4997,6 +5035,14 @@
return false;
}
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5064,6 +5110,11 @@
return false;
}
if (jarProtocol.modeType != JarModeType.AUTO){
+ return false;
+ }
+
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
return false;
}
@@ -5143,7 +5194,10 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5498,7 +5552,14 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5619,7 +5680,14 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2) || jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5740,7 +5808,14 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2) || jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5849,7 +5924,14 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.WAITING2) || jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -5958,7 +6040,14 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -6067,6 +6156,14 @@
return false;
}
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -6117,7 +6214,7 @@
if (SteAndJarUtil.steAndJarNowRow(staProtocolRGV.getNowRow() , jarProtocol.getJarNo())){
//鍒ゆ柇灏忚溅鐘舵��
- if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.IDLE)){
+ if (!jarWrkMastExecuteGenerateSteStatus(basJar.getEnterSteNo(),2,SteStatusType.WAITING2)){
return false;
}
//璋冭溅 == > 鍙栬揣
@@ -6179,7 +6276,10 @@
if (jarProtocol.modeType != JarModeType.AUTO){
return false;
}
-
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -6340,7 +6440,10 @@
// if (jarProtocol.modeType != JarModeType.AUTO){
// return false;
// }
-
+// if (jarProtocol.getJarTemperature()>50){
+// log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+// return false;
+// }
BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
if (Cools.isEmpty(basJar)){
log.error("{}鍙峰喎鍗存Ы鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",wrkMastExecute.getJarId());
@@ -6509,6 +6612,14 @@
return false;
}
+ if (jarProtocol.statusType .equals(JarStatusType.SOS)){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧姝ｅ湪纭寲涓紝浠诲姟寮傚父锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
+ }
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
log.error("{}鍙风～鍖栫綈鏌ヨ璁惧妗ｆ鏃犱俊鎭紒锛侊紒",jarProtocol.getJarNo());
@@ -6800,7 +6911,7 @@
if (wrkMastExecute.getWrkSts()==3){//==>4
//1锛歊GV灏忚溅绉诲姩銆�2锛歊GV灏忚溅鍒颁綅銆�3锛歋te绌挎鐗堝彇璐с��4锛氬彇璐у畬鎴愮瓑寰呬笅涓�姝ャ��5锛歋te绌挎鐗堟斁璐ц嚦鍐峰嵈姹犮��6锛氭斁璐у畬鎴愩��7锛氭洿鏂板畬鎴� //io_type = 6
//ste浠诲姟绛夊緟瀹屾垚
- if (steProtocol.statusType.equals(SteStatusType.WAITING2)){
+ if (steProtocol.statusType.equals(SteStatusType.WAITING)){
//ste浠诲姟瀹屾垚
if (jarSteTake(wrkMastExecute,null,null,null,true,SteAndJarUtil.getBJarNo(wrkMastExecute.getJarId()))){
wrkMastExecute.setWrkSts(4);
@@ -6909,6 +7020,10 @@
}
if (jarProtocol.modeType != JarModeType.AUTO){
continue;
+ }
+ if (jarProtocol.getJarTemperature()>50){
+ log.error("{}鍙风～鍖栫綈鏌ヨ璁惧娓╁害杩囬珮锛岀瓑寰呴檷娓�....锛侊紒锛�",jarProtocol.getJarNo());
+ return false;
}
BasJar basJar = basJarMapper.selectById(jarProtocol.getJarNo());
if (Cools.isEmpty(basJar)){
@@ -7186,8 +7301,8 @@
} else if (jarWrkMastExecuteGenerateSteStatus(steSlave.getId(),3,SteStatusType.IDLE)){
List<WrkMastExecute> wrkMastExecutes = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
if (wrkMastExecutes.isEmpty()){
- List<WrkMastExecute> wrkMastExecutesB = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 9, null);
- List<WrkMastExecute> wrkMastExecutesA = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 6, null);
+ List<WrkMastExecute> wrkMastExecutesB = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 6, null);
+ List<WrkMastExecute> wrkMastExecutesA = wrkMastExecuteService.selectWrkMastExecuteByTypeAndIoTyperAndWrkType(null, 5, null);
if (!wrkMastExecutesB.isEmpty() || !wrkMastExecutesA.isEmpty()){
WrkMastExecute wrkMastExecute = !wrkMastExecutesB.isEmpty() ? wrkMastExecutesB.get(0) : wrkMastExecutesA.get(0);
BasJar basJar = basJarMapper.selectById(wrkMastExecute.getJarId());
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c7110b0..0395337 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -65,41 +65,41 @@
// mainService.ioConvert();
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
-// mainService.generateStoreWrkFile(); // 缁勬墭
-// mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
-// mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
-// mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
-// // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
-// mainService.crnStnToOutStn();
-// // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
-// mainService.crnStnToOutStnTwo();
-// // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
-// mainService.crnIoExecute();
-// // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
-// mainService.crnIoExecuteTwo();
-// // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
-// mainService.crnIoExecuteTwoExecute(i);//Execute
-// if (i%2==0){
-// // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
-// mainService.storeFinished();
-// }else {
-// // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
-// mainService.storeFinishedTwo();
-// }
-//
-//
-//// // 寮傚父淇℃伅璁板綍
-//// mainService.recErr();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
-// mainService.storeEmptyPlt();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 灏忔枡绠�
-// mainService.storeEmptyPltSingle();
-// // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
-// mainService.storeEmptyPltLarge();
-// // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
-// mainService.ledExecute();
-// // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
-// mainService.ledReset();
+ mainService.generateStoreWrkFile(); // 缁勬墭
+ mainService.generateStoreWrkFileSingle(); // 缁勬墭 鍙屽伐浣嶅崟浼� 灏忔枡绠�
+ mainService.generateStoreWrkFileLarge(); // 缁勬墭 鍙屽伐浣嶅崟浼� 澶ф枡绠�
+ mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯
+ mainService.crnStnToOutStn();
+ // 鍑哄簱 ===>> 鍫嗗灈鏈哄嚭搴撶珯鍒板嚭搴撶珯 宸ヤ綅2
+ mainService.crnStnToOutStnTwo();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
+ mainService.crnIoExecute();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満
+ mainService.crnIoExecuteTwo();
+ // 鍏ュ嚭搴� ===>> 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂 鍙屽伐浣嶅爢鍨涙満 鎷嗗垎鎵ц浠诲姟涓嬪彂
+ mainService.crnIoExecuteTwoExecute(i);//Execute
+ if (i%2==0){
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣�
+ mainService.storeFinished();
+ }else {
+ // 鍏ュ簱 ===>> 鎵ц瀵瑰伐浣滄。鐨勫畬鎴愭搷浣� 宸ヤ綅2
+ mainService.storeFinishedTwo();
+ }
+
+
+// // 寮傚父淇℃伅璁板綍
+// mainService.recErr();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱
+ mainService.storeEmptyPlt();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 灏忔枡绠�
+ mainService.storeEmptyPltSingle();
+ // 鍏ュ簱 ===>> 绌烘爤鏉垮垵濮嬪寲鍏ュ簱 鍙屽伐浣嶅崟浼� 澶ф枡绠�
+ mainService.storeEmptyPltLarge();
+ // 鍑哄簱 ===>> 宸ヤ綔妗ｄ俊鎭啓鍏ed鏄剧ず鍣�
+ mainService.ledExecute();
+ // 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
+ mainService.ledReset();
/************************************JAR璋冨害************************************/
//JarWrkMastExecute浠诲姟瀹屾垚
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
index 21fb8a1..41b0859 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -109,6 +109,8 @@
* */
public Integer rightDoorClose;
+ public Integer jarTemperature;
+
/**
* 寮傚父鐮�
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 8fdd966..729dc64 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -133,9 +133,11 @@
jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+ jarProtocol.setJarTemperature(0);
return;
}
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 28);
if (result.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
@@ -167,6 +169,7 @@
jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡
jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
+ jarProtocol.setJarTemperature((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//娓╁害
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
diff --git a/src/main/webapp/static/images/favicon.ico b/src/main/webapp/static/images/favicon.ico
new file mode 100644
index 0000000..86d5e0a
--- /dev/null
+++ b/src/main/webapp/static/images/favicon.ico
Binary files differ
diff --git a/src/main/webapp/static/images/logo.png b/src/main/webapp/static/images/logo.png
new file mode 100644
index 0000000..231c97e
--- /dev/null
+++ b/src/main/webapp/static/images/logo.png
Binary files differ
diff --git a/src/main/webapp/static/images/zy-logo.png b/src/main/webapp/static/images/zy-logo.png
index d40e8cb..493da9d 100644
--- a/src/main/webapp/static/images/zy-logo.png
+++ b/src/main/webapp/static/images/zy-logo.png
Binary files differ
--
Gitblit v1.9.1