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/NccSaleXclGgsybWms.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java b/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
index c059d67..786777c 100644
--- a/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
+++ b/src/main/java/com/zy/nc/entity/NccSaleXclGgsybWms.java
@@ -44,6 +44,11 @@
private String ck;
/**
+ *
+ */
+ private String ckbm;
+
+ /**
*
*/
private String sssyb;
@@ -173,6 +178,16 @@
*/
private String clcj;
+ /**
+ *
+ */
+ private String wmsMemo;
+
+ /**
+ *
+ */
+ private Integer wmsFlag;
+
@Override
public boolean equals(Object that) {
if (this == that) {
@@ -216,7 +231,9 @@
&& (this.getSjflmc() == null ? other.getSjflmc() == null : this.getSjflmc().equals(other.getSjflmc()))
&& (this.getZsl() == null ? other.getZsl() == null : this.getZsl().equals(other.getZsl()))
&& (this.getFsl() == null ? other.getFsl() == null : this.getFsl().equals(other.getFsl()))
- && (this.getClcj() == null ? other.getClcj() == null : this.getClcj().equals(other.getClcj()));
+ && (this.getClcj() == null ? other.getClcj() == null : this.getClcj().equals(other.getClcj()))
+ && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()))
+ && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
}
@Override
@@ -255,6 +272,8 @@
result = prime * result + ((getZsl() == null) ? 0 : getZsl().hashCode());
result = prime * result + ((getFsl() == null) ? 0 : getFsl().hashCode());
result = prime * result + ((getClcj() == null) ? 0 : getClcj().hashCode());
+ result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
+ result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
return result;
}
@@ -296,6 +315,8 @@
sb.append(", zsl=").append(zsl);
sb.append(", fsl=").append(fsl);
sb.append(", clcj=").append(clcj);
+ sb.append(", wmsMemo=").append(wmsMemo);
+ sb.append(", wmsFlag=").append(wmsFlag);
sb.append("]");
return sb.toString();
}
--
Gitblit v1.9.1