From d107c1cca034fb6cdde077656fa1776d09a4442f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 02 四月 2025 14:24:52 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 1d9dab4..69a060d 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
@@ -1,7 +1,7 @@
package com.vincent.rsf.server.manager.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.vincent.rsf.framework.common.SpringUtils;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.vincent.rsf.server.api.entity.enums.OrderType;
import com.vincent.rsf.server.api.entity.enums.TaskStsType;
import com.vincent.rsf.framework.common.R;
@@ -19,6 +19,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -30,22 +31,27 @@
@Autowired
private WaitPakinService waitPakinService;
-
@Autowired
private TaskItemService taskItemService;
-
@Autowired
private WaitPakinItemService waitPakinItemService;
+ @Autowired
+ private LocService locService;
+
+
+
/**
+ * @param
+ * @param loginUserId
+ * @return
* @author Ryan
* @description 鐢熸垚浠诲姟鍒楄〃
- * @param
- * @return
* @time 2025/3/29 15:59
*/
@Override
- public R generateTasks(List<WaitPakin> waitPakin) {
+ @Transactional(rollbackFor = Exception.class)
+ public synchronized R generateTasks(List<WaitPakin> waitPakin, Long loginUserId) {
if (Objects.isNull(waitPakin) || waitPakin.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -67,11 +73,18 @@
.setTaskType(TaskType.TASK_TYPE_IN.type.shortValue())
.setTargLoc(LocManageUtil.getTargetLoc())
.setBarcode(pakin.getBarcode())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setTargSite(LocManageUtil.getTargetSite());
if (!this.save(task)) {
throw new CoolException("浠诲姟淇濆瓨澶辫触锛侊紒");
}
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, pakin.getCode())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_S.type).set(Loc::getBarcode, pakin.getBarcode()))) {
+ throw new CoolException("搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
/**鑾峰彇缁勬嫋鏄庣粏**/
List<WaitPakinItem> waitPakinItems = waitPakinItemService.list(new LambdaQueryWrapper<WaitPakinItem>().eq(WaitPakinItem::getPakinId, pakin.getId()));
if (waitPakinItems.isEmpty()) {
@@ -82,7 +95,9 @@
BeanUtils.copyProperties(item, taskItem);
taskItem.setTaskId(task.getId())
.setOrderType(OrderType.ORDER_RECEIPT.type)
- .setSourceCode(item.getAsnCode())
+ .setSource(item.getId())
+ .setCreateBy(loginUserId)
+ .setUpdateBy(loginUserId)
.setOrderId(item.getAsnId())
.setOrderItemId(item.getAsnItemId());
taskItems.add(taskItem);
@@ -91,10 +106,22 @@
throw new CoolException("浠诲姟鏄庣粏淇濆瓨澶辫触锛侊紒");
}
});
- //TODO 浠诲姟鐢熸垚瀹屾垚闇�淇敼浠诲姟ASN璁㈠崟鐘舵�佷负鎵ц涓紝缁勬嫋鍒犻櫎闇�鍒ゆ柇鏄惁鏈夊瓙浠诲姟鍦ㄦ墽琛�
return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
}
+ /**
+ * @author Ryan
+ * @description 瀹屾垚浠诲姟
+ * @param
+ * @return
+ * @time 2025/4/2 11:15
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R completeTask(String id) {
+ return null;
+ }
+
}
--
Gitblit v1.9.1