From 95d72e8761420deefa34edeedac8438fa041df10 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 19 五月 2025 18:56:00 +0800
Subject: [PATCH] 添加仓库类型 单据添加上报完成类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 4 ++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 20 +++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WarehType.java | 21 +++++++++++++++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java | 4 +++-
rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java | 2 ++
5 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 6b45bd4..52d60b1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -56,6 +56,10 @@
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Short taskStatus;
+
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Short warehType;
+
/**
* 浠诲姟绫诲瀷
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
index ea4ddbf..fdadc82 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
@@ -17,7 +17,9 @@
//
// WCS_PUTAWAY_SUSPEND(13L, "鍏ュ簱浠诲姟鎸傝捣"),
- COMPLETE_IN("99", "鍏ュ簱瀹屾垚"),
+ COMPLETE_IN("98", "鍏ュ簱瀹屾垚"),
+
+ REPORT_IN("99", "涓婃姤瀹屾垚"),
UPDATED_IN("100", "搴撳瓨鏇存柊瀹屾垚"),
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WarehType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WarehType.java
new file mode 100644
index 0000000..0d3e77c
--- /dev/null
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/WarehType.java
@@ -0,0 +1,21 @@
+package com.vincent.rsf.server.manager.enums;
+
+public enum WarehType {
+
+ //浠撳簱绫诲瀷
+ WAREHOUSE_TYPE_FOUR_DIRECTIONS("1", "鍥涘悜搴�"),
+ WAREHOUSE_TYPE_AGV("2", "AGV搴�"),
+ WAREHOUSE_TYPE_CTU("3", "CTU搴�"),
+ WAREHOUSE_TYPE_PLAT("4", "骞冲簱"),
+ WAREHOUSE_TYPE_CRN("5", "鍫嗗灈鏈哄簱"),
+ ;
+
+ public Short id;
+ public String desc;
+
+ WarehType(String id, String desc) {
+ this.id = Short.parseShort(id);
+ this.desc = desc;
+ }
+
+}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index 076e72d..54675bd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -5,6 +5,9 @@
import com.vincent.rsf.server.manager.enums.TaskStsType;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
+import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.service.ConfigService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
@@ -13,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -42,6 +46,8 @@
private StockService stockService;
@Autowired
private LocService locService;
+ @Autowired
+ private ConfigService configService;
/**
* @author Ryan
* @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
@@ -71,10 +77,22 @@
@Scheduled(cron = "0 0/05 * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void taskLogUpdate() {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id));
+ LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<Task>();
+ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT));
+ if (!Objects.isNull(config)) {
+ if (Boolean.parseBoolean(config.getVal())) {
+ queryWrapper.eq(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+ } else {
+ queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+ }
+ } else {
+ queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+ }
+ List<Task> tasks = taskService.list(queryWrapper);
if (tasks.isEmpty()) {
return;
}
+
List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, list));
if (taskItems.isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
index 129af7b..f6bbf08 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/constant/GlobalConfigCode.java
@@ -15,4 +15,6 @@
/**鏀惰揣鏃舵槸鍚﹀厑璁歌秴鏀�*/
public final static String ALLOW_OVER_CHANGE = "AllowOverchange";
+ public final static String ORDER_INOF_REPORT_PLAT = "OrderInofReportPlat";
+
}
--
Gitblit v1.9.1