From c23fa558197ba32ea4d65c799bc3fbd9a047e6c1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 24 十月 2024 12:56:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/CrnProtocol.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 30c7d1e..4ae14ea 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -43,6 +43,7 @@
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶇姸鎬�
+     * -1锛氭湭鐭�
      * 0锛氱┖闂诧紝鏃犱换鍔�
      * 1锛氬彇璐у畾浣嶄腑
      * 2锛氬彇璐т腑
@@ -53,9 +54,11 @@
      * 7锛氬簱浣嶇Щ浣�
      * 90锛氫换鍔″畬鎴愮瓑寰匴CS纭
      * 99锛氭姤璀�
+     * 100锛氬叾浠�100
+     * 101锛氭湭鐭�101
      */
-    public Short status;
-    public Short statusTwo;
+    public Short status = -1;
+    public Short statusTwo = -1;
 
     /**
      * 鐘舵�佹灇涓�
@@ -67,11 +70,13 @@
      * 鍫嗗灈鏈哄綋鍓嶅垪鍙�
      */
     public Short bay;
+    public Short bayTwo;
 
     /**
      * 鍫嗗灈鏈哄綋鍓嶅眰鍙�
      */
     public Short level;
+    public Short levelTwo;
 
     /**
      * 褰撳墠璐у弶浣嶇疆
@@ -102,6 +107,7 @@
      * 1 = 涓嶅湪瀹氫綅
      */
     public Short walkPos;
+    public Short walkPosTwo;
 
     /**
      * 杞借揣鍙版湁鐗�
@@ -283,6 +289,8 @@
         }
         basCrnp.setWrkNo(taskNo.intValue());
         basCrnp.setWrkNoTwo(taskNoTwo.intValue());
+        basCrnp.setCrnStatusOne(status.intValue());
+        basCrnp.setCrnStatusTwo(statusTwo.intValue());
         return basCrnp;
     }
 

--
Gitblit v1.9.1