From a93374428a3944788ae547f75504fdf0aa33571c Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 08 一月 2025 16:17:54 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 4 ++--
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
src/main/resources/mapper/WrkMastMapper.xml | 2 +-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 30 +++++++++++++++---------------
4 files changed, 25 insertions(+), 19 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 a0295ca..663bfdc 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -3432,6 +3432,11 @@
wrkMast.setWrkSts(105L);
wrkMast.setModiTime(date);
wrkMastService.updateById(wrkMast);
+ } else if (wrkMast.getIoType() == 105){
+ Date date = new Date();
+ wrkMast.setWrkSts(14L);
+ wrkMast.setModiTime(date);
+ wrkMastService.updateById(wrkMast);
}
}
@@ -3747,12 +3752,13 @@
String response = new HttpHandler.Builder()
.setUri(wmsUrl)
.setPath("/rpc/process/loc/v1")
+ .setJson(JSON.toJSONString(""))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
log.info("浠诲姟涓嬪彂鎴愬姛");
- boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, null));
+ boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, null));
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況esponse锛歿}", wmsUrl + "/mobile/comb/auth", response);
}
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 10a4182..7fccb82 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -75,10 +75,10 @@
rgv1Map.put(4002,2013); rgv1Map.put(4011,2013);
rgv1Map.put(2101,2013);rgv1Map.put(2001,2013);
rgv1Map.put(1022,1020);rgv1Map.put(1025,1023);
- rgv1Map.put(1016,1014);rgv1Map.put(1019,1017);
+ rgv1Map.put(1016,1014);rgv1Map.put(1019,1017);rgv1Map.put(2301,2013);
Map<Integer, Integer> rgv2Map = new HashMap<>();
rgv2Map.put(4002,4001); rgv2Map.put(4011,4010);
- rgv2Map.put(2101,2102);rgv2Map.put(2001,2002);
+ rgv2Map.put(2101,2102);rgv2Map.put(2001,2002);rgv2Map.put(2301,2301);
rgv2Map.put(2304,2301);
Map<Integer, Integer> rgv3Map = new HashMap<>();
rgv3Map.put(3007,3001);rgv3Map.put(3012,3001);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index aae7c02..db0d53d 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -531,24 +531,24 @@
}
// 绌烘《鍑哄簱淇″彿
- OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 18);
+ OperateResultExOne<byte[]> readCall = siemensS7Net.Read("DB102.0", (short) 8);
if (readCall.IsSuccess){
- Integer isNeed = siemensS7Net.getByteTransform().TransInt32(result.Content, 0); // IBC瑕佹《淇″彿
- Integer isFinish = siemensS7Net.getByteTransform().TransInt32(result.Content, 2); // IBC鐏岃瀹屾垚淇″彿
- Integer weight = siemensS7Net.getByteTransform().TransInt32(result.Content, 4); // IBC鐏岃閲嶉噷
- Integer isAHalf = siemensS7Net.getByteTransform().TransInt32(result.Content, 6); // IBC鍗婃《鏍囪
+ int isNeed = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 0); // IBC瑕佹《淇″彿
+ int Finish = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 2); // IBC鐏岃瀹屾垚淇″彿
+ int weight1 = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 4); // IBC鐏岃閲嶉噷
+ int isAHalf = siemensS7Net.getByteTransform().TransInt16(readCall.Content, 6); // IBC鍗婃《鏍囪
isCalled = isNeed;
- isFinish = isFinish;
- weight = weight;
+ isFinish = Finish;
+ weight = weight1;
isHalf = isAHalf;
}
// 瀹屾垚缃愯淇″彿
- OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
- if (finish.IsSuccess){
- short amount = siemensS7Net.getByteTransform().TransInt16(result.Content, 0);
-// isCalled = amount;
- }
+// OperateResultExOne<byte[]> finish = siemensS7Net.Read("DB105.240", (short) 4);
+// if (finish.IsSuccess){
+// short amount = siemensS7Net.getByteTransform().TransInt16(finish.Content, 0);
+//// isCalled = amount;
+// }
// if (isCalled == 1) {
// writeIsCalled();
@@ -882,12 +882,12 @@
}
private void writeIsCalled() throws InterruptedException {
- OperateResult write = siemensS7Net.Write("DB102.0" , 0); // 宸ヤ綔鍙�
+ OperateResult write = siemensS7Net.Write("DB102.0" , (short) 0); // 宸ヤ綔鍙�
}
private void writeIsFinish() throws InterruptedException {
- OperateResult finish = siemensS7Net.Write("DB102.2" , 0); // 宸ヤ綔鍙�
- OperateResult half = siemensS7Net.Write("DB102.6" , 0); // 宸ヤ綔鍙�
+ OperateResult finish = siemensS7Net.Write("DB102.2" , (short)0); // 宸ヤ綔鍙�
+ OperateResult half = siemensS7Net.Write("DB102.6" , (short)0); // 宸ヤ綔鍙�
}
/**
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index b73f218..a91ba57 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -92,7 +92,7 @@
</select>
<select id="selectPakInStep2" resultMap="BaseResultMap">
- select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
+ select top 1 * from dbo.asr_wrk_mast where wrk_sts=2 and crn_no=#{crnNo} and wrk_no=#{workNo} and sta_no=#{staNo} and (io_type=1 or io_type=10 or io_type=53 or io_type=54 or io_type=55 or io_type=57) order by io_pri desc,io_time,wrk_no ASC
</select>
<select id="selectPakInStep3" resultMap="BaseResultMap">
--
Gitblit v1.9.1