From d7355ce983c2bddcc5b95e4d84283f6631fb176a Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 27 十一月 2025 13:38:46 +0800
Subject: [PATCH] 修改入出库历史的拣料类型，不上传ERP
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 20 ++++++++++++++++++++
1 files changed, 20 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 59ad309..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
@@ -5,6 +5,7 @@
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;
@@ -21,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
@@ -181,6 +183,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -303,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