From b9cd7d99e4916d5a6b721d43644b0ae080ddfd7c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 17 十二月 2024 13:53:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 103 insertions(+), 11 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..04bbfec 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;
/**
@@ -176,7 +186,8 @@
* 闀垮害
*/
@ApiModelProperty(value= "闀垮害")
- private Double length;
+ @TableField("man_length")
+ private Double manLength;
/**
* 浣撶Н
@@ -226,7 +237,7 @@
private Integer deadWarn;
/**
- * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 銆併�佸疁绉戯細 鏄惁纭 1: 纭 2: 鏈‘璁�
*/
@ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
private Integer source;
@@ -285,9 +296,23 @@
@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() {}
- public OrderDetl(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 OrderDetl(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;
@@ -310,7 +335,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;
@@ -328,6 +353,51 @@
this.updateTime = updateTime;
this.memo = memo;
}
+
+ public OrderDetl(OrderDetl orderDetl) {
+ this.orderId = orderDetl.getOrderId();
+ this.orderNo = orderDetl.getOrderNo();
+ this.anfme = orderDetl.getAnfme();
+ this.qty = orderDetl.getQty();
+ this.matnr = orderDetl.getMatnr();
+ this.maktx = orderDetl.getMaktx();
+ this.batch = orderDetl.getBatch();
+ this.specs = orderDetl.getSpecs();
+ this.model = orderDetl.getModel();
+ this.color = orderDetl.getColor();
+ this.brand = orderDetl.getBrand();
+ this.unit = orderDetl.getUnit();
+ this.price = orderDetl.getPrice();
+ this.sku = orderDetl.getSku();
+ this.units = orderDetl.getUnits();
+ this.barcode = orderDetl.getBarcode();
+ this.origin = orderDetl.getOrigin();
+ this.manu = orderDetl.getManu();
+ this.manuDate = orderDetl.getManuDate();
+ this.itemNum = orderDetl.getItemNum();
+ this.safeQty = orderDetl.getSafeQty();
+ this.weight = orderDetl.getWeight();
+ this.manLength = orderDetl.getManLength();
+ this.volume = orderDetl.getVolume();
+ this.threeCode = orderDetl.getThreeCode();
+ this.supp = orderDetl.getSupp();
+ this.suppCode = orderDetl.getSuppCode();
+ this.beBatch = orderDetl.getBeBatch();
+ this.deadTime = orderDetl.getDeadTime();
+ this.deadWarn = orderDetl.getDeadWarn();
+ this.source = orderDetl.getSource();
+ this.inspect = orderDetl.getInspect();
+ this.danger = orderDetl.getDanger();
+ this.status = orderDetl.getStatus();
+ this.createBy = orderDetl.getCreateBy();
+ this.createTime = orderDetl.getCreateTime();
+ this.updateBy = orderDetl.getUpdateBy();
+ this.updateTime = orderDetl.getUpdateTime();
+ this.memo = orderDetl.getMemo();
+ this.pakinPakoutStatus = orderDetl.getPakinPakoutStatus();
+ this.lineNumber = orderDetl.getLineNumber();
+ }
+
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
@@ -433,14 +503,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