From dfecfcf673479df6344b728368edd1edb7f1445e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 16:08:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflsbwcs' into ytflsbwcs

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   80 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 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 16a7ad7..03d4cab 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -1,5 +1,6 @@
 package com.zy.core.model.protocol;
 
+import com.zy.asrs.entity.BasDevp;
 import lombok.Data;
 
 /**
@@ -7,11 +8,20 @@
  * Created by vincent on 2020/8/6
  */
 @Data
-public class StaProtocol {
+public class StaProtocol implements Cloneable {
 
     // 绔欑偣缂栧彿
     private Integer siteId;
 
+    // ----------------------------------------------------------------
+    // 宸ヤ綔鍙�
+    private Short workNo = 0;
+
+    // ----------------------------------------------------------------
+    // 鐩爣绔�
+    private Short staNo;
+
+    // ----------------------------------------------------------------
     // 鑷姩
     private boolean autoing;
 
@@ -27,17 +37,71 @@
     // 绌烘澘淇″彿
     private boolean emptyMk;
 
-    // 闇�姹�1
-    private boolean inreq1;
+    // 婊℃墭鐩�
+    private boolean fullPlt;
+
+    // 楂�
+    private boolean high;
+
+    // 浣�
+    private boolean low;
 
     // 閿佸畾鏍囪
-    private boolean pakMk;
+    private boolean pakMk = true;
 
-    // 宸ヤ綔鍙�
-    private Integer workNo;
+    //鎶ヨ
+    private Short error;
 
-    // 鐩爣绔�
-    private Integer staNo;
+    // 鍓嶈秴鎶ヨ
+    private boolean frontError;
 
+    // 鍚庤秴鎶ヨ
+    private boolean backError;
+
+    // 瓒呴珮鎶ヨ
+    private boolean highError;
+
+    // 宸﹂珮鎶ヨ
+    private boolean leftError;
+
+    // 鍙抽珮鎶ヨ
+    private boolean rightError;
+
+    // 瓒呴噸鎶ヨ
+    private boolean weightError;
+
+    // 鎵爜鎶ヨ
+    private boolean barcodeError;
+
+    // 鎵樼洏灏哄
+    private Short palletSize;
+
+    //绌烘墭鍏ュ簱绫诲瀷
+    private Short emptyInType;
+
+    public BasDevp toSqlModel(){
+        BasDevp basDevp = new BasDevp();
+        basDevp.setDevNo(siteId);
+        basDevp.setWrkNo(workNo.intValue());
+        basDevp.setAutoing(autoing?"Y":"N");
+        basDevp.setLoading(loading?"Y":"N");
+        basDevp.setInEnable(inEnable?"Y":"N");
+        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:閲嶅簱浣峿
+        basDevp.setLocType1(high != low && low ? (short) 1 : (short) 2);
+        return basDevp;
+    }
+
+    @Override
+    public StaProtocol clone() {
+        try {
+            return (StaProtocol) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
 }

--
Gitblit v1.9.1