From 0d4ef71836341f929a57e3943c5ca131e4c0a8c5 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 25 十二月 2024 11:13:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/OrderDetlPakout.java |   44 ++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 3149f50..fe454d0 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -308,25 +308,46 @@
      */
     @ApiModelProperty(value= "琛屽彿")
     @TableField("line_number")
-    private Integer lineNumber;
+    private Long lineNumber;
 
     /**
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1;
+    private String standby1 = "";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2;
+    private String standby2 = "";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3;
+    private String standby3 = "";
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    @TableField("box_type1")
+    private String boxType1 = "1";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    @TableField("box_type2")
+    private String boxType2 = "1";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    @TableField("box_type3")
+    private String boxType3 = "1";
 
     public OrderDetlPakout() {}
 
@@ -505,6 +526,21 @@
         return "鏈畬鎴�";
     }
 
+    public boolean beSimilar(OrderDetlPakout orderDetlPakout){
+        return (
+                this.orderNo.equals(orderDetlPakout.getOrderNo())
+                && this.matnr.equals(orderDetlPakout.getMatnr())
+                && this.batch.equals(orderDetlPakout.getBatch())
+                && this.brand.equals(orderDetlPakout.getBrand())
+                && this.standby1.equals(orderDetlPakout.getStandby1())
+                && this.standby2.equals(orderDetlPakout.getStandby2())
+                && this.standby3.equals(orderDetlPakout.getStandby3())
+                        && this.boxType1.equals(orderDetlPakout.getBoxType1())
+                        && this.boxType2.equals(orderDetlPakout.getBoxType2())
+                        && this.boxType3.equals(orderDetlPakout.getBoxType3())
+        );
+    }
+
     public void sync(Object source) {
         Synchro.Copy(source, this);
     }

--
Gitblit v1.9.1