From 253f9cb5ab38c88c231de6e84ab962460853e37d Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:43:37 +0800
Subject: [PATCH] #26-03-10-00
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 ++++--
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 9 +++++++--
2 files changed, 11 insertions(+), 4 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 5a824d9..f89c275 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -88,6 +88,8 @@
@Value("${wms.url}")
private String wmsUrl;
+ @Value("${wms.urlWMS}")
+ private String urlWMS;
@Value("${inventory.number}")
private Integer inventoryNumber;
@@ -220,7 +222,7 @@
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
- && staProtocol.getWorkNo() == 0
+ && staProtocol.getWorkNo() == 9999
&& staProtocol.isPakMk()) {// && !Cools.isEmpty(barcode)) {
// if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
@@ -268,7 +270,7 @@
applyParam.setStatus(1); // 1:婊℃澘
String response = new HttpHandler.Builder()
- .setUri(wmsUrl)
+ .setUri(urlWMS)
.setPath("/inboundTaskApply")
.setJson(JSON.toJSONString(applyParam))
.build()
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 5195001..e299733 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -344,7 +344,12 @@
// 妫�鏌ヨPLC鏄惁绠＄悊璇ョ珯鐐�
if (devpThread.getStation().containsKey(sourceStaNo.shortValue())) {
StaProtocol staProtocol = devpThread.getStation().get(sourceStaNo.shortValue());
- if (staProtocol != null && staProtocol.getWorkNo() == 9998) {
+ if (staProtocol == null) {
+ continue;
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ if (staProtocol != null && staProtocol.getWorkNo() == 9999) {
staProtocol.setWorkNo(wrkMast.getWrkNo());
if (wrkMast.getStaNo() != null) {
@@ -352,7 +357,7 @@
}
// 涓嬪彂PLC鎸囦护
- devpThread.setPakMk(staProtocol.getSiteId(), false, 283);
+ devpThread.setPakMk(staProtocol.getSiteId(), false, 9999);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
if (result) {
--
Gitblit v1.9.1