From b32497eebb0fbb3950fa315ed7a75c8457404744 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 16:28:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 21 +++++++++++++++++----
1 files changed, 17 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 c91c3ab..f59ffb1 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -308,25 +308,25 @@
*/
@ApiModelProperty(value= "琛屽彿")
@TableField("line_number")
- private Integer lineNumber;
+ private Long lineNumber;
/**
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private Integer standby1;
+ private String standby1;
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private Integer standby2;
+ private String standby2;
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private Integer standby3;
+ private String standby3;
public OrderDetlPakout() {}
@@ -453,6 +453,7 @@
}
public String getPakinPakoutStatus$(){
+ if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
case 1:
return "Y";
@@ -504,6 +505,18 @@
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())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1