From a4171a52aeb242836959fecd5f4227bfba73b241 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期二, 23 十二月 2025 10:35:28 +0800
Subject: [PATCH] #移库事务回滚修改
---
src/main/java/com/zy/common/model/LocTypeDto.java | 22 ++++++++++++++--------
1 files changed, 14 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 d360b7e..f4dc19e 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;
@@ -29,19 +28,26 @@
}
public LocTypeDto(StaProtocol staProtocol) {
- if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
- throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
- }
+// System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪師濮嬫暟鎹负:"+staProtocol.isWeight()+"------------");
+// if (staProtocol.isHigh() == staProtocol.isLow() == staProtocol.isMedium() == staProtocol.isMedium_high()) {
+// throw new CoolException("plc楂樹綆妫�娴嬪紓甯�");
+// }
+
if (staProtocol.isLow()) {
this.locType1 = 1; // 浣庡簱浣�
} else if (staProtocol.isHigh()){
- this.locType1 = 2; // 楂樺簱浣�
+ this.locType1 = 2; // 涓簱浣�
} else if (staProtocol.isMedium()) {
- this.locType1 = 3;
+ this.locType1 = 3; // 涓珮搴撲綅
} else if (staProtocol.isMedium_high()) {
- this.locType1 = 4;
+ this.locType1 = 4; // 楂樺簱浣�
}
-
+ if (staProtocol.isWeight() && staProtocol.getSiteId() == 204 || staProtocol.getSiteId() == 104) {
+ this.locType1 = 2;
+ } else {
+ this.locType1 = 1;
+ }
+// System.out.println("----------"+staProtocol.getSiteId()+"搴撲綅妫�娴嬪鐞嗕负鏁版嵁涓�:"+this.locType1+"------------");
}
--
Gitblit v1.9.1