From a81c56cc9d0766914a5cd932cb61bf94dce27bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 13:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 +++++-----
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/webapp/static/js/console.map.js | 22 ++++++++++++++++++++--
src/main/resources/application.yml | 2 +-
5 files changed, 29 insertions(+), 11 deletions(-)
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 9164e5d..4680c18 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2278,8 +2278,8 @@
crnCommand.setSourcePosY(crnStn.getBay().shortValue()); // 婧愬簱浣嶅垪
crnCommand.setSourcePosZ(crnStn.getLev().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX((short) (locMast.getRow1()+slave.getOffset())); // 鐩爣搴撲綅鎺�
- crnCommand.setDestinationPosY((short) (locMast.getBay1()+slave.getOffset())); // 鐩爣搴撲綅鍒�
- crnCommand.setDestinationPosZ((short) (locMast.getLev1()+slave.getOffset())); // 鐩爣搴撲綅灞�
+ crnCommand.setDestinationPosY(locMast.getBay1().shortValue()); // 鐩爣搴撲綅鍒�
+ crnCommand.setDestinationPosZ(locMast.getLev1().shortValue()); // 鐩爣搴撲綅灞�
crnCommand.setLocType1(locMast.getLocType1()); // 璐х墿绫诲瀷
if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
log.error("鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
@@ -2468,9 +2468,9 @@
crnCommand.setTaskNo(wrkMast.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
- crnCommand.setSourcePosX((short) (locMast.getRow1()+slave.getOffset())); // 婧愬簱浣嶆帓
- crnCommand.setSourcePosY((short) (locMast.getBay1()+slave.getOffset())); // 婧愬簱浣嶅垪
- crnCommand.setSourcePosZ((short) (locMast.getLev1()+slave.getOffset())); // 婧愬簱浣嶅眰
+ crnCommand.setSourcePosX((short)(locMast.getRow1()+slave.getOffset())); // 婧愬簱浣嶆帓
+ crnCommand.setSourcePosY(locMast.getBay1().shortValue()); // 婧愬簱浣嶅垪
+ crnCommand.setSourcePosZ(locMast.getLev1().shortValue()); // 婧愬簱浣嶅眰
crnCommand.setDestinationPosX(crnStn.getRow().shortValue()); // 鐩爣搴撲綅鎺�
crnCommand.setDestinationPosY(crnStn.getBay().shortValue()); // 鐩爣搴撲綅鍒�
crnCommand.setDestinationPosZ(crnStn.getLev().shortValue()); // 鐩爣搴撲綅灞�
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index d285721..2f81cc2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -235,7 +235,7 @@
}
// 鍚戝爢鍨涙満鍙戜换鍔″墠鐨勫爢鍨涙満鐘舵��
try{
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 18);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -291,7 +291,7 @@
writeCount1++;
continue;
}
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 20);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5c13bf6..1240f17 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,7 +34,7 @@
enable: false
wms:
- url: localhost:8088/mdqdwms
+ url: localhost:8080/wms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 13479b9..02214b4 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -208,6 +208,6 @@
select top 1 * from dbo.asr_wrk_mast where wrk_no = #{wrkNo} and (wrk_sts = 13 or wrk_sts = 2) order by io_pri desc,io_time,wrk_no asc
</select>
<select id="selectCrn5Task2" resultMap="BaseResultMap">
- select * from dbo.asr_wrk_mast where wrk_sts=1 and io_type=1 and crn_no=5 order by io_pri desc,io_time,wrk_no ASC
+ select * from dbo.asr_wrk_mast where wrk_sts=1 and io_type=1 order by io_pri desc,io_time,wrk_no ASC
</select>
</mapper>
diff --git a/src/main/webapp/static/js/console.map.js b/src/main/webapp/static/js/console.map.js
index 90bbbd4..9ac98a6 100644
--- a/src/main/webapp/static/js/console.map.js
+++ b/src/main/webapp/static/js/console.map.js
@@ -8,13 +8,22 @@
"floors": 2,
"racks": [{
"type": "rack",
+ "id": "rack1",
+ "top": 160,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 8
+ },{
+ "type": "rack",
"id": "rack2",
"top": 184,
"left": 525,
"width": 796,
"height": 23,
"minBayNo": 2,
- "maxBayNo": 7
+ "maxBayNo": 8
}, {
"type": "rack",
"id": "rack3",
@@ -23,7 +32,16 @@
"width": 796,
"height": 23,
"minBayNo": 2,
- "maxBayNo": 7
+ "maxBayNo": 8
+ } ,{
+ "type": "rack",
+ "id": "rack4",
+ "top": 268,
+ "left": 525,
+ "width": 796,
+ "height": 23,
+ "minBayNo": 2,
+ "maxBayNo": 8
}],
"rackDescs": [{
"type": "rackDescs",
--
Gitblit v1.9.1