From 015b9522a1a70a3e727fccfcc2f56365d82aaaf3 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期六, 05 七月 2025 17:01:36 +0800
Subject: [PATCH] WCS优化

---
 src/main/java/com/zy/common/model/LocTypeDto.java |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/common/model/LocTypeDto.java b/src/main/java/com/zy/common/model/LocTypeDto.java
index bf782d9..a4fd352 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,17 +18,25 @@
     // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
     private Short locType3;
 
+    private Integer siteId;
+
     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()) {
 //            this.locType1 = 2; // 楂樺簱浣�
+//        } else if (staProtocol.isLow()) {
+            this.locType1 = 1; // 浣庡簱浣�
 //        }
     }
 

--
Gitblit v1.9.1