From 150a2e9b867995ce118940655c8e0fafe2b4e1b9 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 10 四月 2025 18:28:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/model/protocol/StaProtocol.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 80ed721..227242f 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -5,7 +5,6 @@
/**
* 杈撻�佺嚎plc鍗曚釜绔欑偣璇︾粏淇℃伅
- * Created by vincent on 2020/8/6
*/
@Data
public class StaProtocol implements Cloneable {
@@ -78,14 +77,11 @@
// 鎵爜澶辫触
private boolean barcodeErr;
- //鍑哄叆搴撴ā寮�
+ //鍑哄叆搴撴ā寮�0銆佹湭鐭� 1銆佸叆搴擄紝2銆佸嚭搴�
private Short outInModel;
- //杈撻�佺嚎鑱斿姩杞姩鏂瑰悜锛�0锛氬仠姝㈣浆鍔紝1锛氭鍚戣浆鍔紝2锛氬弽鍚戣浆鍔�
- private Integer rotationDire;
-
- //杈撻�佺嚎102绔欏洖閫�淇″彿
- private Integer rollback102;
+ //楂樹綆淇″彿 0:鏃� 1:浣� 2:涓� 3:楂�
+ private Short locType1;
public BasDevp toSqlModel(){
BasDevp basDevp = new BasDevp();
@@ -94,7 +90,11 @@
basDevp.setAutoing(autoing?"Y":"N");
basDevp.setLoading(loading?"Y":"N");
basDevp.setInEnable(inEnable?"Y":"N");
- basDevp.setOutEnable(outEnable?"Y":"N");
+ if (siteId == 105 || siteId == 205 || siteId == 346) {
+ basDevp.setOutEnable(outInModel == 2 ? "Y" : "N");
+ }else {
+ basDevp.setOutEnable(outEnable ? "Y" : "N");
+ }
basDevp.setLocType1((short) 0); // 楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿
basDevp.setLocType2((short) 0); // 瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿
basDevp.setLocType3((short) 0); // 杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿
--
Gitblit v1.9.1