From 24b39a858545b192bbba4ee336af201b45f4d1dd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 24 十二月 2024 16:04:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index f9ecc5b..6f184de 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -186,7 +186,8 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
@@ -307,11 +308,29 @@
*/
@ApiModelProperty(value= "琛屽彿")
@TableField("line_number")
- private Integer lineNumber;
+ private Long lineNumber;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1;
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2;
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3;
public OrderDetlPakin() {}
- public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
+ public OrderDetlPakin(Long orderId, String orderNo, Double anfme, Double qty, String matnr, String maktx, String batch, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double safeQty, Double weight, Double manLength, Double volume, String threeCode, String supp, String suppCode, Integer beBatch, String deadTime, Integer deadWarn, Integer source, Integer inspect, Integer danger, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -334,7 +353,7 @@
this.itemNum = itemNum;
this.safeQty = safeQty;
this.weight = weight;
- this.length = length;
+ this.manLength = manLength;
this.volume = volume;
this.threeCode = threeCode;
this.supp = supp;
@@ -485,6 +504,18 @@
return "鏈畬鎴�";
}
+ public boolean beSimilar(OrderDetlPakin orderDetlPakin){
+ return (
+ this.orderNo.equals(orderDetlPakin.getOrderNo())
+ && this.matnr.equals(orderDetlPakin.getMatnr())
+ && this.batch.equals(orderDetlPakin.getBatch())
+ && this.brand.equals(orderDetlPakin.getBrand())
+ && this.standby1.equals(orderDetlPakin.getStandby1())
+ && this.standby2.equals(orderDetlPakin.getStandby2())
+ && this.standby3.equals(orderDetlPakin.getStandby3())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1