From c5698e42c67e32892424a1a94ed9e7b532f0f7b8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 08 十二月 2025 09:43:49 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/java/com/zy/common/model/LocTypeDto.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 38fb7d2..a1224cf 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,7 +1,7 @@
package com.zy.common.model;
-import com.core.exception.CoolException;
import com.zy.core.model.protocol.StaProtocol;
+import com.zy.utils.News;
import lombok.Data;
/**
@@ -31,13 +31,21 @@
}
public LocTypeDto(StaProtocol staProtocol) {
-// if (staProtocol.isHigh() == staProtocol.isLow()) {
-// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-// }
- if (staProtocol.getSiteId() == 106 || staProtocol.getSiteId() == 159){
- this.locType1 = 2; // 楂樺簱浣�
- }else {
- this.locType1 = 1; // 浣庡簱浣�
+ 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