From cd0e6b9326bbec408944642c106cc7f115ea654f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 02 四月 2025 16:20:55 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/LocMast.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd931b9..60dfb6e 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasLocStsService;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -16,7 +17,7 @@
import java.util.Date;
@Data
-@TableName("asr_loc_mast")
+@TableName("\"SOURCE\".\"asr_loc_mast\"")
public class LocMast implements Serializable {
private static final long serialVersionUID = 1L;
@@ -25,15 +26,15 @@
* 搴撲綅鍙�
*/
@ApiModelProperty(value= "搴撲綅鍙�")
- @TableId(value = "loc_no", type = IdType.INPUT)
- @TableField("loc_no")
+ @TableId(value = "LOC_NO", type = IdType.INPUT)
+ @TableField("LOC_NO")
private String locNo;
/**
* 搴撲綅绫诲瀷
*/
@ApiModelProperty(value= "搴撲綅绫诲瀷")
- @TableField("whs_type")
+ @TableField("WHS_TYPE")
private Long whsType;
@ApiModelProperty(value= "")
@@ -163,7 +164,11 @@
@ApiModelProperty(value= "")
private String mk;
- @ApiModelProperty(value= "")
+ /**
+ * 鎵樼洏鐮�
+ */
+ @ApiModelProperty(value= "鎵樼洏鐮�")
+ @TableField("barcode")
private String barcode;
@ApiModelProperty(value= "")
@@ -174,6 +179,26 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty(value= "")
+ private String status;
+
+ @TableField(exist = false)
+ private String containerCode;
+ @TableField(exist = false)
+ private String containerTypeCode;
+ @TableField(exist = false)
+ private String emptyContainer;
+
+ public String getEmptyContainer$(){
+ if (Cools.isEmpty(this.emptyContainer)){
+ return "";
+ }
+ if (this.emptyContainer.equals("1")){
+ return "Y";
+ }else {
+ return "N";
+ }
+ }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
@@ -269,4 +294,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ 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;
+ }
+
}
--
Gitblit v1.9.1