From 8cedbe419f6e561b4e8069bbaa8013ce4443fd09 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 03 五月 2025 09:53:06 +0800
Subject: [PATCH] #
---
src/main/resources/application-prod.yml | 5 ++---
src/main/java/com/zy/asrs/controller/CrnController.java | 1 +
src/main/webapp/views/deviceOperate/crnOperate.html | 2 ++
src/main/java/com/zy/asrs/domain/vo/CrnListVo.java | 1 +
src/main/resources/application.yml | 8 ++++----
5 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 3046c66..ece8da6 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -294,6 +294,7 @@
vo.setDeviceStatus(crnProtocol.modeType.equals(CrnModeType.AUTO)? CrnStatusType.MACHINE_AUTO.getDesc(): CrnStatusType.MACHINE_UN_AUTO.getDesc()); // 妯″紡鐘舵��
}
}
+ vo.setLaneNo(crnProtocol.getLaneNo()); //
vo.setXspeed(crnProtocol.getXSpeed()); // 璧拌閫熷害锛坢/min)
vo.setYspeed(crnProtocol.getYSpeed()); // 鍗囬檷閫熷害锛坢/min)
vo.setZspeed(crnProtocol.getZSpeed()); // 鍙夌墮閫熷害锛坢/min)
diff --git a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
index 89707ad..bff0249 100644
--- a/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
+++ b/src/main/java/com/zy/asrs/domain/vo/CrnListVo.java
@@ -9,6 +9,7 @@
// 鍫嗗灈鏈哄彿
private Integer crnNo;
+ private Integer laneNo;
// 妯″紡
private String statusType = "-";
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 7bc5054..f1b84ca 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -45,7 +45,6 @@
# 鍑哄簱鍙�1
outSta[0]:
staNo: 102
- led: ${wcs-slave.led[0].id}
# led: ${wcs-slave.led[0].id}
# RGV绌挎杞�1
rgv[0]:
@@ -128,7 +127,7 @@
staNo: 281
devpPlcId: 1
crn[0]: #鍫嗗灈鏈�1
- ip: 192.168.4.250
+ ip: 10.10.123.30
id: 1
slot: 0
demo: false
@@ -168,7 +167,7 @@
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
crn[2]: #鍫嗗灈鏈�1
- ip: 192.168.4.250
+ ip: 10.10.10.30
id: 3
slot: 0
demo: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cd922e4..675568e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
server:
- port: 8083
+ port: 9090
servlet:
context-path: /@pom.build.finalName@
@@ -12,7 +12,7 @@
# username: sa
# password: sa@123
driver-class-name: dm.jdbc.driver.DmDriver
- url: jdbc:dm://192.168.4.191:5236/SOURCE
+ url: jdbc:dm://127.0.0.1:5236/SOURCE
username: SYSDBA
password: Zy@12345
mvc:
@@ -65,13 +65,13 @@
#url: 10.32.53.195:8080
# WMS绯荤粺ip
# url: 10.210.157.109:8090
- url: 10.210.157.26:8090
+ url: 10.210.157.26:9027
# 鍏ュ簱浠诲姟鐢宠鎺ュ彛
#inboundTaskApplyPath: api/InterFace/inboundTaskApply
inboundTaskApplyPath: sugood/inboundTaskApply
# inboundTaskApplyPath: open/asrs/inboundTaskApply
# 浠诲姟鐘舵�佸弽棣堟帴鍙�
- taskStatusFeedbackPath: sugood/taskStatusReport
+ taskStatusFeedbackPath: external/wcs/wmsHeartBeat
# 璐т綅鐘舵�佹洿鏂版帴鍙�
locationUpdatePath: api/InterFace/get_InterFace_TestStorage
# 绉诲簱鐢宠鎺ュ彛
diff --git a/src/main/webapp/views/deviceOperate/crnOperate.html b/src/main/webapp/views/deviceOperate/crnOperate.html
index f606a22..fe928f9 100644
--- a/src/main/webapp/views/deviceOperate/crnOperate.html
+++ b/src/main/webapp/views/deviceOperate/crnOperate.html
@@ -18,6 +18,8 @@
max-height="350" style="width: 100%">
<el-table-column property="crnNo" label="鍫嗗灈鏈�">
</el-table-column>
+ <el-table-column property="laneNo" label="宸烽亾鍙�">
+ </el-table-column>
<el-table-column property="workNo" label="宸ヤ綔鍙�">
</el-table-column>
<el-table-column property="statusType" label="妯″紡">
--
Gitblit v1.9.1