From e7ee6502ce70f0aa1728b9a67780ec28f6218a45 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 20 九月 2022 14:45:04 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/model/protocol/SteProtocol.java | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 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 0b053fc..cab04bd 100644 --- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java +++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java @@ -1,5 +1,6 @@ package com.zy.core.model.protocol; +import com.core.common.Cools; import com.zy.asrs.entity.BasSte; import com.zy.core.enums.SteHisTaskStatusType; import com.zy.core.enums.SteLocaType; @@ -224,6 +225,15 @@ basSte.setSteErr(alarm.longValue()); } basSte.setWrkNo(taskNo.intValue()); + if (!Cools.isEmpty(row)) { + basSte.setRow(row.intValue()); + } + if (!Cools.isEmpty(bay)) { + basSte.setBay(bay.intValue()); + } + if (!Cools.isEmpty(lev)) { + basSte.setLev(lev.intValue()); + } return basSte; } @@ -236,7 +246,7 @@ // 鏄惁澶勪簬鎶ヨ鐘舵�� public Boolean isAlarm() { - return this.alarm > 0; + return this.alarm > 1; } } -- Gitblit v1.9.1