From e828e4befcbd054b79ba2e652860ec0bcefba2e8 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 22 十二月 2022 15:28:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/CheckRecord.java | 12 +++++++++++-
src/main/webapp/static/js/checkRecord/checkRecord.js | 2 +-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CheckRecord.java b/src/main/java/com/zy/asrs/entity/CheckRecord.java
index 1714226..06a8403 100644
--- a/src/main/java/com/zy/asrs/entity/CheckRecord.java
+++ b/src/main/java/com/zy/asrs/entity/CheckRecord.java
@@ -71,6 +71,10 @@
@TableField("confirm_qty")
private Double confirmQty;
+ @ApiModelProperty(value= "鐩樼偣宸紓閲�")
+ @TableField(exist = false)
+ private Double adjQty;
+
/**
* 璁板綍鏃堕棿
*/
@@ -116,5 +120,11 @@
Synchro.Copy(source, this);
}
-
+ public Double getAdjQty$() {
+ if(!Cools.isEmpty(confirmQty) && !Cools.isEmpty(anfme)){
+ return confirmQty - anfme;
+ } else {
+ return null;
+ }
+ }
}
diff --git a/src/main/webapp/static/js/checkRecord/checkRecord.js b/src/main/webapp/static/js/checkRecord/checkRecord.js
index 2f6344a..9e16000 100644
--- a/src/main/webapp/static/js/checkRecord/checkRecord.js
+++ b/src/main/webapp/static/js/checkRecord/checkRecord.js
@@ -30,8 +30,8 @@
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'anfme', align: 'center',title: '鐩樼偣鍓嶆暟閲�'}
,{field: 'confirmQty', align: 'center',title: '鐩樼偣纭閲�'}
+ ,{field: 'adjQty$', align: 'center',title: '鐩樼偣宸紓閲�'}
,{field: 'createTime$', align: 'center',title: '璁板綍鏃堕棿'}
-
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
request: {
--
Gitblit v1.9.1