From 0800daaeefdc7761ace0ae895f5a0273eb023e46 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 27 十一月 2025 11:10:34 +0800
Subject: [PATCH] 相同票号入收货区判断
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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 5b1f707..9850333 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;
@@ -20,6 +22,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@Data
@@ -200,6 +203,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;
/**
@@ -213,6 +217,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;
/**
@@ -301,6 +306,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