From 9d5c54be580f637daa60ce231b67b6236742e570 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 15:31:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/TaskLogScheduler.java | 4 ----
src/main/java/com/zy/asrs/controller/CrnController.java | 8 --------
src/main/resources/application.yml | 6 +++---
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index e9c72e9..5b152d6 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -16,7 +16,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.service.BasCrnpService;
-import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.zy.asrs.utils.CommandUtils;
import com.zy.asrs.utils.CrnOperaUtils;
@@ -35,7 +34,6 @@
import com.zy.core.properties.SystemProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -51,18 +49,12 @@
@RestController
public class CrnController {
- @Value("${wms.url}")
- private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
@Autowired
private SlaveProperties slaveProperties;
@Autowired
private BasCrnErrorMapper basCrnErrorMapper;
@Autowired
private BasCrnpService basCrnpService;
- @Autowired
- private LocMastService locMastService;
@Autowired
private CrnOperaUtils crnOperaUtils;
@Autowired
diff --git a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
index 9f0112d..0cbe8a0 100644
--- a/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskLogScheduler.java
@@ -35,14 +35,10 @@
@Value("${wms.url}")
private String wmsUrl;
- @Value("${wms.movePath}")
- private String movePath;
@Value("${wms.inboundTaskApplyPath}")
private String inboundTaskApplyPath;
@Value("${wms.TaskExecCallback}")
private String TaskExecCallback;
- @Value("${wms.taskStatusFeedbackPath}")
- private String taskStatusFeedbackPath;
@Autowired
private NotifyUtils notifyUtils;
@Autowired
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e75e868..ea1a810 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -51,10 +51,10 @@
# WMS绯荤粺ip
url: 192.168.10.12:8001
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
- inboundTaskApplyPath: /wes/api/AcceptTaskStatus
+ inboundTaskApplyPath: /wes/api/drivers/zy/asrs/inboundTaskApply
# 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMSz
- taskStatusFeedbackPath: /wes/api/TaskExecCallback
+ taskStatusFeedbackPath: /wes/api/drivers/zy/asrs/callBack
# 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
- TaskExecCallback: /wes/api/TaskExecFinishedCallback
+ TaskExecCallback: /wes/api/drivers/zy/asrs/callBack
# 绉诲簱鐢宠鎺ュ彛
movePath: /wes/api/get_InterFace_TestStorage
--
Gitblit v1.9.1