From 93242dd899ff4a7e40b8304660cb1eac01871db6 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 25 十二月 2025 12:39:45 +0800
Subject: [PATCH] 希日项目问题修复
---
rsf-server/src/main/resources/application.yml | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java | 37 ++++++++++++++++++-------------------
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 9 +++++++--
4 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
index cd79ed4..cf4b173 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
@@ -18,7 +18,7 @@
private List<staListDto> staNos;
- private String siteNo;
+ private String sitesNo;
private String sourceId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index c67e035..8aaa36a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.WaitPakin;
+import com.vincent.rsf.server.manager.entity.*;
import java.util.List;
@@ -29,4 +28,10 @@
Task operateComplete(Long id, Long loginUserId);
void moveToDeep(Long loginUserId, String curLoc) throws Exception;
+
+ void pubTaskToWcs(List<Task> tasks);
+
+ R menualExceTask(List<Long> ids);
+
+ void saveOutStockItem(List<TaskItem> taskItems, WkOrderItem orderItem, WaveItem waveItem, WkOrderItem diffItem, Long loginUserId) throws Exception;
}
\ No newline at end of file
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
index 63879dd..cfc5abf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -8,7 +8,6 @@
import com.vincent.rsf.server.manager.controller.dto.OrderOutItemDto;
import com.vincent.rsf.server.manager.controller.params.WaveToLocParams;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.ContainerType;
import com.vincent.rsf.server.manager.enums.TaskType;
import com.vincent.rsf.server.manager.enums.WaveRuleType;
import com.vincent.rsf.server.manager.service.*;
@@ -36,24 +35,24 @@
public static String getTargetLoc(Long areaId, Long containerType) {
Long locType = null;
- if (!Objects.isNull(containerType)) {
- LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
- if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "L"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- } else {
- LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
- .eq(LocType::getCode, "H"));
- if (Objects.isNull(low)) {
- throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
- }
- locType = low.getId();
- }
- }
+// if (!Objects.isNull(containerType)) {
+// LocTypeService locService = SpringUtils.getBean(LocTypeService.class);
+// if (containerType.equals(ContainerType.CONTAINER_TYPE_NORMAL.val)) {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "L"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// } else {
+// LocType low = locService.getOne(new LambdaQueryWrapper<LocType>()
+// .eq(LocType::getCode, "H"));
+// if (Objects.isNull(low)) {
+// throw new CoolException("搴綅椤炲瀷涓嶅瓨鍦紒锛�");
+// }
+// locType = low.getId();
+// }
+// }
//TODO 搴撲綅绛栫暐鍚庣画鎺掓湡
LocService locService = SpringUtils.getBean(LocService.class);
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index b5db333..0c99aef 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -25,7 +25,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
--
Gitblit v1.9.1