From 88bd084f2964d6fc4ac6527296e1602538deec30 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期二, 27 一月 2026 17:21:15 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/core/enums/CrnTaskModeType.java | 5 ++---
docs/WCS部署手册.md | 2 +-
src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java | 3 +++
pom.xml | 4 +++-
src/main/resources/license.lic | 0
src/main/resources/application.yml | 4 ++--
src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java | 4 +++-
7 files changed, 14 insertions(+), 8 deletions(-)
diff --git "a/docs/WCS\351\203\250\347\275\262\346\211\213\345\206\214.md" "b/docs/WCS\351\203\250\347\275\262\346\211\213\345\206\214.md"
index a63d51b..e2479ab 100644
--- "a/docs/WCS\351\203\250\347\275\262\346\211\213\345\206\214.md"
+++ "b/docs/WCS\351\203\250\347\275\262\346\211\213\345\206\214.md"
@@ -154,7 +154,7 @@
# === License 閰嶇疆 ===
license:
- subject: crnWcsDev
+ subject: jsxswcs1
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/pom.xml b/pom.xml
index a5e538c..6497e70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,9 @@
<dependency>
<groupId>cn.cool</groupId>
<artifactId>framework</artifactId>
- <version>${cool.version}</version>
+ <version>3.4.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/version/lib/framework-3.4.0.jar</systemPath>
</dependency>
<dependency>
<groupId>mysql</groupId>
diff --git a/src/main/java/com/zy/core/enums/CrnTaskModeType.java b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
index 4352064..13048c7 100644
--- a/src/main/java/com/zy/core/enums/CrnTaskModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnTaskModeType.java
@@ -6,12 +6,11 @@
PAKIN(1), // 鍏ュ簱
PAKOUT(2), // 鍑哄簱
LOC_MOVE(3), // 搴撲綅绉昏浆
- X_MOVE(4), // 绔欎綅绉昏浆
- Y_MOVE(5), // 绔欎綅绉昏浆
XY_MOVE(6), // 绔欎綅绉昏浆
- CRN_MOVE(7), // 鍫嗗灈鏈虹Щ鍔╔YZ
+ CRN_MOVE(4), // 鍫嗗灈鏈虹Щ鍔╔YZ
BACK_ORIGIN(8), // 鍥炲弽鍘熺偣
CLEAR(9), // 娓呴敊
+ RESET(5), // 寰╀綅
;
public Integer id;
diff --git a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
index ba2a839..103cc75 100644
--- a/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyCrnRealConnect.java
@@ -112,7 +112,9 @@
Thread.sleep(500);
}else {
commandResult = true;
+ break;
}
+ writeAck++;
}
} while (writeAck < 5);
@@ -160,7 +162,7 @@
Thread.sleep(500);
} while (idx < 5);
- OperateResult confirmResult = siemensNet.Write("DB100.0", (short) 1);
+ OperateResult confirmResult = siemensNet.Write("DB100.18", (short) 1);
if (!confirmResult.IsSuccess) {
News.error("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐� ===>> [id:{}]", command.getCrnNo());
response.setMessage("鍫嗗灈鏈哄啓鍏ョ‘璁ゆ暟鎹け璐�");
diff --git a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
index b680358..6796d38 100644
--- a/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java
@@ -275,6 +275,9 @@
crnCommand.setTaskNo(taskNo); // 宸ヤ綔鍙�
crnCommand.setAckFinish(0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.CRN_MOVE.id); // 浠诲姟妯″紡: 鍫嗗灈鏈虹Щ鍔�
+ crnCommand.setSourcePosX(Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
+ crnCommand.setSourcePosY(Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
+ crnCommand.setSourcePosZ(Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
crnCommand.setDestinationPosX(Utils.getRow(targetLocNo)); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(Utils.getBay(targetLocNo)); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(Utils.getLev(targetLocNo)); // 鐩爣搴撲綅灞�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 279ab78..a48dcd0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -19,7 +19,7 @@
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/wcs?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: root
+ password: zy@123
mvc:
static-path-pattern: /**
redis:
@@ -61,7 +61,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: crnWcsDev
+ subject: jsxswcs1
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
new file mode 100644
index 0000000..605ad20
--- /dev/null
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1