From fb4cfaec4b05618ef49f483cd80b770a286bb9f8 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期四, 31 十月 2024 10:13:13 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
index 5f3f9c3..1248bc5 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderSyncParam.java
@@ -3,6 +3,7 @@
 import lombok.Data;
 
 import java.util.List;
+import java.util.Objects;
 
 @Data
 public class OrderSyncParam {
@@ -12,8 +13,10 @@
 
     //鍏ュ嚭搴撴爣璁�
     private Integer pakin;
+    //鍗曟嵁绫诲瀷
+    private String orderType;
 
-    //閲囪喘璁㈠崟缂栧彿
+    //璁㈠崟缂栧彿
     private String cPOID;
     //渚涘簲鍟嗙紪鐮�
     private String cVenCode;
@@ -87,11 +90,13 @@
     }
 
     @Data
-    public static class OrderDetl{
-        //閲囪喘璁㈠崟琛屽彿
+    public static class OrderDetl {
+        //璁㈠崟琛屽彿
         private String ivouchrowno;
         //鐗╂枡缂栫爜
         private String cInvCode;
+        //鎵瑰彿
+        private String batch;
         //闇�姹傛椂闂�
         private String dArriveDate;
         //闇�姹傛暟閲�
@@ -119,6 +124,18 @@
         //閿�鍞鍗曞瓙琛ㄦ爣璇�
         private String iorderdid;
 
+        @Override
+        public boolean equals(Object object) {
+            if (this == object) return true;
+            if (object == null || getClass() != object.getClass()) return false;
+            OrderDetl orderDetl = (OrderDetl) object;
+            return Objects.equals(cInvCode, orderDetl.cInvCode) && Objects.equals(batch, orderDetl.batch) && Objects.equals(bFree1, orderDetl.bFree1) && Objects.equals(cDefine22, orderDetl.cDefine22);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(ivouchrowno, cInvCode, batch, dArriveDate, iQuantity, iTaxPrice, iPerTaxRate, cbMemo, iNum, cSource, cDefine22, Rstates, csocode, bFree1, id, iorderdid);
+        }
 
         public void setIvouchrowno(String ivouchrowno) {
             this.ivouchrowno = ivouchrowno;

--
Gitblit v1.9.1