From cba29f2b769ae2010dd91ec5ed4e4199ead90ce6 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期三, 02 四月 2025 18:49:03 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 73 ++++++++++++++++++++++++++++++++++--
1 files changed, 69 insertions(+), 4 deletions(-)
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 4ce0193..3156c74 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
@@ -1,17 +1,26 @@
package com.vincent.rsf.server.manager.schedules;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
-import com.vincent.rsf.server.manager.entity.Task;
-import com.vincent.rsf.server.manager.entity.TaskItem;
+import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+import java.sql.Array;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
/**
@@ -28,6 +37,12 @@
@Autowired
private StockItemService stockItemService;
@Autowired
+ private PurchaseService purchaseService;
+ @Autowired
+ private AsnOrderService asnOrderService;
+ @Autowired
+ private AsnOrderItemService asnOrderItemService;
+ @Autowired
private StockService stockService;
@Autowired
private LocService locService;
@@ -39,6 +54,7 @@
* @time 2025/4/2 12:37
*/
@Scheduled(cron = "0 0/05 * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ?")
@Transactional(rollbackFor = Exception.class)
public void completeInStock() {
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
@@ -50,9 +66,58 @@
if (taskItems.isEmpty()) {
throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
}
- taskItems.forEach(item -> {
-
+ /**瀵逛换鍔℃槑缁嗘寜璁㈠崟杩涜鍒嗙粍*/
+ Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getOrderId));
+ List<StockItem> stockItems = new ArrayList<>();
+ orderMap.keySet().forEach(key -> {
+ AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
+ .eq(AsnOrder::getId, key)
+ .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
+ Stock stock = new Stock();
+ if (!Objects.isNull(order.getPoCode()) && StringUtils.isNotBlank(order.getPoCode())) {
+ Purchase purchase = purchaseService.getOne(new LambdaQueryWrapper<Purchase>().eq(Purchase::getCode, order.getPoCode()));
+ stock.setPlatOrderNo(purchase.getPlatCode()).setPlatToken(purchase.getPlatId());
+ }
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("褰撳墠涓氬姟锛�" + SerialRuleCode.SYS_STOCK_CODE + "锛岀紪鐮佽鍒欎笉瀛樺湪锛侊紒");
+ }
+ stock.setAsnId(order.getId()).setAsnCode(order.getCode());
+ if (!stockService.save(stock)) {
+ throw new CoolException("搴撳瓨淇濆瓨澶辫触锛侊紒");
+ }
+ List<TaskItem> items = orderMap.get(key);
+ for (TaskItem item : items) {
+ /**閫氳繃浠诲姟鏄庣粏涓殑taskId鏌ヨ,鑾峰彇TASK鐨勭洰鏍囧簱浣嶄俊鎭�*/
+ Task taskServiceOne = taskService.getOne(new LambdaQueryWrapper<Task>()
+ .select(Task::getId, Task::getTargLoc, Task::getOrgLoc, Task::getBarcode)
+ .eq(Task::getId, item.getTaskId()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, taskServiceOne.getTargLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("搴撲綅涓嶅瓨鍦紒锛�");
+ }
+ AsnOrderItem orderItem = asnOrderItemService.getOne(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getId, item.getOrderItemId()));
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鍗曟嵁鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ StockItem stockItem = new StockItem();
+ BeanUtils.copyProperties(orderItem, stockItem);
+ stockItem.setAsnItemId(item.getOrderItemId())
+ .setBarcode(taskServiceOne.getBarcode())
+ .setLocId(loc.getId())
+ .setId(null)
+ .setStockId(stock.getId());
+ stockItems.add(stockItem);
+ }
+ if (!stockItemService.saveBatch(stockItems)) {
+ throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
+ }
});
+ /**淇敼搴撲綅鐘舵�佷负F.鍦ㄥ簱*/
+ List<String> locCodes = tasks.stream().map(Task::getTargLoc).collect(Collectors.toList());
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).in(Loc::getCode, locCodes))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
}
}
--
Gitblit v1.9.1