From e32ff68be04c9e2e3ab689c4494aefe5d3036400 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 12 四月 2025 11:12:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs
---
src/main/webapp/views/crn.html | 6 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 ++--
src/main/java/com/zy/asrs/controller/MonitorController.java | 6 +-
src/main/webapp/static/js/console.map.js | 4 +-
src/main/resources/application.yml | 50 ++++++++-----------------
5 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 872f214..8f7ff4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -79,7 +79,7 @@
public R monitorOther(@RequestParam("crnId") Integer crnId, @RequestParam("ledId") Integer sta) {
Integer ledId = 0;
for (LedSlave led : slaveProperties.getLed()) {
- for (Integer staNo : led.getStaArr()) {
+ for (Integer staNo : led.getInStaArr()) {
if (staNo.equals(sta)) {
ledId = led.getId();
break;
@@ -268,7 +268,7 @@
String ledContent = "";
List<LedCommand> commandList = null;
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
ledContent = ledThread.getStringBuffer().toString();
@@ -286,7 +286,7 @@
public R monitorLedError(@RequestParam("ledId") Integer ledId) {
String errorMsg = "";
for (LedSlave slave : slaveProperties.getLed()) {
- if (slave.getStaArr().contains(ledId)) {
+ if (slave.getInStaArr().contains(ledId)) {
LedThread ledThread = (LedThread) SlaveConnection.get(SlaveType.Led, slave.getId());
if (null != ledThread) {
errorMsg = ledThread.getErrorMsg().toString();
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 634ab30..335747a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1307,10 +1307,10 @@
News.error(""+mark+" - 3"+" - 2"+" - 宸ヤ綔妗ｅ簱浣嶇Щ杞け璐ワ紝鍘熷洜锛氭绱㈢洰鏍囧簱浣嶅け璐ワ紒宸ヤ綔鍙�={}锛屾簮搴撲綅={}", wrkMast.getWrkNo(), wrkMast.getLocNo());
return;
}
- if(sta.getLocType1() != sourceSta.getLocType1()){
- News.error("绉诲簱鐩爣搴撲綅绫诲瀷涓庢簮搴撲綅绫诲瀷涓嶇");
- return;
- }
+// if(sta.getLocType1() != sourceSta.getLocType1()){
+// News.error("绉诲簱鐩爣搴撲綅绫诲瀷涓庢簮搴撲綅绫诲瀷涓嶇");
+// return;
+// }
// 鑾峰彇鍫嗗灈鏈轰俊鎭� 骞� 鍒ゆ柇鏄惁鍙叆鍑�
BasCrnp basCrnp = basCrnpService.selectById(slave.getId());
if (!basCrnp.getInEnable().equals("Y") && !basCrnp.getOutEnable().equals("Y")) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb000ff..7b63829 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=fyxcasrs
+ url: jdbc:sqlserver://192.168.10.201:1433;databasename=fyxcasrs
username: sa
password: sa@123
mvc:
@@ -138,7 +138,7 @@
staNo: 1112
barcode: ${wcs-slave.barcode[0].id}
backSta: 1111
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
# 鍏ュ簱鍙�1
inSta[1]:
staNo: 1114
@@ -150,25 +150,25 @@
staNo: 1122
barcode: ${wcs-slave.barcode[0].id}
backSta: 1121
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
# 鍏ュ簱鍙�1
inSta[3]:
staNo: 1124
barcode: ${wcs-slave.barcode[0].id}
backSta: 1123
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
outSta[0]:
staNo: 1111
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[0].id}
outSta[1]:
staNo: 1121
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[2].id}
outSta[2]:
staNo: 1113
led: ${wcs-slave.led[1].id}
outSta[3]:
staNo: 1123
- led: ${wcs-slave.led[1].id}
+ led: ${wcs-slave.led[3].id}
# 鏉＄爜鎵弿浠�1
@@ -191,42 +191,24 @@
ip: 10.10.10.102
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
+ inStaArr: 1114
+ outStaArr: 1113
+ modelSta: 1114
# LED3
led[2]:
id: 3
ip: 10.10.10.103
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
+ inStaArr: 122
+ outStaArr: 1121
+ modelSta: 1122
# LED4
led[3]:
id: 4
ip: 10.10.10.104
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
- # LED5
- led[4]:
- id: 5
- ip: 10.10.10.105
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
- # LED6
- led[5]:
- id: 6
- ip: 10.10.10.106
- port: 5005
- devpPlcId: ${wcs-slave.devp[0].id}
- inStaArr: 1112
- outStaArr: 1111
- modelSta: 1112
\ No newline at end of file
+ inStaArr: 1124
+ outStaArr: 1123
+ modelSta: 1124
\ No newline at end of file
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 584010a..73d7504 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -88,7 +88,7 @@
"floors": [{
"type": "floor",
"id": "page_floor1",
- "text": "1搴�",
+ "text": "1F",
"top": 4,
"left": 22,
"width": 1819,
@@ -149,7 +149,7 @@
},{
"type": "floor",
"id": "page_floor2",
- "text": "2搴�",
+ "text": "2F",
"top": 4,
"left": 22,
"width": 1819,
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index 7be0a1f..7c1731e 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -143,9 +143,9 @@
<span class="select-title">鍫嗗灈鏈哄彿</span>
<div class="select-container" style="padding: 20px 0;">
<label><input type="radio" name="crnSelect" value="1" checked> 1鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>
- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>
+<!-- <label><input type="radio" name="crnSelect" value="2"> 2鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="3"> 3鍙峰爢鍨涙満</label>-->
+<!-- <label><input type="radio" name="crnSelect" value="4"> 4鍙峰爢鍨涙満</label>-->
</div>
</div>
<!-- 婧愮珯/婧愬簱浣� 閫夋嫨 -->
--
Gitblit v1.9.1