From 2ab23232212bdea3435240031b41f3a6a0d56352 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 23 十月 2024 10:07:52 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
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 aace472..4f7df3b 100644
--- a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -1,6 +1,5 @@
package com.zy.core.model.protocol;
-import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasRgv;
import com.zy.core.enums.*;
import lombok.Data;
@@ -29,6 +28,8 @@
* 2锛氭姤璀�
*/
public Short status;
+ public Short startSta;
+ public Short endSta;
/**
* 鐘舵�佹灇涓�
@@ -57,12 +58,12 @@
/**
* 宸ヤ綅1鏈夌墿
*/
- public Short loaded1;
+ public Short loaded1;//0 鏃犵墿锛�1 鏈夌墿
/**
* RGV褰撳墠浣嶇疆
*/
- public Short RgvPos;
+ public Long RgvPos;
/**
* 璧拌鍦ㄥ畾浣�
@@ -94,7 +95,7 @@
/**
* 宸ヤ綅2鏈夌墿
*/
- public Short loaded2;
+ public Short loaded2; //0 鏃犵墿锛�1 涓�灞傛棤鐗╀簩灞傛湁鐗╋紙鍙兘鎷嗗彔锛� 锛�2涓�灞傛湁鐗╀簩灞傛棤鐗� 锛堝彧鑳芥弧鏀撅級锛�3 1銆�2灞傞兘鏈夌墿 4锛氾紙锛夊彧鍏佽鎷嗙洏
///////////////////////////////////////////////////////////////////////////////////////
/**
@@ -184,8 +185,7 @@
if (alarm!=null) {
basRgv.setRgvErr(alarm.longValue());
}
- basRgv.setWrkNo1(taskNo1.intValue());
- basRgv.setWrkNo2(taskNo2.intValue());
+ basRgv.setWrkNo1(taskNo1.longValue());
return basRgv;
}
@@ -207,4 +207,9 @@
return RgvPos.intValue();
}
+ public String getAlarm$(){
+ //闇�瑕佹牴鎹幇鍦烘敼閫� 鏍规嵁璇诲埌鐨勫�艰幏鍙栧搴旂珯鐐逛綅缃�
+ return null;
+ }
+
}
--
Gitblit v1.9.1