From f746571f6d16529b8e2593e1d25681dde592d56c Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 18 四月 2024 11:11:48 +0800
Subject: [PATCH] 商品档案全量导出修改
---
src/main/java/com/zy/asrs/entity/OrderDetl.java | 15 +++++++--------
1 files changed, 7 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 da61de9..cbfd85f 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -84,9 +84,9 @@
private String maktx;
/**
- * 搴忓垪鐮�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "搴忓垪鐮�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String batch;
/**
@@ -110,7 +110,8 @@
/**
* 鍝佺墝
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "绫诲瀷")
+// @ApiModelProperty(value= "鍝佺墝")
private String brand;
/**
@@ -443,12 +444,10 @@
}
public Double getEnableQty() {
- if (null != this.anfme && this.workQty != null) {
- return this.anfme - this.workQty;
+
+ if (null != this.anfme && this.qty != null) {
+ return this.anfme - this.qty;
}
-// if (null != this.anfme && this.qty != null) {
-// return this.anfme - this.qty;
-// }
return null;
}
--
Gitblit v1.9.1