From 41d54f55168781798aff4f1137f696ab02c05e79 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 六月 2025 17:08:03 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 10 ++++++----
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 1 +
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 18 +++++++++---------
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 5 ++---
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index 6734c31..359c686 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -153,27 +153,27 @@
private String memo;
public BasRgvOpt() {}
- public BasRgvOpt(RgvProtocol rgvProtocol, RgvCommand command) {
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, RgvCommand command) {
Date now = new Date();
- this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
- this.rgvNo = rgvProtocol.getRgvNo();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
this.sendTime = now;
this.mode = command.getTaskModeType1().name();
- this.sourceRow = rgvProtocol.getRgvPosI();//灏忚溅褰撳墠浣嶇疆
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
this.sourceSta = command.getSourceStaNo1().intValue();
this.posSta = command.getDestinationStaNo1().intValue();
this.updateTime = now;
this.updateBy = 9999L;
this.memo = "浠诲姟涓嬪彂鑷姩鐢熸垚鎸囦护鏃ュ織";
}
- public BasRgvOpt(RgvProtocol rgvProtocol, Long command) {
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, Long command) {
Date now = new Date();
- this.wrkNo1 = rgvProtocol.getTaskNo1().intValue();
- this.rgvNo = rgvProtocol.getRgvNo();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
this.sendTime = now;
this.mode = "婕父";
- this.sourceRow = rgvProtocol.getRgvPosI();//灏忚溅褰撳墠浣嶇疆
- this.sourceSta = rgvProtocol.getRgvPosI();
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
+ this.sourceSta = rgvPoi;
this.posSta = command.intValue();
this.updateTime = now;
this.updateBy = 9999L;
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 7fb7b84..ff462b8 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -374,6 +374,7 @@
&& rgvProtocol.modeType == RgvModeType.AUTO
&& (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
&& rgvProtocol.getTaskNo1() == 0
+ && rgvProtocol.getRgvPosInt() != 0
&& rgvProtocol.getAlarm() == 0) {
BasDevpPosition basDevpPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getSourceStaNo()));
if (basDevpPosition.getPlcPosition()>rgvProtocol.getRgvPos()){
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
index 955956d..609ef66 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -67,6 +67,7 @@
* RGV褰撳墠浣嶇疆
*/
public Long RgvPos;
+ public int RgvPosInt = 0;
public Double instantaneousSpeed;// 鐬椂閫熷害 (m/min)
public Short endStaM;// 鐬椂閫熷害 (m/min) 婕父鐩殑鍦�
@@ -208,9 +209,7 @@
}
public Integer getRgvPosI(){
- //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
- if (RgvPos==null) return 0;
- return RgvPos.intValue();
+ return RgvPosInt;
}
public String getAlarm$(){
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index decfead..dddf6a7 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -290,10 +290,12 @@
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 10));
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 12));
rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- long poi = siemensNet.getByteTransform().TransInt32(result.Content, 16);
+ int poi = siemensNet.getByteTransform().TransInt32(result.Content, 16);
if (poi>0){
- rgvProtocol.setRgvPos(poi);
+ rgvProtocol.setRgvPos((long)poi);
+ rgvProtocol.setRgvPosInt(poi);
}
+ System.out.println(rgvProtocol.getRgvNo()+"鍙峰皬杞﹁鍙栧畾浣嶅�硷細"+poi);
rgvProtocol.setInstantaneousSpeed(Double.valueOf(siemensNet.getByteTransform().TransInt16(resultV.Content, 0)));
rgvProtocol.setEndStaM(siemensNet.getByteTransform().TransInt16(resultE.Content, 0));
boolean[] statusAlarmList = siemensNet.getByteTransform().TransBool(resultError.Content, 0, 13);
@@ -355,7 +357,7 @@
private void rgvOpt(RgvCommand command) {
try{
BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
- BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI(), command);
basRgvOptService.insert(basRgvOpt);
}catch (Exception e){
log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
@@ -364,7 +366,7 @@
private void rgvOpt(Long command) {
try{
BasRgvOptService basRgvOptService = SpringUtils.getBean(BasRgvOptService.class);
- BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol, command);
+ BasRgvOpt basRgvOpt = new BasRgvOpt(rgvProtocol.getTaskNo1().intValue(), rgvProtocol.getRgvNo(), rgvProtocol.getRgvPosI(), command);
basRgvOptService.insert(basRgvOpt);
}catch (Exception e){
log.error("RGV鍐欏叆鍛戒护淇濆瓨澶辫触锛侊紒");
--
Gitblit v1.9.1