From 0355ffdf65a1d3ac6202dbddd5b49f726b39bbad Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 21 二月 2025 08:31:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
index 9e3f267..2961436 100644
--- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java
@@ -50,7 +50,7 @@
@ApiModelProperty(value= "")
@TableField("check_anfme")
- private String checkAnfme;
+ private Double checkAnfme;
@ApiModelProperty(value= "")
@TableField("io_time")
@@ -102,5 +102,21 @@
}
}
+ public String getProfit$(){
+ if (Cools.isEmpty(this.status) && !this.status.equals("1")){
+ return "鏈洏鐐�";
+ }
+ if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)){
+ return "";
+ }
+ if (this.anfme > this.checkAnfme){
+ return "鐩樹簭";
+ }else if (this.anfme < this.checkAnfme){
+ return "鐩樼泩";
+ }else {
+ return "骞�";
+ }
+ }
+
}
--
Gitblit v1.9.1