From 50141a5865b8ca6a549ec97dd8cef0878c0bdd95 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 03 三月 2026 15:48:16 +0800
Subject: [PATCH] #26-03-10-00
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 31 +++++++------------------------
1 files changed, 7 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 2356ae6..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()
@@ -278,27 +280,8 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject != null && jsonObject.getInteger("code") != null && jsonObject.getInteger("code") == 200) {
log.info("鍏ュ簱浠诲姟鐢宠鎴愬姛锛岀瓑寰匴MS涓嬪彂浠诲姟銆傛潯鐮侊細{}锛岀珯鐐癸細{}", barcode, inSta.getStaNo());
- staProtocol.setStaNo((short)0);
- staProtocol.setWorkNo(0);//璁剧疆涓�9998绛夊緟涓婁綅鏈轰笅鍙戜换鍔�/9997鏄┖鏉垮叆搴撳垽鏂紝寰呬笅鍙戞椂涔熷啓鍏�9998
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
- if (!result) {
- LedErrorThreadUtil.ledErrorThread("鏇存柊plc绔欑偣淇℃伅澶辫触!绔欑偣鍙凤細"+inSta.getStaNo(),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
- Thread.sleep(300);
- StaProtocol staProtocol2 = devpThread.getStation().get(inSta.getStaNo());
- if (staProtocol2 == null) {
- continue;
- } else {
- staProtocol2 = staProtocol2.clone();
- }
- staProtocol2.setStaNo(inSta.getStaNo().shortValue());
- staProtocol2.setWorkNo(9998);//璁剧疆涓�9998绛夊緟涓婁綅鏈轰笅鍙戜换鍔�/9997鏄┖鏉垮叆搴撳垽鏂紝寰呬笅鍙戞椂涔熷啓鍏�9998
- boolean result2 = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol2));
- if (!result2) {
- LedErrorThreadUtil.ledErrorThread("鏇存柊plc绔欑偣淇℃伅澶辫触!绔欑偣鍙凤細"+inSta.getStaNo(),inSta.getLed(), LedErrorAreaType.ONE_OTHER.getDesc());
- throw new CoolException("鏇存柊plc绔欑偣淇℃伅澶辫触");
- }
+ devpThread.setPakMk(staProtocol.getSiteId(), false,9998);
+
} else {
// // 鑾峰彇宸ヤ綔鍙�
@@ -457,7 +440,7 @@
// // 鍏ュ嚭搴撴ā寮忓垽鏂�
// if (devpThread.ioMode != IoModeType.PAKIN_MODE) { continue; }
- if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk()) {
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.isInEnable() && staProtocol.isPakMk() ) {
// WrkMast wrkMast = wrkMastMapper.selectPickStep(barcode);
WrkMast wrkMast = wrkMastMapper.selectPakInStep5(staProtocol.getSiteId(),"7");
if (wrkMast == null) {
--
Gitblit v1.9.1