From eb151270cf5ec0166d11ad59af42785cf31b183c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 06 九月 2024 15:18:46 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index 2d441b0..1f624ac 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.common.wms.service.BasLocStsService;
import com.zy.asrs.common.wms.service.BasWhsService;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,10 +16,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,7 +30,7 @@
import java.util.Date;
@Data
-@TableName("wms_loc_mast")
+@TableName("common_loc_mast")
public class LocMast implements Serializable {
private static final long serialVersionUID = 1L;
@@ -43,7 +40,7 @@
*/
@ApiModelProperty(value= "ID")
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 搴撲綅鍙�
@@ -167,9 +164,15 @@
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
private Long hostId;
+ @ApiModelProperty(value= "鎷嶇収鍥剧墖")
+ private String pic;
+
+ @ApiModelProperty(value= "璐т富")
+ private String owner;
+
public LocMast() {}
- public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId) {
+ public LocMast(String locNo,Long whsType,String locSts,Integer crnNo,Integer row1,Integer bay1,Integer lev1,String fullPlt,Short locType1,Short locType2,Short locType3,Date ioTime,Date firstTime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Date errorTime,String errorMemo,String mk,String barcode,String memo,Long hostId, String owner) {
this.locNo = locNo;
this.whsType = whsType;
this.locSts = locSts;
@@ -193,6 +196,7 @@
this.barcode = barcode;
this.memo = memo;
this.hostId = hostId;
+ this.owner = owner;
}
// LocMast locMast = new LocMast(
@@ -222,14 +226,17 @@
// );
public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.getById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
+ if (Cools.isEmpty(this.whsType)) return "鏈煡";
+ switch (this.whsType.intValue()){
+ case 0:
+ return "绔嬩綋浠撳簱";
+ case 1:
+ return "骞抽潰浠撳簱";
}
- return null;
+ return "鏈煡";
}
+
public String getLocSts$(){
BasLocStsService service = SpringUtils.getBean(BasLocStsService.class);
BasLocSts basLocSts = service.getById(this.locSts);
--
Gitblit v1.9.1