From 97fd38f691e779bd2c9f4f7e400d0457391522ea Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 一月 2021 10:46:15 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 64e43af..358631e 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -37,25 +37,31 @@
     // 绌烘澘淇″彿
     private boolean emptyMk;
 
+    // 楂�
+    private boolean high;
+
+    // 浣�
+    private boolean low;
+
     // 闇�姹�1
     private boolean inreq1;
 
     // 閿佸畾鏍囪
     private boolean pakMk = true;
 
-    // 鍙拌溅浣嶇疆
-    private Short position;
 
     public BasDevp toSqlModel(){
         BasDevp basDevp = new BasDevp();
         basDevp.setDevNo(siteId);
         basDevp.setWrkNo(workNo.intValue());
-        // 绔欑偣 todo:luxiaotao
         basDevp.setAutoing(autoing?"Y":"N");
         basDevp.setLoading(loading?"Y":"N");
         basDevp.setInEnable(inEnable?"Y":"N");
         basDevp.setOutEnable(outEnable?"Y":"N");
-        basDevp.setInreq1(inreq1?"Y":"N");
+        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);
         return basDevp;
     }
 

--
Gitblit v1.9.1