From 2b0e94aaf3aadc55db3069d69bc9f1b45455299d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 02 八月 2025 08:58:51 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 371 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 291 insertions(+), 80 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 c724cfa..e51563e 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,26 +1,34 @@
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.api.service.WcsService;
+import com.vincent.rsf.server.api.utils.LocUtils;
+import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
+import com.vincent.rsf.server.manager.service.impl.TransferOrderServiceImpl;
+import com.vincent.rsf.server.manager.utils.LocManageUtil;
+import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
-import com.vincent.rsf.server.system.enums.LocStsType;
+import com.vincent.rsf.server.system.entity.Config;
+import com.vincent.rsf.server.system.service.ConfigService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
+import com.vincent.rsf.server.system.utils.SystemAuthUtils;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
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.*;
import java.util.stream.Collectors;
/**
@@ -30,103 +38,306 @@
@Component
public class TaskSchedules {
+ public static Logger logger = LoggerFactory.getLogger(TaskSchedules.class);
+
@Autowired
private TaskService taskService;
@Autowired
private TaskItemService taskItemService;
@Autowired
- private StockItemService stockItemService;
+ private TaskLogService taskLogService;
@Autowired
- private PurchaseService purchaseService;
+ private TaskItemLogService taskItemLogService;
@Autowired
- private AsnOrderService asnOrderService;
+ private ConfigService configService;
+ @Autowired
+ private LocServiceImpl locService;
+ @Value("${wcs-slave.doubleLocs}")
+ private List<Integer> rows;
+ @Autowired
+ private LocItemService locItemService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private OutStockItemService outStockItemService;
@Autowired
private AsnOrderItemService asnOrderItemService;
@Autowired
- private StockService stockService;
+ private AsnOrderService asnOrderService;
@Autowired
- private LocService locService;
+ private TransferOrderService transferOrderService;
+ @Autowired
+ private TransferService transferService;
+
/**
- * @author Ryan
- * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
- * @param
- * @return
- * @time 2025/4/2 12:37
- */
- @Scheduled(cron = "0 0/05 * * * ? ")
- @Transactional(rollbackFor = Exception.class)
- public void completeInStock() {
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id));
+ * @param
+ * @return
+ * @author Ryan
+ * @description 瀹屾垚鍏ュ簱锛屾洿鏂板簱瀛�
+ * @time 2025/4/2 12:37
+ */
+ @Scheduled(cron = "0/3 * * * * ?")
+ public void completeInStock() throws Exception {
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().eq(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id).select(Task::getId));
if (tasks.isEmpty()) {
return;
}
- List<Long> list = tasks.stream().map(Task::getId).collect(Collectors.toList());
- List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, list));
- if (taskItems.isEmpty()) {
- throw new CoolException("浠诲姟鏄庣粏涓虹┖锛侊紒");
+ List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+ taskService.complateInTask(vaildTasks);
+ }
+
+ /**
+ * @author Ryan
+ * @date 2025/5/20
+ * @description: 瀹屾垚鍑哄簱浠诲姟锛屾洿鏂板簱瀛�
+ * @version 1.0
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void complateOutStock() throws Exception {
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .eq(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id)
+ .select(Task::getId));
+ if (tasks.isEmpty()) {
+ return;
}
- Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
- List<StockItem> stockItems = new ArrayList<>();
- for (Task task : tasks) {
- List<TaskItem> taskItem = listMap.get(task.getId());
- if (taskItem.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒 ")
- }
- Stock stock = new Stock();
+ List<Long> longSet = tasks.stream().map(Task::getId).collect(Collectors.toList());
+ List<Task> vaildTasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, longSet));
+ taskService.completeTask(vaildTasks);
- listMap.get(task.getId()).forEach(item -> {
+// List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>()
+// .eq(TaskItem::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)
+// .in(TaskItem::getTaskId, longSet));
+// if (!taskItems.isEmpty()) {
+// genInStock(taskItems);
+// }
+ }
- });
- }
+ /**
+ * @author Ryan
+ * @date 2025/7/29
+ * @description: 鐢熸垚鍏ュ簱鍗�
+ * @version 1.0
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void genInStock(List<TaskItem> taskItems) throws Exception {
+ Set<Long> orderIds = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
+ List<WkOrder> wkOrders = outStockService.list(new LambdaQueryWrapper<WkOrder>().in(WkOrder::getId, orderIds));
+ wkOrders.forEach(wkOrder -> {
+ List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ if (!orderItems.isEmpty()) {
+ WkOrder order = new WkOrder();
+ BeanUtils.copyProperties(wkOrder, order);
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_ASN_ORDER, order);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("鍏ュ簱鍗曞彿鐢熸垚澶辫触锛侊紒");
+ }
+ order.setWkType(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)
+ .setId(null)
+ .setCode(ruleCode)
+ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)
+ .setType(OrderType.ORDER_IN.type);
+// Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.DIRECT_WAIT_PAKIN));
+// if (!Boolean.parseBoolean(config.getVal())) {
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val);
+// } else {
+// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val);
+// }
+ if (!asnOrderService.save(order)) {
+ throw new CoolException("鍏ュ簱鍗曠敓鎴愬け璐ワ紒锛�");
+ }
+ orderItems.forEach(orderItem -> {
+ orderItem.setOrderId(order.getId()).setOrderCode(order.getCode()).setId(null);
+ if (!asnOrderItemService.save(orderItem)) {
+ throw new CoolException("鍏ュ簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+ });
+ Transfer transfer = transferService.getById(order.getPoId());
- taskItems.forEach(item -> {
- Stock stock = new Stock();
- AsnOrder order = asnOrderService.getOne(new LambdaQueryWrapper<AsnOrder>()
- .eq(AsnOrder::getId, item.getOrderId())
- .select(AsnOrder::getId, AsnOrder::getPoCode, AsnOrder::getCode));
- 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());
+ TransferOrder transferOrder = new TransferOrder();
+ transferOrder.setOrderId(order.getId())
+ .setType(OrderType.ORDER_IN.type)
+ .setTransferId(transfer.getId());
+ if (!transferOrderService.save(transferOrder)) {
+ throw new CoolException("鍏宠仈鍗曚繚瀛樺け璐ワ紒锛�");
+ }
}
- 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("搴撳瓨淇濆瓨澶辫触锛侊紒");
- }
- 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("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
- }
- 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("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+// Set<Long> taskIds = taskItems.stream().map(TaskItem::getTaskId).collect(Collectors.toSet());
+// List<Task> tasks = taskService.listByIds(taskIds);
+// if (!tasks.isEmpty()) {
+// tasks.forEach(task -> {
+// TaskItem one = taskItemService.getOne(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()), false);
+// if (Objects.isNull(one)) {
+// throw new CoolException("鏁版嵁閿欒锛氫换鍔℃槑缁嗕涪澶憋紒锛�");
+// }
+// TransferOrder order = transferOrderService.getOne(new LambdaQueryWrapper<TransferOrder>().eq(TransferOrder::getOrderId, one.getOrderId()));
+// if (Objects.isNull(order)) {
+// throw new CoolException("鏁版嵁閿欒锛侊紒");
+// }
+// Transfer transfer = transferService.getById(order.getTransferId());
+// Task task1 = new Task();
+// BeanUtils.copyProperties(task, task1);
+// String targetLoc = LocManageUtil.getTargetLoc(transfer.getTarAreaId());
+// if (Objects.isNull(targetLoc)) {
+// throw new CoolException("鏈兘鎵惧埌鏈夋晥搴撲綅");
+// }
+// task.setTaskType(TaskType.TASK_TYPE_IN.type)
+// .setTargLoc(targetLoc)
+// .setTargSite(null)
+// .setId(null)
+// .setTaskStatus(TaskStsType.GENERATE_IN.id);
+// if (!taskService.save(task1)) {
+// throw new CoolException("浠诲姟鐢熸垚澶辫触锛侊紒");
+// }
+// List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+// if (items.isEmpty()) {
+// throw new CoolException("鏁版嵁閿欒锛侊紒");
+// }
+// items.forEach(taskItem -> {
+// TaskItem item = new TaskItem();
+// BeanUtils.copyProperties(taskItem, item);
+// item.setTaskId(task1.getId()).setId(null);
+// if (!taskItemService.save(item)) {
+// throw new CoolException("鍏ュ簱浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
+// }
+// });
+// });
+// }
+ }
+
+ /**
+ * 浠诲姟鑷姩涓嬪彂
+ *
+ * @throws Exception
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void taskToWCS() throws Exception {
+ Long loginUserId = SystemAuthUtils.getLoginUserId();
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type);
+ List<Integer> integers = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
+ List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
+ .in(Task::getTaskType, list)
+ .in(Task::getTaskStatus, integers)
+ .orderByDesc(Task::getSort));
+ for (Task task : tasks) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, task.getBarcode()));
+ if (Objects.isNull(loc)) {
+ continue;
+ }
+ //鍒ゆ柇鏄惁娣卞簱浣�
+ if (!LocUtils.isShallowLoc(loc.getCode())) {
+ //鑾峰彇娣卞簱浣嶅搴旂殑娴呭簱浣�
+ String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+ if (StringUtils.isBlank(shallowLoc)) {
+ continue;
+ }
+ Loc shalloc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+ if (Objects.isNull(shalloc) || !shalloc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ //濡傛灉娴呭簱浣嶄笉鍦ㄥ簱璺冲嚭寰幆
+ continue;
+ }
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
+ //鐢熸垚绉诲簱浠诲姟
+ Task moveTask = locItemService.genMoveTask(params, loginUserId);
+ moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
+ if (!taskService.updateById(moveTask)) {
+ throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
+ }
+ }
+ //TODO 璋冪敤涓嬪彂浠诲姟鎺ュ彛
}
}
+ /**
+ * 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
+ *///TODO 鐢熸垚绉诲簱浠诲姟鍓嶏紝闇�瑕佹鏌ユ槸鍚︽湁浠诲姟鍓嶅線褰撳墠鎵樼洏
+// @Scheduled(cron = "0/35 * * * * ? ")
+// @Transactional(rollbackFor = Exception.class)
+// public void shallocToDeep() throws Exception {
+// List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>()
+// .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
+// .in(Loc::getRow, rows));
+// if (locs.isEmpty()) {
+// return;
+// }
+// for (Loc loc : locs) {
+// String shallowLoc = LocUtils.getShallowLoc(loc.getCode());
+// Loc one = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
+// if (Objects.isNull(one) || !one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// continue;
+// }
+// taskService.moveToDeep(SystemAuthUtils.getLoginUserId(), shallowLoc);
+// }
+// }
+
+
+ /**
+ * @param
+ * @return
+ * @author Ryan
+ * @description 宸插畬鎴愪换鍔″姞鍏ュ巻鍙叉。
+ * @time 2025/4/3 12:54
+ */
+ @Scheduled(cron = "0 0/01 * * * ? ")
+ @Transactional(rollbackFor = Exception.class)
+ public void taskLogUpdate() {
+ 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.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+ } else {
+ queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+ }
+ } else {
+ queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
+ }
+ List<Task> tasks = taskService.list(queryWrapper);
+ if (tasks.isEmpty()) {
+ return;
+ }
+
+ tasks.forEach(task -> {
+ TaskLog taskLog = new TaskLog();
+ BeanUtils.copyProperties(task, taskLog);
+ taskLog.setTaskId(task.getId())
+ .setId(null);
+ if (!taskLogService.save(taskLog)) {
+ throw new CoolException("浠诲姟鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ List<TaskItemLog> itemLogs = new ArrayList<>();
+ for (TaskItem item : taskItems) {
+ TaskItemLog itemLog = new TaskItemLog();
+ BeanUtils.copyProperties(item, itemLog);
+ itemLog.setId(null)
+ .setTaskId(task.getId())
+ .setLogId(taskLog.getId())
+ .setTaskItemId(item.getId());
+ itemLogs.add(itemLog);
+ }
+
+ if (!taskService.removeById(task.getId())) {
+ throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
+ }
+
+ if (!taskItems.isEmpty()) {
+ if (!taskItemLogService.saveBatch(itemLogs)) {
+ throw new CoolException("浠诲姟鏄庣粏鍘嗗彶妗ｄ繚瀛樺け璐ワ紒锛�");
+ }
+
+ if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()))) {
+ throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
+ }
+ }
+ });
+ }
}
--
Gitblit v1.9.1