From bf6277be604cd4a6a4664731d9b9697d9e0e5ab1 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期一, 17 二月 2025 14:24:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 -
src/main/resources/application.yml | 79 ---------------------------------------
2 files changed, 0 insertions(+), 82 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 3a3d145..2db8c2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -26,7 +26,6 @@
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.*;
@@ -39,8 +38,6 @@
@Service("mainService")
public class MainServiceImpl {
- @Value("${wms.url}")
- private String wmsUrl;
@Autowired
private SlaveProperties slaveProperties;
@Autowired
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6b973ab..23331b2 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -39,90 +39,11 @@
swagger:
enable: false
-wms:
- url: 10.10.10.40:8080/tzskwms
-
pythonCalcPath: D:\\path\\cpu.py
pythonCalcSimilarity: D:\\path\\similarity.py
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # 杈撻�佺嚎
- devp[0]:
- id: 1
- ip: 10.10.10.51
- port: 102
- rack: 0
- slot: 0
- # 鍏ュ簱鍙�1
- inSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 鍏ュ簱鍙�2
- inSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�1
- emptyInSta[0]:
- staNo: 100
- backSta: 101
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 绌烘澘鍏ュ簱鍙�2
- emptyInSta[1]:
- staNo: 103
- backSta: 102
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- # 鍑哄簱鍙�1
- outSta[0]:
- staNo: 100
- led: ${wcs-slave.led[0].id}
- # 鍑哄簱鍙�2
- outSta[1]:
- staNo: 103
- led: ${wcs-slave.led[0].id}
- # 鎷ｆ枡鍏ュ簱鍙�
- pickInSta[0]:
- staNo: 100
- backSta: 100
- barcode: ${wcs-slave.barcode[0].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
- pickInSta[1]:
- staNo: 103
- backSta: 103
- barcode: ${wcs-slave.barcode[1].id}
- led: ${wcs-slave.led[0].id}
- liftNo: ${wcs-slave.forkLift[0].id}
-
- # 鏉＄爜鎵弿浠�
- barcode[0]:
- id: 1
- ip: 10.10.10.102
- port: 51236
- # 鏉＄爜鎵弿浠�
- barcode[1]:
- id: 2
- ip: 10.10.10.102
- port: 51236
-
- # LED1
- led[0]:
- id: 1
- ip: 10.10.10.151
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 99
-
# 鍥涘悜绌挎杞�1
shuttle[0]:
id: 1
--
Gitblit v1.9.1