From 4514daed44b9bc2bdacafb1c214eb2284a683a23 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期三, 21 九月 2022 12:56:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ------
src/main/webapp/static/js/console.map.js | 32 ++++++++++++++++----------------
src/main/java/com/zy/core/MainProcess.java | 4 ++--
3 files changed, 18 insertions(+), 24 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 d2493a3..dfdfe20 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1256,12 +1256,6 @@
staProtocol = staProtocol.clone();
}
-// // 鍏ュ嚭搴撴ā寮忓垽鏂�
-// if ( emptyInSta.getStaNo()==203 && devpThread.ioModeOf2F != IoModeType.PAKIN_MODE) { continue; }
- if (emptyInSta.getStaNo() == 203 && devpThread.ioModeOf2F == IoModeType.PAKOUT_MODE) {
- continue;
- }
-
// 绔欑偣鏉′欢鍒ゆ柇
if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable()
&& staProtocol.isEmptyMk() && (staProtocol.getWorkNo() > 9990 && staProtocol.getWorkNo() <= 9999) && staProtocol.isPakMk()) {
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index c88a863..bd5826d 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -73,8 +73,8 @@
//绌烘墭鐩樿嚜鍔ㄥ嚭搴�
mainService.autoEmptyOut();
- //绌烘墭鐩樿嚜鍔ㄥ叆搴�
- mainService.autoEmptyIn();
+// //绌烘墭鐩樿嚜鍔ㄥ叆搴�
+// mainService.autoEmptyIn();
// 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹�
i++;
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index c4d9b8b..36eeddd 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -15,7 +15,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -25,7 +25,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -35,7 +35,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -45,7 +45,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -55,7 +55,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -65,7 +65,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -75,7 +75,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -85,7 +85,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -95,7 +95,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -105,7 +105,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -115,7 +115,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -125,7 +125,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -135,7 +135,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -145,7 +145,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -155,7 +155,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
},
{
"type":"rack",
@@ -165,7 +165,7 @@
"width":846,
"height":24,
"minBayNo":2,
- "maxBayNo":15
+ "maxBayNo":31
}
],
"rackDescs":[
--
Gitblit v1.9.1