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 |   68 ++++++++++++++++++++++++++++++---
 1 files changed, 61 insertions(+), 7 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 d2c4888..0fecace 100644
--- a/src/main/java/com/zy/core/model/protocol/StaProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/StaProtocol.java
@@ -20,6 +20,20 @@
     // ----------------------------------------------------------------
     // 鐩爣绔�
     private Short staNo;
+    //鐩爣绔�
+    private Short staNoEnd;
+
+    // ----------------------------------------------------------------
+    // 鐗╂枡浠g爜
+    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;
 
     // ----------------------------------------------------------------
     // 鑷姩
@@ -46,17 +60,57 @@
     // 浣�
     private boolean low;
 
+    // 楂�
+    private boolean high1;
+
+    // 浣�
+    private boolean low1;
+
     // 閿佸畾鏍囪
     private boolean pakMk = true;
 
-    // 鍏ュ簱鏆傚瓨鏁�
-    private Short inQty;
+    //绌烘墭鐩橀渶姹備俊鍙�
+    private boolean emptyOutPalletRequire;
+    private boolean emptyInPalletRequire;
 
-    // 闅斿绔欑偣锛堝彴杞︿綅缃級
-    private String nearbySta;
+    //搴撲綅楂樺害
+    private Short locType1;
 
-    // 鎵樼洏鏄彲鍚︽暣鍨�
-    private boolean full;
+    // 澶栧舰妫�娴� ------------------------------------------------------------------------
+
+    // 鍓嶈秴闄�
+    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();
@@ -70,7 +124,7 @@
         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);
+//        basDevp.
         return basDevp;
     }
 

--
Gitblit v1.9.1