From c229a84e0a8eb68c974e6d23fa1296e064025d76 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 七月 2025 17:09:00 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 152 ++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 126 insertions(+), 26 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 57813fb..d74fa92 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
@@ -2,14 +2,16 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.framework.exception.CoolException;
+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.LocStsType;
-import com.vincent.rsf.server.manager.enums.TaskStsType;
+import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.entity.*;
-import com.vincent.rsf.server.manager.enums.TaskType;
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.entity.Config;
import com.vincent.rsf.server.system.service.ConfigService;
@@ -48,11 +50,22 @@
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 AsnOrderService asnOrderService;
+ @Autowired
+ private TransferOrderService transferOrderService;
+ @Autowired
+ private TransferService transferService;
/**
* @param
@@ -89,10 +102,93 @@
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);
+
+ 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) {
+ 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);
+ order.setWkType(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)
+ .setId(null)
+ .setType(OrderType.ORDER_IN.type)
+ .setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.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("鍏ュ簱鍗曟槑缁嗕繚瀛樺け璐ワ紒锛�");
+ }
+ });
+ }
+ });
+
+ 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 * * * * ? ")
@@ -100,7 +196,11 @@
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<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getTaskType, list).orderByDesc(Task::getSort));
+ 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)) {
@@ -122,7 +222,7 @@
params.setOrgLoc(shallowLoc).setType(TaskType.TASK_TYPE_LOC_MOVE.type + "");
//鐢熸垚绉诲簱浠诲姟
Task moveTask = locItemService.genMoveTask(params, loginUserId);
- moveTask.setSort(task.getSort() + 1);
+ moveTask.setSort(!Objects.isNull(task.getSort()) ? task.getSort() + 1 : Constants.TASK_SORT_DEFAULT_VALUE + 1);
if (!taskService.updateById(moveTask)) {
throw new Exception("浠诲姟浼樺厛绾ф洿鏂板け璐ワ紒锛�");
}
@@ -133,25 +233,25 @@
/**
* 姣忎簲绉掓牎楠屾繁搴撲綅鏄惁涓虹┖锛屽鏋滄祬搴撲綅鏈夎揣锛屽皢娴呭簱浣嶇Щ鑷虫繁搴撲綅
- */
- @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);
- }
- }
+ *///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);
+// }
+// }
/**
@@ -165,7 +265,7 @@
@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));
+ 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);
--
Gitblit v1.9.1