From 637e8436a33cbc4ea04d4fc68763debaba8412c4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 11 八月 2025 14:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms

---
 src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java |  101 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
index 612aa6c..9ab0cca 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXsfhmxWms.java
@@ -1,9 +1,9 @@
 package com.zy.nc.entity;
 
-import com.baomidou.mybatisplus.annotations.TableField;
+import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import java.math.BigDecimal;
 import lombok.Data;
 
 /**
@@ -133,6 +133,11 @@
      * 
      */
     private String wlbm;
+
+    /**
+     *
+     */
+    private String vbatchcode;
 
     /**
      * 
@@ -384,6 +389,66 @@
      */
     private Integer wmsFlag;
 
+    /**
+     * 
+     */
+    private String vdef7;
+
+    /**
+     * 
+     */
+    private String vdef2;
+
+    /**
+     * 
+     */
+    private String vdef13;
+
+    /**
+     * 
+     */
+    private String vdef3;
+
+    /**
+     * 
+     */
+    private String vdef14;
+
+    /**
+     * 
+     */
+    private String vdef8;
+
+    /**
+     * 
+     */
+    private String vdef4;
+
+    /**
+     * 
+     */
+    private String wmsMemo;
+
+    /**
+     * 
+     */
+    private String fhckbm;
+
+    /**
+     * 
+     */
+    private String fhckmc;
+
+    /**
+     *
+     */
+    private String kpkhbm;
+
+    /**
+     *
+     */
+    private String kpkhmc;
+
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -469,7 +534,17 @@
             && (this.getKczzbm() == null ? other.getKczzbm() == null : this.getKczzbm().equals(other.getKczzbm()))
             && (this.getKczzmc() == null ? other.getKczzmc() == null : this.getKczzmc().equals(other.getKczzmc()))
             && (this.getVnote() == null ? other.getVnote() == null : this.getVnote().equals(other.getVnote()))
-            && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
+            && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()))
+            && (this.getVdef7() == null ? other.getVdef7() == null : this.getVdef7().equals(other.getVdef7()))
+            && (this.getVdef2() == null ? other.getVdef2() == null : this.getVdef2().equals(other.getVdef2()))
+            && (this.getVdef13() == null ? other.getVdef13() == null : this.getVdef13().equals(other.getVdef13()))
+            && (this.getVdef3() == null ? other.getVdef3() == null : this.getVdef3().equals(other.getVdef3()))
+            && (this.getVdef14() == null ? other.getVdef14() == null : this.getVdef14().equals(other.getVdef14()))
+            && (this.getVdef8() == null ? other.getVdef8() == null : this.getVdef8().equals(other.getVdef8()))
+            && (this.getVdef4() == null ? other.getVdef4() == null : this.getVdef4().equals(other.getVdef4()))
+            && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()))
+            && (this.getFhckbm() == null ? other.getFhckbm() == null : this.getFhckbm().equals(other.getFhckbm()))
+            && (this.getFhckmc() == null ? other.getFhckmc() == null : this.getFhckmc().equals(other.getFhckmc()));
     }
 
     @Override
@@ -550,6 +625,16 @@
         result = prime * result + ((getKczzmc() == null) ? 0 : getKczzmc().hashCode());
         result = prime * result + ((getVnote() == null) ? 0 : getVnote().hashCode());
         result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
+        result = prime * result + ((getVdef7() == null) ? 0 : getVdef7().hashCode());
+        result = prime * result + ((getVdef2() == null) ? 0 : getVdef2().hashCode());
+        result = prime * result + ((getVdef13() == null) ? 0 : getVdef13().hashCode());
+        result = prime * result + ((getVdef3() == null) ? 0 : getVdef3().hashCode());
+        result = prime * result + ((getVdef14() == null) ? 0 : getVdef14().hashCode());
+        result = prime * result + ((getVdef8() == null) ? 0 : getVdef8().hashCode());
+        result = prime * result + ((getVdef4() == null) ? 0 : getVdef4().hashCode());
+        result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
+        result = prime * result + ((getFhckbm() == null) ? 0 : getFhckbm().hashCode());
+        result = prime * result + ((getFhckmc() == null) ? 0 : getFhckmc().hashCode());
         return result;
     }
 
@@ -633,6 +718,16 @@
         sb.append(", kczzmc=").append(kczzmc);
         sb.append(", vnote=").append(vnote);
         sb.append(", wmsFlag=").append(wmsFlag);
+        sb.append(", vdef7=").append(vdef7);
+        sb.append(", vdef2=").append(vdef2);
+        sb.append(", vdef13=").append(vdef13);
+        sb.append(", vdef3=").append(vdef3);
+        sb.append(", vdef14=").append(vdef14);
+        sb.append(", vdef8=").append(vdef8);
+        sb.append(", vdef4=").append(vdef4);
+        sb.append(", wmsMemo=").append(wmsMemo);
+        sb.append(", fhckbm=").append(fhckbm);
+        sb.append(", fhckmc=").append(fhckmc);
         sb.append("]");
         return sb.toString();
     }

--
Gitblit v1.9.1