From 4f64a5b70500e1ec7b0b350eb66749180ed2634a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 23 六月 2024 20:10:07 +0800
Subject: [PATCH] # 捷众二期开发
---
src/main/java/com/zy/common/model/LocTypeDto.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 03a89cd..01f9018 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,6 +1,5 @@
package com.zy.common.model;
-import com.core.exception.CoolException;
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
@@ -29,9 +28,11 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
- }
+ System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪師濮嬫暟鎹负:"+staProtocol.isWeight()+"------------");
+// if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
+// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+// }
+
if (staProtocol.isLow()) {
this.locType1 = 1; // 浣庡簱浣�
} else if (staProtocol.isHigh()){
@@ -41,7 +42,12 @@
} else if (staProtocol.isMedium_high()) {
this.locType1 = 4; // 楂樺簱浣�
}
-
+ if (staProtocol.isWeight() && staProtocol.getSiteId() == 204 || staProtocol.getSiteId() == 104) {
+ this.locType1 = 2;
+ } else {
+ this.locType1 = 1;
+ }
+ System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪鐞嗕负鏁版嵁涓�:"+this.locType1+"------------");
}
--
Gitblit v1.9.1