From 5477e673d28e407d52b887f624af87d8bcaff7ed Mon Sep 17 00:00:00 2001
From: dubin <dubin@163.com>
Date: 星期三, 28 五月 2025 16:31:49 +0800
Subject: [PATCH] 电视机ip配置更新和为wms提供输送站点是否有物
---
src/main/java/com/zy/asrs/controller/OpenController.java | 1 +
src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java | 1 +
src/main/resources/application-prod.yml | 8 +++++++-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index fb74bc6..52da4d3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -241,6 +241,7 @@
crnStatusParam.setDevpNo(basDevp.getDevNo());
crnStatusParam.setOutEnable(basDevp.getOutEnable());
crnStatusParam.setInEnable(basDevp.getInEnable());
+ crnStatusParam.setLoading(basDevp.getLoading());
if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
crnStatusParam.setCrnSts(3);
}else{
diff --git a/src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java b/src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java
index 52192ee..17a09c2 100644
--- a/src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CrnStatusParam.java
@@ -11,4 +11,5 @@
private String errorMsg;//鎶ヨ鍐呭
private String outEnable;//鍙嚭 Y锛氬彲鍑� N锛氫笉鍙嚭
private String inEnable;//鍙叆 Y锛氬彲鍏� N锛氫笉鍙叆
+ private String loading;//鏈夌墿
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b28a8bc..dcf1649 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -168,6 +168,7 @@
staNo: 1014
backSta: 1015
barcode: ${wcs-slave.barcode[0].id}
+ led: ${wcs-slave.led[2].id}
outSta[0]: #鍑哄簱鍙�1
staNo: 1019
outSta[1]: #鍑哄簱鍙�2
@@ -186,6 +187,7 @@
staNo: 2007
backSta: 2006
barcode: ${wcs-slave.barcode[1].id}
+ led: ${wcs-slave.led[8].id}
outSta[0]: #鍑哄簱鍙�1
staNo: 2001
outSta[1]: #鍑哄簱鍙�2
@@ -213,10 +215,12 @@
slot: 0
emptyInSta[0]: #绌烘澘鍏ュ簱鍙�0
staNo: 2056
+ led: ${wcs-slave.led[3].id}
inSta[0]: #鍏ュ簱鍙�1
staNo: 2056
backSta: 2055
barcode: ${wcs-slave.barcode[3].id}
+ led: ${wcs-slave.led[4].id}
outSta[0]: #鍑哄簱鍙�1
staNo: 1053
outSta[1]: #鍑哄簱鍙�1
@@ -230,12 +234,14 @@
# 鎷ｆ枡鍏ュ簱鍙�1
pickSta[0]:
staNo: 2051
+ led: ${wcs-slave.led[6].id}
# 鎷ｆ枡鍏ュ簱鍙�2
pickSta[1]:
staNo: 2052
# 鎷ｆ枡鍏ュ簱鍙�3
pickSta[2]:
staNo: 2057
+ led: ${wcs-slave.led[3].id}
# 鎷ｆ枡鍏ュ簱鍙�4
pickSta[3]:
staNo: 2058
@@ -268,7 +274,7 @@
ip: 192.168.110.211
port: 5005
devpPlcId: ${wcs-slave.devp[2].id}
- staArr: 1052
+ staArr: 1051
# LED3 鍗婃垚鍝佸簱1F
led[2]:
id: 3
--
Gitblit v1.9.1