From 1ab69a554aa5849d0ec61f5ac357d339589048e7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 09:49:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 62 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 8a2728c..e7e66b5 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -55,10 +55,20 @@
/**
* 浣滀笟鏁伴噺
*
- * 1. 鍏ュ簱 : qty 馃憜
- * 1. 鍑哄簱 : qty 馃憜
+ * 鍏ュ簱 : 缁勬墭瀹屾垚锛岀粍鎵樻。銆佸伐浣滄。銆佸叆搴撳畬鎴愭暟閲�
+ * 鍑哄簱 : 宸ヤ綔妗ｃ�佸嚭搴撳畬鎴愭暟閲�
*/
@ApiModelProperty(value= "浣滀笟鏁伴噺")
+ @TableField("work_qty")
+ private Double workQty;
+
+ /**
+ * 瀹屾垚鏁伴噺
+ *
+ * 鍏ュ簱 : qty 馃憜
+ * 鍑哄簱 : qty 馃憜
+ */
+ @ApiModelProperty(value= "瀹屾垚鏁伴噺")
private Double qty;
/**
@@ -74,9 +84,9 @@
private String maktx;
/**
- * 搴忓垪鐮�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
/**
@@ -226,7 +236,7 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -284,6 +294,20 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ /**
+ * 鐘舵�� 0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴�
+ */
+ @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+ @TableField("pakin_pakout_status")
+ private Integer pakinPakoutStatus;
+
+ /**
+ * 琛屽彿
+ */
+ @ApiModelProperty(value= "琛屽彿")
+ @TableField("line_number")
+ private Integer lineNumber;
public OrderDetl() {}
@@ -433,14 +457,36 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ if (null != this.anfme && this.workQty != null) {
+ return this.anfme - this.workQty;
}
+// if (null != this.anfme && this.qty != null) {
+// return this.anfme - this.qty;
+// }
return null;
}
+
+ public String getQty$(){
+ if (getAnfme().equals(getQty())){
+ return "宸插畬鎴�";
+ }
+ return "鏈畬鎴�";
+ }
+
+ public String getPakinPakoutStatus$(){
+ switch (this.pakinPakoutStatus){
+ case 1:
+ return "Y";
+ case 2:
+ return "N";
+ default:
+ return null;
+ }
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1