From 3ba1c6b6591f5949cbad37192f411eb388f8fba7 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 15 十二月 2025 17:10:24 +0800
Subject: [PATCH] 济南二机床wcs功能调试完善
---
src/main/java/com/zy/common/model/LocTypeDto.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index a1224cf..2bd06ab 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -1,7 +1,6 @@
package com.zy.common.model;
import com.zy.core.model.protocol.StaProtocol;
-import com.zy.utils.News;
import lombok.Data;
/**
@@ -31,22 +30,22 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- 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; // 鐭簱浣�
- }
+// 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