From 2e82ef6fd6dfbcb1eb88a8d4b705eae7fb99065b Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期五, 06 六月 2025 17:04:11 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java | 68 +++++++++++++++++---------------- 1 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java index 2961436..d59b78b 100644 --- a/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java +++ b/src/main/java/com/zy/asrs/entity/InventoryCheckOrderDetl.java @@ -1,16 +1,17 @@ package com.zy.asrs.entity; -import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.annotations.TableField; -import java.text.SimpleDateFormat; -import java.util.Date; -import org.springframework.format.annotation.DateTimeFormat; - +import com.baomidou.mybatisplus.annotations.TableId; +import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.enums.IdType; +import com.core.common.Cools; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import com.baomidou.mybatisplus.annotations.TableName; +import org.springframework.format.annotation.DateTimeFormat; + import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; @Data @TableName("man_Inventory_check_order_detl") @@ -18,48 +19,49 @@ private static final long serialVersionUID = 1L; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("order_no") private String orderNo; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String matnr; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String maktx; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String batch; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private Double anfme; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String area; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String status; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("loc_no") private String locNo; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("check_anfme") private Double checkAnfme; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("io_time") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date ioTime; - public InventoryCheckOrderDetl() {} + public InventoryCheckOrderDetl() { + } - public InventoryCheckOrderDetl(String orderNo,String matnr,String maktx,String batch,Double anfme,String area,String locNo,Date ioTime) { + public InventoryCheckOrderDetl(String orderNo, String matnr, String maktx, String batch, Double anfme, String area, String locNo, Date ioTime) { this.orderNo = orderNo; this.matnr = matnr; this.maktx = maktx; @@ -81,18 +83,18 @@ // null // // ); - public String getIoTime$(){ - if (Cools.isEmpty(this.ioTime)){ + public String getIoTime$() { + if (Cools.isEmpty(this.ioTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } - public String getStatus$(){ - if (Cools.isEmpty(this.status)){ - return ""; + public String getStatus$() { + if (Cools.isEmpty(this.status)) { + return "寰呯洏"; } - switch (this.status){ + switch (this.status) { case "1": return "寰呯洏"; case "2": @@ -102,18 +104,18 @@ } } - public String getProfit$(){ - if (Cools.isEmpty(this.status) && !this.status.equals("1")){ + public String getProfit$() { + if (Cools.isEmpty(this.status) || !this.status.equals("1")) { return "鏈洏鐐�"; } - if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)){ + if (Cools.isEmpty(this.anfme) || Cools.isEmpty(this.checkAnfme)) { return ""; } - if (this.anfme > this.checkAnfme){ + if (this.anfme > this.checkAnfme) { return "鐩樹簭"; - }else if (this.anfme < this.checkAnfme){ + } else if (this.anfme < this.checkAnfme) { return "鐩樼泩"; - }else { + } else { return "骞�"; } } -- Gitblit v1.9.1