From d24de0230589862903c2155087659941e03f221b Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 10:34:04 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index aafcf23..b8fe4c0 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,6 +62,13 @@
private Double qty;
/**
+ * 搴撳瓨鏁伴噺
+ */
+ @ApiModelProperty(value= "搴撳瓨鏁伴噺")
+ @TableField(exist = false)
+ private Double stock;
+
+ /**
* 鐗╂枡鍙�
*/
@ApiModelProperty(value= "鐗╂枡鍙�")
@@ -285,9 +292,19 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 宸ュ簭鐘舵��
+ */
+ @ApiModelProperty(value= "宸ュ簭鐘舵�� 1锛氬緟鍔犲伐锛�2锛氬凡鍔犲伐锛�3锛氭棤闇�鍔犲伐")
+ @TableField("process_sts")
+ private Integer processSts;
+
+ @TableField("report_qty")
+ private Double reportQty;
+
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 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,Integer processSts) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
@@ -327,6 +344,7 @@
this.updateBy = updateBy;
this.updateTime = updateTime;
this.memo = memo;
+ this.processSts = processSts;
}
public String getOrderId$(){
@@ -336,6 +354,22 @@
return String.valueOf(order.getId());
}
return null;
+ }
+
+ public String getProcessSts$(){
+ if (null == this.processSts){ return null; }
+ switch (this.processSts){
+ case 0:
+ return "鍏朵粬";
+ case 1:
+ return "寰呭姞宸�";
+ case 2:
+ return "宸插姞宸�";
+ case 3:
+ return "鏃犻渶鍔犲伐";
+ default:
+ return String.valueOf(this.processSts);
+ }
}
public String getBeBatch$(){
@@ -433,10 +467,15 @@
}
public Double getEnableQty() {
+ Double enableQty = null;
if (null != this.anfme && this.qty != null) {
- return this.anfme - this.qty;
+ enableQty = this.anfme - this.qty;
+ if (enableQty < 0) {
+ enableQty = 0.0D;
+ }
+// return this.anfme - this.qty;
}
- return null;
+ return enableQty;
}
public void sync(Object source) {
--
Gitblit v1.9.1