From c6b6c90518697fdb2f89853a75921ff2af41ee73 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 02 十二月 2025 15:50:33 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 9 -
src/main/webapp/static/js/console.map.js | 4
src/main/java/com/zy/asrs/controller/CrnController.java | 22 ++--
src/main/resources/application.yml | 155 +++-----------------------------------
4 files changed, 30 insertions(+), 160 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index dd358b1..c43efb9 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -142,15 +142,15 @@
@PostMapping("/table/crn/msg")
@ManagerAuth(memo = "鍫嗗灈鏈烘暟鎹〃")
public R crnMsgTable(){
- Config crnSearchDetectTaskCountConfig = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "crnSearchDetectTaskCount")
- );
- int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
-
- Config applyInTaskTotalCountConfig = configService.selectOne(new EntityWrapper<Config>()
- .eq("code", "applyInTaskTotalCount")
- );
- int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+// Config crnSearchDetectTaskCountConfig = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "crnSearchDetectTaskCount")
+// );
+// int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+//
+// Config applyInTaskTotalCountConfig = configService.selectOne(new EntityWrapper<Config>()
+// .eq("code", "applyInTaskTotalCount")
+// );
+// int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
List<CrnMsgTableVo> list = new ArrayList<>();
List<BasCrnp> crnps = basCrnpService.selectList(new EntityWrapper<BasCrnp>().orderBy("crn_no"));
@@ -189,8 +189,8 @@
vo.setYdistance(crnProtocol.getYDistance()); // 鍗囬檷璺濈(Km)
vo.setXduration(crnProtocol.getXDuration()); // 璧拌鏃堕暱(H)
vo.setYduration(crnProtocol.getYDuration()); // 鍗囬檷鏃堕暱(H)
- vo.setCrnSearchDetectTaskCount(crnSearchDetectTaskCount);
- vo.setApplyInTaskTotalCount(applyInTaskTotalCount);
+// vo.setCrnSearchDetectTaskCount(crnSearchDetectTaskCount);
+// vo.setApplyInTaskTotalCount(applyInTaskTotalCount);
List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("crn_no", basCrnp.getCrnNo())
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 27e31f3..ed0455a 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -158,9 +158,6 @@
private void readStatus(){
try {
short len = 56;
- if (slave.getId() == 1) {
- len = 58;
- }
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", len);
if (result.IsSuccess) {
if (null == crnProtocol) {
@@ -188,9 +185,9 @@
crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
- if (slave.getId() == 1) {
- crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
- }
+// if (slave.getId() == 1) {
+// crnProtocol.setCrnLane((int) siemensNet.getByteTransform().TransInt16(result.Content, 56));
+// }
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5175834..054fd62 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,15 +8,15 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://127.0.0.1:1433;databasename=shhtgcasrs
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=jxtlfasrs-yclk
username: sa
password: sa@123
mvc:
static-path-pattern: /**
- redis:
- host: localhost
- port: 6379
- database: 0
+# redis:
+# host: localhost
+# port: 6379
+# database: 0
# password: xltys1995
mybatis-plus:
@@ -55,7 +55,7 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 172.17.60.10
+ ip: 172.26.4.132
port: 102
rack: 0
slot: 0
@@ -66,157 +66,30 @@
crnInStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 401
- row: 2
- bay: 2
+ row: 1
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄叆搴撶珯鐐�
crnInStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 402
- row: 2
- bay: 30
+ row: 1
+ bay: 15
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[0]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 401
- row: 2
- bay: 2
+ row: 1
+ bay: 1
lev: 1
# 鍫嗗灈鏈哄嚭搴撶珯鐐�
crnOutStn[1]:
devpPlcId: ${wcs-slave.devp[0].id}
staNo: 402
- row: 2
- bay: 30
+ row: 1
+ bay: 15
lev: 1
- # 鍫嗗灈鏈�2
-# crn[1]:
-# id: 2
-# ip: 172.17.60.20
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1023
-# row: 8
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1026
-# row: 9
-# bay: 1
-# lev: 1
- # 鍫嗗灈鏈�3
-# crn[2]:
-# id: 3
-# ip: 172.17.60.30
-# port: 102
-# rack: 0
-# slot: 0
- # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
- # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1029
-# row: 12
-# bay: 1
-# lev: 1
- # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1032
-# row: 13
-# bay: 1
-# lev: 1
- # 鍫嗗灈鏈�4
-# crn[3]:
-# id: 4
-# ip: 172.17.60.40
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1036
-# row: 16
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1039
-# row: 17
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�5
-# crn[4]:
-# id: 5
-# ip: 172.17.60.50
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1042
-# row: 20
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1045
-# row: 21
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈�6
-# crn[5]:
-# id: 6
-# ip: 172.17.60.60
-# port: 102
-# rack: 0
-# slot: 0
-# # 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
-# offset: 2
-# demo: false
-# # 鍫嗗灈鏈哄叆搴撶珯鐐�
-# crnInStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1049
-# row: 24
-# bay: 1
-# lev: 1
-# # 鍫嗗灈鏈哄嚭搴撶珯鐐�
-# crnOutStn[0]:
-# devpPlcId: ${wcs-slave.devp[0].id}
-# staNo: 1052
-# row: 25
-# bay: 1
-# lev: 1
- # RGV绌挎杞�1
-# rgv[0]:
-# id: 1
-# ip: 172.17.60.82
-# port: 502
-# rack: 0
-# slot: 0
# 杈撻�佺嚎1
devp[0]:
id: 1
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 544a6b8..5de9840 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -1,6 +1,6 @@
mapInfo = {"mapName":"WCS","rackCount":16,"crnCount":4,"stbCount":16,"hpPosition":1,"minBayNo":2,"floors":1,"racks":[
- {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":30},
- {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":2,"maxBayNo":30},
+ {"type":"rack","id":"rack13","top":341,"left":400,"width":1100,"height":20,"minBayNo":1,"maxBayNo":15},
+ {"type":"rack","id":"rack12","top":302,"left":400,"width":1100,"height":20,"minBayNo":1,"maxBayNo":15},
],
"crns":[
{"type":"track","id":"lb_track4","text":"","top":333,"left":400,"width":1100,"height":1},
--
Gitblit v1.9.1