From 76cf10a7c0e487c246c7fa3d653d105206400944 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 14 十月 2022 14:38:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++++++++++---
src/main/java/com/zy/asrs/service/BasDevpService.java | 2 ++
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 2 ++
src/main/java/com/zy/core/MainProcess.java | 7 +++++--
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 5 +++++
src/main/resources/mapper/BasDevpMapper.xml | 7 +++++++
6 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 668d2ca..d515086 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -15,4 +15,6 @@
List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
+
+ BasDevp selectByWrkNo(Integer wrkNo);
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 8628feb..5b27cc9 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -44,4 +44,6 @@
*/
BasDevp checkSiteStatus(Integer devpNo, boolean put);
+ BasDevp selectByWrkNo(Integer wrkNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index 1f87a7d..db5037b 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -64,4 +64,9 @@
}
return station;
}
+
+ @Override
+ public BasDevp selectByWrkNo(Integer wrkNo) {
+ return this.baseMapper.selectByWrkNo(wrkNo);
+ }
}
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 b76244b..2548b3d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -696,9 +696,17 @@
}
// 杩囨护
- if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
- log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
- continue;
+ WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
+ if (null != pakoutWrkMast) {
+ if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
+ && pakoutWrkMast.getWrkSts() == 17
+ && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
+ ) {
+
+ } else {
+ log.error("{}鍏ュ簱浠诲姟鏃犳硶浣滀笟锛屽洜瀛樺湪鍑哄簱涓换鍔�!", wrkMast.getWrkNo());
+ continue;
+ }
}
// 缃《浠诲姟
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 6826c57..8a9b0b2 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -32,7 +32,7 @@
try {
// 闂撮殧
- Thread.sleep(1000);
+ Thread.sleep(500);
// 绯荤粺杩愯鐘舵�佸垽鏂�
if (!SystemProperties.WCS_RUNNING_STATUS.get()) {
@@ -42,10 +42,13 @@
// 婕旂ず
mainService.demo();
-
// 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
mainService.generateStoreWrkFile(); // 缁勬墭
mainService.generateStoreWrkFile0(); // WMS鍏ュ簱
+
+ // 闂撮殧
+ Thread.sleep(500);
+
// 鎷ｆ枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱
mainService.stnToCrnStnPick0();
mainService.stnToCrnStnPick1();
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index b00be22..4583b6e 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -66,4 +66,11 @@
group by abd.dev_no
</select>
+ <select id="selectByWrkNo" resultMap="BaseResultMap">
+ select top 1 *
+ from asr_bas_devp
+ where 1=1
+ and wrk_no = #{wrkNo}
+ </select>
+
</mapper>
--
Gitblit v1.9.1