From 00b9c782322ad546dd6bd37e6ee27f357557a676 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 24 七月 2020 15:46:57 +0800 Subject: [PATCH] #当前本版十分完美、冻结 --- src/main/java/com/zy/asrs/entity/LocMast.java | 334 ++++++++----------------------------------------------- 1 files changed, 52 insertions(+), 282 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java index 058a853..23d8301 100644 --- a/src/main/java/com/zy/asrs/entity/LocMast.java +++ b/src/main/java/com/zy/asrs/entity/LocMast.java @@ -11,11 +11,13 @@ import com.core.common.Cools; import com.core.common.SpringUtils; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; +@Data @TableName("asr_loc_mast") public class LocMast implements Serializable { @@ -87,6 +89,18 @@ @ApiModelProperty(value= "") @TableField("loc_type") private String locType; + + @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿") + @TableField("loc_type1") + private Short locType1; + + @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿") + @TableField("loc_type2") + private Short locType2; + + @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿") + @TableField("loc_type3") + private Short locType3; @ApiModelProperty(value= "") @TableField("out_enable") @@ -162,79 +176,6 @@ @TableField("ctn_no") private String ctnNo; - public LocMast() {} - - public LocMast(Long whsType,Integer pltType,Integer ctnType,String locSts,String sheetNo,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,String locType,String outEnable,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,Integer ctnKind,Double scWeight,String invWh,String mk,String barcode,String PdcType,String ctnNo) { - this.whsType = whsType; - this.pltType = pltType; - this.ctnType = ctnType; - this.locSts = locSts; - this.sheetNo = sheetNo; - this.crnNo = crnNo; - this.row1 = row1; - this.bay1 = bay1; - this.lev1 = lev1; - this.fullPlt = fullPlt; - this.locType = locType; - this.outEnable = outEnable; - this.ioTime = ioTime; - this.firstTime = firstTime; - this.modiUser = modiUser; - this.modiTime = modiTime; - this.appeUser = appeUser; - this.appeTime = appeTime; - this.errorTime = errorTime; - this.errorMemo = errorMemo; - this.ctnKind = ctnKind; - this.scWeight = scWeight; - this.invWh = invWh; - this.mk = mk; - this.barcode = barcode; - this.PdcType = PdcType; - this.ctnNo = ctnNo; - } - -// LocMast locMast = new LocMast( -// null, // 搴撲綅绫诲瀷 -// null, // -// null, // -// null, // [闈炵┖] -// null, // -// null, // 鍫嗗灈鏈哄彿(asr_bas_crnp) -// null, // 鎺� -// null, // 鍒� -// null, // 灞� -// null, // 婊℃澘 -// null, // 搴撲綅鐘舵�� -// null, // -// null, // -// null, // -// null, // 淇敼浜哄憳 -// null, // 淇敼鏃堕棿 -// null, // 鍒涘缓鑰� -// null, // 娣诲姞鏃堕棿 -// null, // -// null, // -// null, // -// null, // -// null, // -// null, // -// null, // -// null, // -// null // -// ); - - public String getLocNo() { - return locNo; - } - - public void setLocNo(String locNo) { - this.locNo = locNo; - } - - public Long getWhsType() { - return whsType; - } public String getWhsType$(){ BasWhsService service = SpringUtils.getBean(BasWhsService.class); @@ -243,86 +184,6 @@ return String.valueOf(basWhs.getWhsDesc()); } return null; - } - - public void setWhsType(Long whsType) { - this.whsType = whsType; - } - - public Integer getPltType() { - return pltType; - } - - public void setPltType(Integer pltType) { - this.pltType = pltType; - } - - public Integer getCtnType() { - return ctnType; - } - - public void setCtnType(Integer ctnType) { - this.ctnType = ctnType; - } - - public String getLocSts() { - return locSts; - } - - public void setLocSts(String locSts) { - this.locSts = locSts; - } - - public String getSheetNo() { - return sheetNo; - } - - public void setSheetNo(String sheetNo) { - this.sheetNo = sheetNo; - } - - public Integer getCrnNo() { - return crnNo; - } - - public void setCrnNo(Integer crnNo) { - this.crnNo = crnNo; - } - - public Integer getRow1() { - return row1; - } - - public void setRow1(Integer row1) { - this.row1 = row1; - } - - public Integer getBay1() { - return bay1; - } - - public void setBay1(Integer bay1) { - this.bay1 = bay1; - } - - public Integer getLev1() { - return lev1; - } - - public void setLev1(Integer lev1) { - this.lev1 = lev1; - } - - public String getFullPlt() { - return fullPlt; - } - - public void setFullPlt(String fullPlt) { - this.fullPlt = fullPlt; - } - - public String getLocType() { - return locType; } public String getLocSts$(){ @@ -334,35 +195,11 @@ return null; } - public void setLocType(String locType) { - this.locType = locType; - } - - public String getOutEnable() { - return outEnable; - } - - public void setOutEnable(String outEnable) { - this.outEnable = outEnable; - } - - public Date getIoTime() { - return ioTime; - } - public String getIoTime$(){ if (Cools.isEmpty(this.ioTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); - } - - public void setIoTime(Date ioTime) { - this.ioTime = ioTime; - } - - public Date getFirstTime() { - return firstTime; } public String getFirstTime$(){ @@ -372,12 +209,46 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.firstTime); } - public void setFirstTime(Date firstTime) { - this.firstTime = firstTime; + public String getLocType1$() { + if (null == this.locType1){ return null; } + switch (this.locType1){ + case 0: + return "鏈煡"; + case 1: + return "浣庡簱浣�"; + case 2: + return "楂樺簱浣�"; + default: + return String.valueOf(this.locType1); + } } - public Long getModiUser() { - return modiUser; + public String getLocType2$() { + if (null == this.locType2){ return null; } + switch (this.locType2){ + case 0: + return "鏈煡"; + case 1: + return "绐勫簱浣�"; + case 2: + return "瀹藉簱浣�"; + default: + return String.valueOf(this.locType2); + } + } + + public String getLocType3$() { + if (null == this.locType3){ return null; } + switch (this.locType3){ + case 0: + return "鏈煡"; + case 1: + return "杞诲簱浣�"; + case 2: + return "閲嶅簱浣�"; + default: + return String.valueOf(this.locType3); + } } public String getModiUser$(){ @@ -389,27 +260,11 @@ return null; } - public void setModiUser(Long modiUser) { - this.modiUser = modiUser; - } - - public Date getModiTime() { - return modiTime; - } - public String getModiTime$(){ if (Cools.isEmpty(this.modiTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); - } - - public void setModiTime(Date modiTime) { - this.modiTime = modiTime; - } - - public Long getAppeUser() { - return appeUser; } public String getAppeUser$(){ @@ -421,27 +276,11 @@ return null; } - public void setAppeUser(Long appeUser) { - this.appeUser = appeUser; - } - - public Date getAppeTime() { - return appeTime; - } - public String getAppeTime$(){ if (Cools.isEmpty(this.appeTime)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); - } - - public void setAppeTime(Date appeTime) { - this.appeTime = appeTime; - } - - public Date getErrorTime() { - return errorTime; } public String getErrorTime$(){ @@ -450,74 +289,5 @@ } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime); } - - public void setErrorTime(Date errorTime) { - this.errorTime = errorTime; - } - - public String getErrorMemo() { - return errorMemo; - } - - public void setErrorMemo(String errorMemo) { - this.errorMemo = errorMemo; - } - - public Integer getCtnKind() { - return ctnKind; - } - - public void setCtnKind(Integer ctnKind) { - this.ctnKind = ctnKind; - } - - public Double getScWeight() { - return scWeight; - } - - public void setScWeight(Double scWeight) { - this.scWeight = scWeight; - } - - public String getInvWh() { - return invWh; - } - - public void setInvWh(String invWh) { - this.invWh = invWh; - } - - public String getMk() { - return mk; - } - - public void setMk(String mk) { - this.mk = mk; - } - - public String getBarcode() { - return barcode; - } - - public void setBarcode(String barcode) { - this.barcode = barcode; - } - - public String getPdcType() { - return PdcType; - } - - public void setPdcType(String PdcType) { - this.PdcType = PdcType; - } - - public String getCtnNo() { - return ctnNo; - } - - public void setCtnNo(String ctnNo) { - this.ctnNo = ctnNo; - } - } -- Gitblit v1.9.1