From f0e2feba85291e700eae3b0a8cedd28f37b44c02 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 19 四月 2025 20:04:34 +0800
Subject: [PATCH] 999

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    5 +++--
 src/main/resources/application.yml                          |    3 +++
 2 files changed, 6 insertions(+), 2 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 d8c52b0..8d84d27 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -40,6 +40,7 @@
 import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -98,6 +99,8 @@
     private LiftAction liftAction;
     @Autowired
     private BasWrkStatusService wrkStatusService;
+    @Value("${asrs.wmsUrl}")
+    private String wmsUrl;
 
 
     public boolean isInEnable(DevpThread devpThread, Integer staNo) {
@@ -199,7 +202,6 @@
                             continue;
                         }
                         try {
-                            String wmsUrl = "192.168.10.201:8080/fyxcwms";
                             SearchLocParam param = new SearchLocParam();
                             param.setBarcode(barcode);
                             param.setIoType(1);
@@ -278,7 +280,6 @@
                         WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_sta_no", inSta.getStaNo()).eq("barcode", barcode));
                         if (wrkMast == null) {
                             try {
-                                String wmsUrl = "192.168.10.201:8080/fyxcwms";
                                 SearchLocParam param = new SearchLocParam();
                                 param.setBarcode(barcode);
                                 param.setIoType(1);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fe46e6f..d787f6f 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,6 +36,9 @@
 super:
   pwd: xltys1995
 
+asrs:
+  wmsUrl: 192.168.10.201:8080/fyxcwms
+
 swagger:
   enable: false
 

--
Gitblit v1.9.1