From 92167e0e41a8b63c4aa53dc8d75e83bbac70169b Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 18 九月 2025 11:16:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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 0255e07..bef29db 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -50,6 +50,7 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -249,6 +250,7 @@
                         param.setLocType1(locTypeDto.getLocType1());
                         String response = new HttpHandler.Builder()
                                 .setUri(wmsUrl)
+                                .setTimeout(30, TimeUnit.SECONDS)
                                 .setPath("/rpc/pakin/loc/v1")
                                 .setJson(JSON.toJSONString(param))
                                 .build()
@@ -594,7 +596,7 @@
                     staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                     devpThread.setPakMk(staProtocol.getSiteId(), false);
                     boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-
+                    barcodeThread.setBarcode("");
 
                     if (!result) {
                         News.error(methodName + ":鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
@@ -1736,6 +1738,7 @@
                         param.setLocType1(locTypeDto.getLocType1());
                         String response = new HttpHandler.Builder()
                                 .setUri(wmsUrl)
+                                .setTimeout(30, TimeUnit.SECONDS)
                                 .setPath("/rpc/pakin/loc/v1")
                                 .setJson(JSON.toJSONString(param))
                                 .build()
@@ -2435,6 +2438,7 @@
             try {
                 String response = new HttpHandler.Builder()
                         .setUri(wmsUrl)
+                        .setTimeout(30, TimeUnit.SECONDS)
                         .setPath("/rpc/auto/emptyOut/v1")
                         .build()
                         .doPost();
@@ -2473,6 +2477,7 @@
 
                 String response = new HttpHandler.Builder()
                         .setUri(wmsUrl)
+                        .setTimeout(30, TimeUnit.SECONDS)
                         .setPath("/rpc/auto/emptyIn/v1")
                         .setJson(JSON.toJSONString(locTypeDto))
                         .build()

--
Gitblit v1.9.1