From c937e665ccbb763968d30ef2fad61c9eb935abfe Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 02 五月 2024 10:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs
---
src/main/java/com/zy/common/model/LocTypeDto.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 4cb4b14..f6d344d 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -29,13 +29,10 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow()) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
- }
- if (staProtocol.isLow()) {
- this.locType1 = 1; // 浣庡簱浣�
+ if (staProtocol.isWeight()) {
+ this.locType1 = 1; // 閲嶈揣
} else {
- this.locType1 = 2; // 楂樺簱浣�
+ this.locType1 = 2; // 杞昏揣
}
}
--
Gitblit v1.9.1