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/NccJcQilibcBarcodeflowWms.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
index ce6e401..6f4d2b7 100644
--- a/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
+++ b/src/main/java/com/zy/nc/entity/NccJcQilibcBarcodeflowWms.java
@@ -20,6 +20,10 @@
private String pkBarcode;
/**
+ *
+ */
+ private String zkdh;
+ /**
*
*/
private String ts;
@@ -28,6 +32,16 @@
*
*/
private String vbarcode;
+
+ /**
+ *
+ */
+ private String wlbm;
+
+ /**
+ *
+ */
+ private String vbatchcode;
/**
*
@@ -69,6 +83,18 @@
*/
private Integer wmsFlag;
+ /**
+ *
+ */
+ private String wmsMemo;
+
+ /**
+ *
+ */
+ private String ckbm;
+
+ private String cstateid;
+
@Override
public boolean equals(Object that) {
if (this == that) {
@@ -84,6 +110,8 @@
return (this.getPkBarcode() == null ? other.getPkBarcode() == null : this.getPkBarcode().equals(other.getPkBarcode()))
&& (this.getTs() == null ? other.getTs() == null : this.getTs().equals(other.getTs()))
&& (this.getVbarcode() == null ? other.getVbarcode() == null : this.getVbarcode().equals(other.getVbarcode()))
+ && (this.getWlbm() == null ? other.getWlbm() == null : this.getWlbm().equals(other.getWlbm()))
+ && (this.getVbatchcode() == null ? other.getVbatchcode() == null : this.getVbatchcode().equals(other.getVbatchcode()))
&& (this.getInfla() == null ? other.getInfla() == null : this.getInfla().equals(other.getInfla()))
&& (this.getAsnnum() == null ? other.getAsnnum() == null : this.getAsnnum().equals(other.getAsnnum()))
&& (this.getPkMaterial() == null ? other.getPkMaterial() == null : this.getPkMaterial().equals(other.getPkMaterial()))
@@ -91,7 +119,8 @@
&& (this.getMemo() == null ? other.getMemo() == null : this.getMemo().equals(other.getMemo()))
&& (this.getVbillno() == null ? other.getVbillno() == null : this.getVbillno().equals(other.getVbillno()))
&& (this.getNastnum() == null ? other.getNastnum() == null : this.getNastnum().equals(other.getNastnum()))
- && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()));
+ && (this.getWmsFlag() == null ? other.getWmsFlag() == null : this.getWmsFlag().equals(other.getWmsFlag()))
+ && (this.getWmsMemo() == null ? other.getWmsMemo() == null : this.getWmsMemo().equals(other.getWmsMemo()));
}
@Override
@@ -101,6 +130,8 @@
result = prime * result + ((getPkBarcode() == null) ? 0 : getPkBarcode().hashCode());
result = prime * result + ((getTs() == null) ? 0 : getTs().hashCode());
result = prime * result + ((getVbarcode() == null) ? 0 : getVbarcode().hashCode());
+ result = prime * result + ((getWlbm() == null) ? 0 : getWlbm().hashCode());
+ result = prime * result + ((getVbatchcode() == null) ? 0 : getVbatchcode().hashCode());
result = prime * result + ((getInfla() == null) ? 0 : getInfla().hashCode());
result = prime * result + ((getAsnnum() == null) ? 0 : getAsnnum().hashCode());
result = prime * result + ((getPkMaterial() == null) ? 0 : getPkMaterial().hashCode());
@@ -109,6 +140,7 @@
result = prime * result + ((getVbillno() == null) ? 0 : getVbillno().hashCode());
result = prime * result + ((getNastnum() == null) ? 0 : getNastnum().hashCode());
result = prime * result + ((getWmsFlag() == null) ? 0 : getWmsFlag().hashCode());
+ result = prime * result + ((getWmsMemo() == null) ? 0 : getWmsMemo().hashCode());
return result;
}
@@ -121,6 +153,8 @@
sb.append(", pkBarcode=").append(pkBarcode);
sb.append(", ts=").append(ts);
sb.append(", vbarcode=").append(vbarcode);
+ sb.append(", wlbm=").append(wlbm);
+ sb.append(", vbatchcode=").append(vbatchcode);
sb.append(", infla=").append(infla);
sb.append(", asnnum=").append(asnnum);
sb.append(", pkMaterial=").append(pkMaterial);
@@ -129,6 +163,7 @@
sb.append(", vbillno=").append(vbillno);
sb.append(", nastnum=").append(nastnum);
sb.append(", wmsFlag=").append(wmsFlag);
+ sb.append(", wmsMemo=").append(wmsMemo);
sb.append("]");
return sb.toString();
}
--
Gitblit v1.9.1