From e9c912f6b75360f5380579e4ed574f490ecd6d9e Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 24 一月 2024 17:22:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 7e157b8..acdcd54 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,8 +4,10 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasBoxTypeService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -80,7 +82,7 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "浜у湴 浣嶇疆")
private String origin;
@ApiModelProperty(value= "鍘傚")
@@ -158,6 +160,13 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鍗蜂俊鎭疘D
+ */
+ @ApiModelProperty(value= "鍗蜂俊鎭疘D")
+ @TableField("roll_up")
+ private Long rollUp;
+
public String getLocNo$(){
LocMastService service = SpringUtils.getBean(LocMastService.class);
LocMast locMast = service.selectById(this.locNo);
@@ -226,6 +235,15 @@
return null;
}
+ public String getBrand$(){
+ BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
+ BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_type", this.brand));
+ if (!Cools.isEmpty(basBoxType)){
+ return String.valueOf(basBoxType.getBoxSpecs());
+ }
+ return this.brand;
+ }
+
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
--
Gitblit v1.9.1