From 8943a4e9f5ee1455c56ac4af60d941fa23731051 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 13 四月 2026 13:20:38 +0800
Subject: [PATCH] 重量
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 5cb74ab..f4f65b7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.manager.service.BasContainerService;
import com.vincent.rsf.server.manager.service.LocTypeService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
@@ -16,10 +18,12 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@Data
@@ -63,7 +67,7 @@
@ApiModelProperty("搴撲綅绫诲瀷(*)[man_loc_type]")
@TableField(exist = false)
- private String typeIds;
+ private List<Long> typeIds;
/**
* 铏氭嫙搴撲綅
@@ -82,6 +86,9 @@
*/
@ApiModelProperty(value= "瀹瑰櫒缂栫爜")
private String barcode;
+
+ @ApiModelProperty(value= "閲嶉噺")
+ private BigDecimal weight;
/**
* 瀛樻斁鍗曚綅
@@ -107,13 +114,18 @@
*/
@ApiModelProperty(value= "瀹�")
private Double width;
-
/**
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
@TableField("`row`")
private Integer row;
+
+ /**
+ * 璁惧鍙�
+ */
+ @ApiModelProperty(value= "璁惧鍙�")
+ private Integer deviceNo;
/**
* 鍒�
@@ -195,6 +207,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -208,6 +221,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -280,9 +294,10 @@
// null // 澶囨敞
// );
- public String getType$(){
+ public String getTypeIds$(){
if (null == this.type){ return null; }
- List<String> asList = Arrays.asList(this.type);
+ String[] split = this.type.split(",");
+ List<String> asList = Arrays.asList(split);
if (asList.isEmpty()) {
return null;
}
@@ -295,6 +310,23 @@
return StringUtils.join(strings, ",");
}
+
+ public String getIsHalf$() {
+ if (!Objects.isNull(this.barcode)) {
+ BasContainerService basContainerService = SpringUtils.getBean(BasContainerService.class);
+ BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getCode, this.barcode));
+ if (!Objects.isNull(container)) {
+ if (container.getIsHalf().equals("0")) {
+ return "鏁寸";
+ } else {
+ return "鍗婄";
+ }
+ }
+ }
+
+ return null;
+ }
+
public String getUseStatus$(){
if (null == this.useStatus){ return null; }
switch (this.useStatus){
--
Gitblit v1.9.1