From 297aaba86ef2c39dc6b8e9160365b8d3c026d5b8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 01 六月 2023 13:16:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/model/command/CrnCommand.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 cb00a30..6fb0c54 100644
--- a/src/main/java/com/zy/core/model/command/CrnCommand.java
+++ b/src/main/java/com/zy/core/model/command/CrnCommand.java
@@ -18,7 +18,7 @@
private Integer crnNo = 0;
// 浠诲姟瀹屾垚纭浣�
-// private Short ackFinish = 0;
+ private Short ackFinish = 0;
// 浠诲姟鍙�
private Short taskNo = 0;
@@ -71,6 +71,11 @@
// 鐩爣宸烽亾
private Short destinationLane = 0;
+ // 浠诲姟纭 0锛氭湭纭 1锛氬凡纭
+ private Short command = 0;
+
+ private String barcode= "";
+
public void setTaskMode(Short taskMode){
this.taskMode = taskMode;
this.taskModeType = CrnTaskModeType.get(taskModeType);
--
Gitblit v1.9.1