From dd37f7a757d46b6b2c43c60d292918ee8cb8634d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 15 三月 2022 15:37:14 +0800
Subject: [PATCH] Merge branch 'bfwcs' of http://47.97.1.152:5880/r/zy-wcs into bfwcs
---
src/main/java/com/zy/core/model/protocol/SteProtocol.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 1890496..81a7f81 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -2,6 +2,7 @@
import com.zy.asrs.entity.BasSte;
import com.zy.core.enums.SteHisTaskStatusType;
+import com.zy.core.enums.SteLocaType;
import com.zy.core.enums.SteStatusType;
import lombok.Data;
@@ -79,6 +80,8 @@
* 褰撳墠浣嶇疆 1锛岃繎鐐癸紝2杩滅偣锛�3A鐐癸紝4B鐐�
*/
public Short loca;
+
+ public SteLocaType locaType;
/**
* 杩戠偣璺濈
@@ -188,6 +191,16 @@
this.status = SteStatusType.get(type).id.shortValue();
}
+ public void setLoca(Short loca){
+ this.loca = loca;
+ this.locaType = SteLocaType.get(loca);
+ }
+
+ public void setLoca(SteLocaType type){
+ this.locaType = type;
+ this.loca = SteLocaType.get(type).id.shortValue();
+ }
+
public void setHisTaskStatus(Short hisTaskStatus){
this.hisTaskStatus = hisTaskStatus;
this.hisTaskStatusType = SteHisTaskStatusType.get(hisTaskStatus);
--
Gitblit v1.9.1