From f8c14df2d6ceb57d1e8a389b62d6996d90a073fd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 19:35:37 +0800
Subject: [PATCH] #盘点逻辑修改
---
src/main/java/com/zy/asrs/utils/Utils.java | 30 ++++++++++++++++--------------
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 22 ++++++++++++++++++++++
src/main/resources/application.yml | 8 ++++----
3 files changed, 42 insertions(+), 18 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 071aa78..5589a68 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1287,6 +1287,28 @@
return false;//绔欑偣涓嶅彲鍏�
}
+ Integer barcodeId = Utils.getBarcodeIdByStaNo(wrkMast.getSourceStaNo());
+ if (barcodeId == null) {
+ News.info("{}浠诲姟锛寋}婧愮珯锛屾壘涓嶅埌鍙敤鏉＄爜鍣↖D", wrkMast.getWrkNo(), sourceBasDevp.getDevNo());
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId);
+ if (barcodeThread == null) {
+ News.info("{}浠诲姟锛寋}婧愮珯锛屾潯鐮佸櫒{}绾跨▼涓虹┖", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId);
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+ String barcode = barcodeThread.getBarcode();
+ if(!Cools.isEmpty(barcode)) {
+ if(!("NG".endsWith(barcode) || "NoRead".equals(barcode) || "empty".equals(barcode))) {
+ //瀛樺湪鏉＄爜鍊硷紝鍒ゆ柇鏄惁鍜屽綋鍓嶅伐浣滄。涓�鑷�
+ if (!barcode.equals(wrkMast.getBarcode())) {
+ News.info("{}浠诲姟锛屾潯鐮佸櫒{}鍊納}涓庡伐浣滄。鏉＄爜鍊间笉涓�鑷达紝绯荤粺璺宠繃鎵ц", wrkMast.getWrkNo(), sourceBasDevp.getDevNo(), barcodeId, barcode);
+ return false;//绔欑偣涓嶅彲鍏�
+ }
+ }
+ }
+
//鍒ゆ柇鎻愬崌鏈烘暣涓笁妤兼槸鍚﹂兘澶勪簬鍏ュ簱妯″紡
Integer outInModel1 = Utils.getOutInModelByLift(sourceBasDevp.getLiftNo(), 1);
Integer outInModel2 = Utils.getOutInModelByLift(sourceBasDevp.getLiftNo(), 5);
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 0dbc2bc..8747c14 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -9,35 +9,22 @@
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.impl.MainServiceImpl;
-import com.zy.common.model.NavigateNode;
-import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.service.CommonService;
import com.zy.common.utils.NavigateMapData;
import com.zy.common.utils.NavigatePositionConvert;
-import com.zy.common.utils.NavigateUtils;
import com.zy.common.utils.ShuttleDispatchUtils;
import com.zy.core.DevpThread;
-import com.zy.core.Slave;
-import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
-import com.zy.core.enums.ShuttleRunDirection;
-import com.zy.core.enums.ShuttleTaskModeType;
import com.zy.core.enums.SlaveType;
+import com.zy.core.model.DevpSlave;
import com.zy.core.model.ShuttleSlave;
-import com.zy.core.model.Task;
-import com.zy.core.model.command.ShuttleAssignCommand;
-import com.zy.core.model.command.ShuttleCommand;
import com.zy.core.model.protocol.NyShuttleProtocol;
-import com.zy.core.model.protocol.ShuttleProtocol;
import com.zy.core.model.protocol.StaProtocol;
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.NyShuttleThread;
-import com.zy.core.thread.ShuttleThread;
import java.text.DecimalFormat;
import java.util.*;
@@ -683,4 +670,19 @@
throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
}
+ /**
+ * 閫氳繃鍏ュ簱绔欑偣鍙疯幏鍙栨潯鐮佸櫒ID
+ */
+ public static Integer getBarcodeIdByStaNo(int staNo) {
+ SlaveProperties slaveProperties = SpringUtils.getBean(SlaveProperties.class);
+ for (DevpSlave devpSlave : slaveProperties.getDevp()) {
+ for (DevpSlave.Sta sta : devpSlave.getInSta()) {
+ if (sta.getStaNo().equals(staNo)) {
+ return sta.getBarcode();
+ }
+ }
+ }
+ return null;
+ }
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3a1d2b0..d552a15 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -243,25 +243,25 @@
pickInSta[7]:
staNo: 325
backSta: 341
- barcode: ${wcs-slave.barcode[6].id}
+ barcode: ${wcs-slave.barcode[7].id}
led: ${wcs-slave.led[7].id}
liftNo: ${wcs-slave.lift[0].id}
pickInSta[8]:
staNo: 331
backSta: 341
- barcode: ${wcs-slave.barcode[6].id}
+ barcode: ${wcs-slave.barcode[7].id}
led: ${wcs-slave.led[8].id}
liftNo: ${wcs-slave.lift[0].id}
pickInSta[9]:
staNo: 333
backSta: 341
- barcode: ${wcs-slave.barcode[6].id}
+ barcode: ${wcs-slave.barcode[7].id}
led: ${wcs-slave.led[9].id}
liftNo: ${wcs-slave.lift[0].id}
pickInSta[10]:
staNo: 339
backSta: 341
- barcode: ${wcs-slave.barcode[6].id}
+ barcode: ${wcs-slave.barcode[7].id}
led: ${wcs-slave.led[10].id}
liftNo: ${wcs-slave.lift[0].id}
# # 璐ф灦鍏ュ簱绔欑偣
--
Gitblit v1.9.1