From c055f092fd989a009e93e7b7b4ccceb6eaaead38 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期五, 06 十二月 2024 16:05:13 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/StaProtocol.java |   93 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 87 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 4c141f2..0fecace 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -8,7 +8,7 @@
  * Created by vincent on 2020/8/6
  */
 @Data
-public class StaProtocol {
+public class StaProtocol implements Cloneable {
 
     // 绔欑偣缂栧彿
     private Integer siteId;
@@ -20,6 +20,20 @@
     // ----------------------------------------------------------------
     // 鐩爣绔�
     private Short staNo;
+    //鐩爣绔�
+    private Short staNoEnd;
+
+    // ----------------------------------------------------------------
+    // 鐗╂枡浠ｇ爜
+    private Integer matnr;
+    private String batch;
+    private Double anfme;
+    private Double anfme2;
+    private Double weight1 = 0.0;
+    private Double weight2 = 0.0;
+    private Double weight3 = 0.0;
+    private Double weight4 = 0.0;
+    private boolean ban = false;
 
     // ----------------------------------------------------------------
     // 鑷姩
@@ -37,24 +51,91 @@
     // 绌烘澘淇″彿
     private boolean emptyMk;
 
-    // 闇�姹�1
-    private boolean inreq1;
+    // 婊℃墭鐩�
+    private boolean fullPlt;
+
+    // 楂�
+    private boolean high;
+
+    // 浣�
+    private boolean low;
+
+    // 楂�
+    private boolean high1;
+
+    // 浣�
+    private boolean low1;
 
     // 閿佸畾鏍囪
-    private boolean pakMk;
+    private boolean pakMk = true;
+
+    //绌烘墭鐩橀渶姹備俊鍙�
+    private boolean emptyOutPalletRequire;
+    private boolean emptyInPalletRequire;
+
+    //搴撲綅楂樺害
+    private Short locType1;
+
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    private boolean frontErr = false;
+
+    // 鍚庤秴闄�
+    private boolean backErr = false;
+
+    // 楂樿秴闄�
+    private boolean highErr = false;
+
+    // 宸﹁秴闄�
+    private boolean leftErr = false;
+
+    // 鍙宠秴闄�
+    private boolean rightErr = false;
+
+    // 瓒呴噸
+    private boolean weightErr = false;
+
+    // 鎵爜澶辫触
+    private boolean barcodeErr = false;
+
+    private boolean force = false;
+    private short amount = 0;
+    private Short tongType = 0;
+    private Short weight = 0;
+
+    public Boolean isErr(){
+        if (frontErr || backErr || highErr || leftErr || rightErr || weightErr || barcodeErr){
+            return true;
+        }else {
+            return false;
+        }
+    }
 
     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);
+//        basDevp.
         return basDevp;
     }
 
+    @Override
+    public StaProtocol clone() {
+        try {
+            return (StaProtocol) super.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
 
 }

--
Gitblit v1.9.1