From 8b71bde8d68d5d2bb11fa51a297990cd1474e9c6 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 29 十一月 2023 14:58:09 +0800
Subject: [PATCH] #指令更新

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   87 ++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 81 insertions(+), 6 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 7113a2c..8dbd9ce 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,7 @@
 package com.zy.core.model.protocol;
 
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.CommandInfo;
 import lombok.Data;
 
 /**
@@ -7,11 +9,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,14 +38,78 @@
     // 绌烘澘淇″彿
     private boolean emptyMk;
 
-    // 闇�姹�1
-    private boolean inreq1;
+    // 婊℃墭鐩�
+    private boolean fullPlt;
+
+    // 楂�
+    private boolean high = false;
+
+    // 浣�
+    private boolean low;
+
+    //agv
+    private boolean car;
 
     // 閿佸畾鏍囪
-    private boolean pakMk;
+    private boolean pakMk = true;
 
-    // 宸ヤ綔鍙�
-    private Integer workNO;
+    // 鍏ュ簱鏆傚瓨鏁�
+    private Short inQty;
 
+    // 闅斿绔欑偣锛堝彴杞︿綅缃級
+    private String nearbySta;
+
+    //鎸囦护ID
+    private Integer commandId;
+
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr;
+
+    // 鍚庤秴闄�
+    private boolean backErr;
+
+    // 楂樿秴闄�
+    private boolean highErr;
+
+    // 宸﹁秴闄�
+    private boolean leftErr;
+
+    // 鍙宠秴闄�
+    private boolean rightErr;
+
+    // 瓒呴噸
+    private boolean weightErr;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr;
+
+
+    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);
+        basDevp.setInQty(inQty !=null ?(int)inQty : 0);
+        return basDevp;
+    }
+
+    @Override
+    public StaProtocol clone() {
+        try {
+            return (StaProtocol) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
 }

--
Gitblit v1.9.1