From c19bd47fa2f5aa779f902d599b51824741bda6f0 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 18 六月 2025 10:19:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wcs' into jx-fyxc-wcs

---
 src/main/java/com/zy/core/model/command/CrnCommand.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/core/model/command/CrnCommand.java b/src/main/java/com/zy/core/model/command/CrnCommand.java
index 6b09a73..910a717 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -20,6 +20,10 @@
     // 浠诲姟瀹屾垚纭浣�
     private Short ackFinish = 0;
 
+    private Short taskRe = 0;
+
+    private Short taskClear = 0;
+
     // 浠诲姟鍙�
     private Short taskNo = 0;
 
@@ -74,6 +78,8 @@
     // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
     private Short command = 0;
 
+
+
     private boolean traySize = false;
 
     public void setTaskMode(Short taskMode){

--
Gitblit v1.9.1