From c937e665ccbb763968d30ef2fad61c9eb935abfe Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期四, 02 五月 2024 10:29:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phpswcs' into phpswcs
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/StaProtocol.java b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
index ccc3096..4bcaf36 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -94,7 +94,7 @@
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
- basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+ basDevp.setLocType1(weight ? (short) 1 : (short) 2);
basDevp.setInQty(inQty !=null ?(int)inQty : 0);
return basDevp;
}
--
Gitblit v1.9.1