From db92e88a70a59437b48c9369cf1c46dba0ecb0a5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 15 十月 2023 13:25:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocMast.java | 356 ++++++++++------------------------------------------------
1 files changed, 65 insertions(+), 291 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 480185d..4648d05 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -4,18 +4,20 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
-import com.zy.asrs.service.BasLocTypeService;
+import com.zy.asrs.service.BasLocStsService;
import com.zy.asrs.service.BasWhsService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
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 {
@@ -44,7 +46,7 @@
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "搴撲綅鐘舵��")
@TableField("loc_sts")
private String locSts;
@@ -84,12 +86,21 @@
@TableField("full_plt")
private String fullPlt;
- /**
- * 搴撲綅鐘舵��
- */
- @ApiModelProperty(value= "搴撲綅鐘舵��")
+ @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= "搴撲綅绫诲瀷{1:娣锋斁,2:鍗曞搧}")
+ @TableField("loc_type3")
+ private Short locType3;
@ApiModelProperty(value= "")
@TableField("out_enable")
@@ -165,79 +176,13 @@
@TableField("ctn_no")
private String ctnNo;
- public LocMast() {}
+ @ApiModelProperty(value= "")
+ @TableField("qr_code_value")
+ private String qrCodeValue;
- 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;
- }
+ @ApiModelProperty(value= "")
+ private String status;
-// 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);
@@ -248,109 +193,13 @@
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 getLocType$(){
- BasLocTypeService service = SpringUtils.getBean(BasLocTypeService.class);
- BasLocType basLocType = service.selectById(this.locType);
- if (!Cools.isEmpty(basLocType)){
- return String.valueOf(basLocType.getLocDesc());
+ public String getLocSts$(){
+ BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
+ BasLocSts basLocSts = service.selectById(this.locSts);
+ if (!Cools.isEmpty(basLocSts)){
+ return String.valueOf(basLocSts.getLocDesc());
}
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$(){
@@ -360,14 +209,6 @@
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$(){
if (Cools.isEmpty(this.firstTime)){
return "";
@@ -375,12 +216,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$(){
@@ -392,27 +267,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$(){
@@ -424,27 +283,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$(){
@@ -453,74 +296,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