From 6384644a5eda7f8d71160cad1921c623f2f68436 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 07 一月 2026 16:59:26 +0800
Subject: [PATCH] 控制是否允许连续出库，不判断出库站点状态(根据状态启用)
---
src/main/java/com/zy/common/model/LocTypeDto.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index c751fe7..a1224cf 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,6 +1,7 @@
package com.zy.common.model;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.utils.News;
import lombok.Data;
/**
@@ -30,7 +31,22 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- this.locType1 = staProtocol.getGoodsHeight();
+ if (staProtocol.isHigh() == staProtocol.isLow() || staProtocol.isChang() == staProtocol.isDuan()) {
+ News.error("plc楂樹綆/闀跨煭妫�娴嬪紓甯�,high:{},low:{}锛宑hang:{},duan:{}",staProtocol.isHigh(),staProtocol.isLow(),staProtocol.isChang(),staProtocol.isDuan());
+ return;
+ }
+
+ if (staProtocol.isHigh()) {
+ this.locType1 = 2;
+ } else {
+ this.locType1 = 1;
+ }
+
+ if (staProtocol.isChang()) {
+ this.locType2 = 2; // 闀垮簱浣�
+ } else {
+ this.locType2 = 1; // 鐭簱浣�
+ }
}
/**
--
Gitblit v1.9.1