From 7ec18552d3a3d1350191f85a25851beb925b7441 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 01 十一月 2024 11:39:05 +0800
Subject: [PATCH] 出库呼叫agv修改

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   14 ++++++--------
 1 files changed, 6 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 d62d0c8..407062d 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -19,6 +19,8 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     public LocTypeDto() {
     }
 
@@ -29,14 +31,10 @@
     }
 
     public LocTypeDto(StaProtocol staProtocol) {
-//        if (staProtocol.isHigh() == staProtocol.isLow()) {
-//            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-//        }
-//        if (staProtocol.isLow()) {
-            this.locType1 = 1; // 浣庡簱浣�
-//        } else {
-//            this.locType1 = 2; // 楂樺簱浣�
-//        }
+        if (staProtocol.locType.id.shortValue()!=1 && staProtocol.locType.id.shortValue()!=2 && staProtocol.locType.id.shortValue()!=3) {
+            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+        }
+        this.locType1 = staProtocol.locType.id.shortValue();
     }
 
     /**

--
Gitblit v1.9.1