From 2e71ee94af4962b9aaf83805bc912d9a8fe118fa Mon Sep 17 00:00:00 2001 From: whycq <123456> Date: 星期一, 08 八月 2022 13:31:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/WrkDetl.java | 309 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 240 insertions(+), 69 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java index 37c368d..05c9703 100644 --- a/src/main/java/com/zy/asrs/entity/WrkDetl.java +++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java @@ -1,24 +1,19 @@ package com.zy.asrs.entity; import com.baomidou.mybatisplus.annotations.TableField; -import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.core.common.Cools; import com.core.common.SpringUtils; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; @Data -@NoArgsConstructor -@AllArgsConstructor @TableName("asr_wrk_detl") public class WrkDetl implements Serializable { @@ -38,59 +33,11 @@ @TableField("io_time") private Date ioTime; - @ApiModelProperty(value= "浜у搧缂栫爜") - @TableId(value = "mat_no") - @TableField("mat_no") - private String matNo; - - @ApiModelProperty(value= "浜у搧鍚嶇О") - @TableId(value = "mat_name") - @TableField("mat_name") - private String matName; - - @ApiModelProperty(value= "瑙勬牸") - private String specs; - - @ApiModelProperty(value= "灏哄") - private String size; - - @ApiModelProperty(value= "棰滆壊") - private String color; - - @ApiModelProperty(value= "鍗曢噸") - private Double weight; - - /** - * 鍗曟嵁缂栧彿 - */ - @ApiModelProperty(value= "鍗曟嵁缂栧彿") - @TableField("bill_no") - private String billNo; - - /** - * 搴忓彿 - */ - @ApiModelProperty(value= "搴忓彿") - @TableField("seq_no") - private Integer seqNo; - - /** - * 浠撳簱鍙� - */ - @ApiModelProperty(value= "鍝佺墝") - private String brand; - /** * 鏁伴噺 */ @ApiModelProperty(value= "鏁伴噺") - private Double qty; - - /** - * 鍗曚綅 - */ - @ApiModelProperty(value= "鍗曚綅") - private String unit; + private Double anfme; /** * 鎵樼洏鏉$爜 @@ -99,16 +46,193 @@ private String zpallet; /** - * 鐢ㄦ埛ID + * 鐗╂枡 */ - @ApiModelProperty(value= "鐢ㄦ埛ID") - private String bname; + @ApiModelProperty(value= "鍟嗗搧缂栧彿") + private String matnr; /** - * 澶囨敞 + * 鐗╂枡鎻忚堪 */ - @ApiModelProperty(value= "澶囨敞") - private String memo; + @ApiModelProperty(value= "鍟嗗搧鍚嶇О") + private String maktx; + + /** + * 鎵瑰彿 + */ + @ApiModelProperty(value= "鎵瑰彿") + private String batch; + + /** + * 鍗曟嵁缂栧彿 + */ + @ApiModelProperty(value= "鍗曟嵁缂栧彿") + @TableField("order_no") + private String orderNo; + + /** + * 瑙勬牸 + */ + @ApiModelProperty(value= "瑙勬牸") + private String specs; + + /** + * 鍨嬪彿 + */ + @ApiModelProperty(value= "鍨嬪彿") + private String model; + + /** + * 棰滆壊 + */ + @ApiModelProperty(value= "棰滆壊") + private String color; + + /** + * 鍝佺墝 + */ + @ApiModelProperty(value= "鍝佺墝") + private String brand; + + /** + * 鍗曚綅 + */ + @ApiModelProperty(value= "鍗曚綅") + private String unit; + + /** + * 鍗曚环 + */ + @ApiModelProperty(value= "鍗曚环") + private Double price; + + /** + * sku + */ + @ApiModelProperty(value= "sku") + private String sku; + + /** + * 鍗曚綅閲� + */ + @ApiModelProperty(value= "鍗曚綅閲�") + private Double units; + + /** + * 鏉$爜 + */ + @ApiModelProperty(value= "鏉$爜") + private String barcode; + + /** + * 浜у湴 + */ + @ApiModelProperty(value= "浜у湴") + private String origin; + + /** + * 鍘傚 + */ + @ApiModelProperty(value= "鍘傚") + private String manu; + + /** + * 鐢熶骇鏃ユ湡 + */ + @ApiModelProperty(value= "鐢熶骇鏃ユ湡") + @TableField("manu_date") + private String manuDate; + + /** + * 鍝侀」鏁� + */ + @ApiModelProperty(value= "鍝侀」鏁�") + @TableField("item_num") + private String itemNum; + + /** + * 瀹夊叏搴撳瓨閲� + */ + @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�") + @TableField("safe_qty") + private Double safeQty; + + /** + * 閲嶉噺 + */ + @ApiModelProperty(value= "閲嶉噺") + private Double weight; + + /** + * 闀垮害 + */ + @ApiModelProperty(value= "闀垮害") + private Double length; + + /** + * 浣撶Н + */ + @ApiModelProperty(value= "浣撶Н") + private Double volume; + + /** + * 涓夋柟缂栫爜 + */ + @ApiModelProperty(value= "涓夋柟缂栫爜") + @TableField("three_code") + private String threeCode; + + /** + * 渚涘簲鍟� + */ + @ApiModelProperty(value= "渚涘簲鍟�") + private String supp; + + /** + * 渚涘簲鍟嗙紪鐮� + */ + @ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�") + @TableField("supp_code") + private String suppCode; + + /** + * 鏄惁鎵规 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ") + @TableField("be_batch") + private Integer beBatch; + + /** + * 淇濊川鏈� + */ + @ApiModelProperty(value= "淇濊川鏈�") + @TableField("dead_time") + private String deadTime; + + /** + * 棰勮澶╂暟 + */ + @ApiModelProperty(value= "棰勮澶╂暟") + @TableField("dead_warn") + private Integer deadWarn; + + /** + * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 + */ + @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ") + private Integer source; + + /** + * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ") + private Integer inspect; + + /** + * 鍗遍櫓鍝� 1: 鏄� 0: 鍚� + */ + @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ") + private Integer danger; /** * 淇敼浜哄憳 @@ -138,21 +262,67 @@ @TableField("appe_time") private Date appeTime; - @ApiModelProperty(value= "搴撲綅鍙�") - @TableField(exist = false) - private String locNo; - - @TableField("Item_batch") - private String itemBatch; - - @TableField("order_no") - private String orderNo; + /** + * 澶囨敞 + */ + @ApiModelProperty(value= "澶囨敞") + private String memo; public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); + } + + public String getBeBatch$(){ + if (null == this.beBatch){ return null; } + switch (this.beBatch){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.beBatch); + } + } + + public String getSource$(){ + if (null == this.source){ return null; } + switch (this.source){ + case 1: + return "鍒堕��"; + case 2: + return "閲囪喘"; + case 3: + return "澶栧崗"; + default: + return String.valueOf(this.source); + } + } + + public String getInspect$(){ + if (null == this.inspect){ return null; } + switch (this.inspect){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.inspect); + } + } + + public String getDanger$(){ + if (null == this.danger){ return null; } + switch (this.danger){ + case 1: + return "鏄�"; + case 0: + return "鍚�"; + default: + return String.valueOf(this.danger); + } } public String getModiUser$(){ @@ -187,4 +357,5 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } + } -- Gitblit v1.9.1