From 4b5c859fbd9951e18d195cf0e5053bfc551a4aab Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 16 六月 2025 16:21:49 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 22 +++++++++++-----------
src/main/resources/application-prod.yml | 5 ++++-
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 2 +-
4 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
index 1fd96aa..a12b7b1 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -29,7 +29,7 @@
@Value("${wms.url}")
private String wmsUrl;
- @Value("${wms.taskExecCallback}")
+ @Value("${wms.TaskExecCallback}")
private String TaskExecCallback;
@Autowired
private ApiLogService apiLogService;
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 6f10a9c..ee48c9c 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -54,7 +54,7 @@
/**
* 浠诲姟寮�濮嬫椂锛學CS鍥炶皟WMS
*/
- @Value("${wms.taskExecCallback}")
+ @Value("${wms.TaskExecCallback}")
private String taskExecCallback;
/**
* 浠诲姟瀹屾垚缁撴潫鏃讹紝WCS鍥炶皟WMS
@@ -62,17 +62,17 @@
@Value("${wms.taskStatusFeedbackPath}")
private String taskStatusFeedbackPath;
- @Value("${wms.code}")
- private String code;
+// @Value("${wms.code}")
+// private String code;
- @Value("${wms.successCode}")
- private String successCode;
-
- @Value("${wms.msg}")
- private String msg;
-
- @Value("${wms.data}")
- private String data;
+// @Value("${wms.successCode}")
+// private String successCode;
+//
+// @Value("${wms.msg}")
+// private String msg;
+//
+// @Value("${wms.data}")
+// private String data;
@Override
public void addReportLog(TaskWrk taskWrk) {
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index 50461f8..1e31a15 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -43,7 +43,7 @@
@Value("${wms.url}")
private String wmsUrl;
- @Value("${wms.taskExecCallback}")
+ @Value("${wms.TaskExecCallback}")
private String TaskExecCallback;
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index c9aa539..22322e1 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -23,7 +23,7 @@
lev: 1
backSta: 100
devpPlcId: 1
-
+
devp[0]:
id: 1
ip:
@@ -32,10 +32,13 @@
slot: 0
emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
staNo: 100
+ backSta: 100
inSta[0]: #鍏ュ簱鍙�1
staNo: 100
+ backSta: 100
outSta[0]: #鍑哄簱鍙�1
staNo: 100
+ backSta: 100
--
Gitblit v1.9.1