From 4e6c566128bc0430d28e204672d54f0efcb4713d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 30 三月 2025 11:04:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasCircularShuttle.java | 5 +++++
src/main/java/com/zy/core/thread/RgvThread.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1 +
src/main/resources/mapper/BasCircularShuttleMapper.xml | 1 +
src/main/java/com/zy/core/model/command/RgvCommand.java | 3 +++
5 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java b/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java
index 3f822b0..5ee2261 100644
--- a/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java
+++ b/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java
@@ -36,6 +36,11 @@
@ApiModelProperty(value= "0:姝ｅ父锛�1锛氱鐢�")
private Integer status;
+
+ @ApiModelProperty(value= "")
+ @TableField("rgv_some")
+ private int rgvSome = 1;
+
public BasCircularShuttle() {}
public BasCircularShuttle(Integer rgvId,Integer rgvNo,Integer status) {
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 37d62dc..a9bf2ea 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -334,6 +334,7 @@
rgvCommand.setSourceStaNo1(wrkMast.getSourceStaNo().shortValue()); //宸ヤ綅1璧风偣
rgvCommand.setDestinationStaNo1(wrkMast.getStaNo().shortValue()); //宸ヤ綅1鐩爣绔欑偣
rgvCommand.setCommand((short) 1); //宸ヤ綅1浠诲姟纭
+ rgvCommand.setRgvSome(basCircularShuttle.getRgvSome()==1 ? (short) 1 : (short) 0);
if (!MessageQueue.offer(SlaveType.Rgv, rgvProtocol.getRgvNo(), new Task(2, rgvCommand))) {
//
log.error("RGV鍛戒护涓嬪彂澶辫触锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(rgvCommand));
diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
index 5be8072..d8dab77 100644
--- a/src/main/java/com/zy/core/model/command/RgvCommand.java
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -52,6 +52,9 @@
// 宸ヤ綅2浠诲姟鍙�
private Short taskNo2 = 0;
+
+ private Short rgvSome = 1;
+
/**
* 浠诲姟妯″紡锛�
* 0 = 鏃�
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index b367363..496ec77 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -216,9 +216,13 @@
array[3] = command.getTaskMode1();//浠诲姟妯″紡
array[4] = command.getTaskNo1();
+
+
OperateResult result = siemensNet.Write("DB24.0", array);
if (command.getAckFinish1().equals((short)0)) {
+// Thread.sleep(100L);
+ siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
Thread.sleep(100L);
result = siemensNet.Write("DB24.10.0", true);
} else {
diff --git a/src/main/resources/mapper/BasCircularShuttleMapper.xml b/src/main/resources/mapper/BasCircularShuttleMapper.xml
index 5f313c3..7a666f4 100644
--- a/src/main/resources/mapper/BasCircularShuttleMapper.xml
+++ b/src/main/resources/mapper/BasCircularShuttleMapper.xml
@@ -8,6 +8,7 @@
<result column="rgv_id" property="rgvId" />
<result column="rgv_no" property="rgvNo" />
<result column="status" property="status" />
+ <result column="rgv_some" property="rgvSome" />
</resultMap>
--
Gitblit v1.9.1