From 29ccba30133dec6ec0516c0782da5fe7d046848d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 16 十月 2025 10:00:14 +0800
Subject: [PATCH] wcs功能完善

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index 92ba2b2..c751fe7 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;
 
@@ -19,6 +18,8 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     public LocTypeDto() {
     }
 
@@ -29,14 +30,7 @@
     }
 
     public LocTypeDto(StaProtocol staProtocol) {
-//        if (staProtocol.isHigh() == staProtocol.isLow()) {
-//            throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
-//        }
-        if (staProtocol.getSiteId() == 106){
-            this.locType1 = 2; // 楂樺簱浣�
-        }else {
-            this.locType1 = 1; // 浣庡簱浣�
-        }
+        this.locType1 = staProtocol.getGoodsHeight();
     }
 
     /**

--
Gitblit v1.9.1