From 0c45c200a1977c66096af34bb0480744c8d3c76f Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 02 四月 2024 16:47:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 9f51f3c..2d20f94 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,21 +62,21 @@
private Double qty;
/**
- * 鍟嗗搧缂栫爜
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
/**
- * 鎵瑰彿
+ * 搴忓垪鐮�
*/
- @ApiModelProperty(value= "鎵瑰彿")
+ @ApiModelProperty(value= "搴忓垪鐮�")
private String batch;
/**
@@ -86,9 +86,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
/**
@@ -122,9 +122,9 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
/**
@@ -134,9 +134,9 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
/**
@@ -146,9 +146,9 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
@@ -433,10 +433,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