From f99e3966686d3891b814ff28d200b001fcdc8e1e Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 二月 2026 12:54:26 +0800
Subject: [PATCH] 组托优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 77 --------------------------------------
1 files changed, 0 insertions(+), 77 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index adcbecd..d653a6a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -462,9 +462,6 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
//1.鍏ュ簱
complateInstock(task, loginUserId);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
- //10.绌烘墭鍏ュ簱
- complateEmpityInStock(task, loginUserId);
} else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
//57.鐩樼偣鍐嶅叆搴�
@@ -1797,80 +1794,6 @@
.set(WaitPakin::getUpdateBy, loginUserId)
.in(WaitPakin::getId, pakinIds))) {
throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
-
- /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
- if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) {
- throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
- throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
-
- /**
- * 绌烘墭鍏ュ簱瀹屾垚
- *
- * @param task
- * @param loginUserId
- */
- @Transactional(rollbackFor = Exception.class)
- public synchronized void complateEmpityInStock(Task task, Long loginUserId) {
- if (Objects.isNull(task)) {
- return;
- }
-
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
- if (Objects.isNull(loc)) {
- throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
- }
-
- if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
- throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
- }
-
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
- if (taskItems.isEmpty()) {
- throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
- }
-
- //鏇存柊搴撲綅鏄庣粏
- saveLocItem(taskItems, task.getId(), loginUserId);
-
- //绌烘墭鍏ュ簱涓嶆牎楠岀粍鎵樹俊鎭紝鐩存帴澶勭悊浠诲姟鏄庣粏
- //濡傛灉鏈変换鍔℃槑缁嗗叧鑱斾簡缁勬墭锛屼篃闇�瑕佷繚瀛樺叆鍑哄簱鏄庣粏鍜岀Щ鍑烘敹璐у尯搴撳瓨
- Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
- orderMap.keySet().forEach(key -> {
- // 濡傛灉source涓嶄负绌猴紝璇存槑鏈夊叧鑱旂殑缁勬墭鏄庣粏锛岄渶瑕佸鐞�
- if (key != null && key > 0) {
- WaitPakinItem pakinItem = waitPakinItemService.getById(key);
- if (!Objects.isNull(pakinItem)) {
- List<TaskItem> items = orderMap.get(key);
- //淇濆瓨鍏ュ嚭搴撴槑缁�
- saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType(), loginUserId);
- //绉诲嚭鏀惰揣鍖哄簱瀛橈紝 淇敼缁勬墭鐘舵��
- removeReceiptStock(pakinItem, loginUserId);
- }
- }
- });
-
- // 澶勭悊缁勬墭鐘舵�侊紙濡傛灉鏈夌粍鎵樺叧鑱旓級
- Set<Long> pkinItemIds = taskItems.stream()
- .map(TaskItem::getSource)
- .filter(source -> source != null && source > 0)
- .collect(Collectors.toSet());
-
- if (!pkinItemIds.isEmpty()) {
- List<WaitPakinItem> pakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getId, pkinItemIds));
- if (!pakinItems.isEmpty()) {
- Set<Long> pakinIds = pakinItems.stream().map(WaitPakinItem::getPakinId).collect(Collectors.toSet());
- if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
- .set(WaitPakin::getIoStatus, PakinIOStatus.PAKIN_IO_STATUS_TASK_DONE.val)
- .set(WaitPakin::getUpdateBy, loginUserId)
- .in(WaitPakin::getId, pakinIds))) {
- throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
- }
- }
}
/**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
--
Gitblit v1.9.1