From 3599feef955e2dcf974ecefeaeb7b28cacb97a73 Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期六, 19 四月 2025 08:55:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/jx-fyxc-wms' into jx-fyxc-wms --- src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java index 722c3af..2961436 100644 --- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java +++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java @@ -42,8 +42,15 @@ private String area; @ApiModelProperty(value= "") + private String status; + + @ApiModelProperty(value= "") @TableField("loc_no") private String locNo; + + @ApiModelProperty(value= "") + @TableField("check_anfme") + private Double checkAnfme; @ApiModelProperty(value= "") @TableField("io_time") @@ -81,5 +88,35 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } + public String getStatus$(){ + if (Cools.isEmpty(this.status)){ + return ""; + } + switch (this.status){ + case "1": + return "寰呯洏"; + case "2": + return "宸茬洏"; + default: + return ""; + } + } + + 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