From 7a806791fba46b27f4a8af6809c270f92be5f11c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 22 一月 2024 12:53:37 +0800
Subject: [PATCH] #堆垛机下发命令增加库位类型

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   18 ++++++++++++------
 1 files changed, 12 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 76c51eb..92ba2b2 100644
--- a/src/main/java/com/zy/common/model/LocTypeDto.java
+++ b/src/main/java/com/zy/common/model/LocTypeDto.java
@@ -22,14 +22,20 @@
     public LocTypeDto() {
     }
 
+    public LocTypeDto(Short locType1, Short locType2, Short locType3) {
+        this.locType1 = locType1;
+        this.locType2 = locType2;
+        this.locType3 = locType3;
+    }
+
     public LocTypeDto(StaProtocol staProtocol) {
-        if (staProtocol.isHigh() == staProtocol.isLow()) {
-            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-        }
-        if (staProtocol.isLow()) {
-            this.locType1 = 1; // 浣庡簱浣�
-        } else {
+//        if (staProtocol.isHigh() == staProtocol.isLow()) {
+//            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+//        }
+        if (staProtocol.getSiteId() == 106){
             this.locType1 = 2; // 楂樺簱浣�
+        }else {
+            this.locType1 = 1; // 浣庡簱浣�
         }
     }
 

--
Gitblit v1.9.1