From 6883e31331af4633d1b7d74ea7deb5f972afa05d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 23 五月 2025 20:02:19 +0800
Subject: [PATCH] 新增移库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 65 +++++++++++++++++++++++++++++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 21 ++++++++--
rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx | 18 ++------
rsf-admin/src/page/task/TaskList.jsx | 2
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java | 6 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java | 6 ++
6 files changed, 92 insertions(+), 26 deletions(-)
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 6b73c19..3792b7a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -245,7 +245,7 @@
}
}
return (
- ((record?.taskStatus < 98) || (record?.taskType > 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
+ ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 199)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
)
}
diff --git a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
index a0355b8..0007d69 100644
--- a/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
+++ b/rsf-admin/src/page/work/stockTransfer/stockTransferList.jsx
@@ -186,7 +186,7 @@
const redirect = useRedirect();
const refresh = useRefresh();
const { orgLoc, tarLoc } = props;
- const check = () => {
+ const move = () => {
console.log(orgLoc, tarLoc);
if (orgLoc === "" || orgLoc === undefined || orgLoc === null) {
notify("璇烽�夋嫨绔欑偣");
@@ -196,21 +196,13 @@
notify("璇烽�夋嫨绔欑偣");
return;
}
-
+ http(orgLoc, tarLoc?.id)
}
- const http = async (sta, items) => {
- console.log(items);
-
- const filter = items.filter(item => (item.outQty + item.workQty) > item.anfme);
- if (filter.length > 0) {
- notify(translate('toolbar.request.error.out_stock_qty'))
- return
- }
- const { data: { code, data, msg } } = await request.post(`/locItem/generate/task`, { siteNo: sta, items: items });
+ const http = async (orgLoc, tarLoc) => {
+ const { data: { code, data, msg } } = await request.post(`/locItem/move/task`, { orgLoc, tarLoc });
if (code === 200) {
notify(msg);
refresh()
- setTableData([])
redirect("/task")
} else {
notify(msg);
@@ -220,7 +212,7 @@
<ConfirmButton
variant="contained"
color="primary"
- onConfirm={check}
+ onConfirm={move}
label={"table.field.outBound.createTask"}
>
</ConfirmButton>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
index 5f8890f..5390de7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.manager.service.LocItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.manager.enums.LocStsType;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -82,6 +83,7 @@
* @return
*/
@PreAuthorize("hasAuthority('manager:locItem:list')")
+ @ApiOperation("鐢熸垚搴撳瓨鍑哄簱浠诲姟")
@PostMapping("/locItem/generate/task")
public R generateTask(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
@@ -96,7 +98,8 @@
* @return
*/
@PreAuthorize("hasAuthority('manager:locItem:list')")
- @PostMapping("/locItem/generate/move/task")
+ @ApiOperation("鐢熸垚绉诲簱浠诲姟")
+ @PostMapping("/locItem/move/task")
public R genMoveTask(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -110,6 +113,7 @@
* @return
*/
@PreAuthorize("hasAuthority('manager:locItem:list')")
+ @ApiOperation("鐢熸垚鐩樼偣鍑哄簱浠诲姟")
@PostMapping("/locItem/check/task")
public R genStatisticalTask(@RequestBody Map<String, Object> map) {
if (Objects.isNull(map)) {
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 f35c3ab..75ddce8 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
@@ -97,12 +97,12 @@
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.eq(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
+ queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id);
} else {
- queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+ queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
}
} else {
- queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id);
+ queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id);
}
List<Task> tasks = taskService.list(queryWrapper);
if (tasks.isEmpty()) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index b0584d9..7b7266f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -165,10 +165,10 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R genMoveTask(Map<String, Object> map) {
- if (Objects.isNull(map.get("targetLoc")) && StringUtils.isNotBlank(map.get("targetLoc").toString())) {
- throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�1");
+ if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) {
+ throw new CoolException("鐩爣搴撲綅涓嶈兘涓虹┖锛�");
}
- if (Objects.isNull(map.get("orgLoc")) && StringUtils.isNotBlank(map.get("orgLoc").toString())) {
+ if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) {
throw new CoolException("婧愬簱浣嶄笉鑳戒负绌猴紒");
}
@@ -177,12 +177,19 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
}
- Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("targetLoc").toString()));
+ orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+
+ if (!locService.updateById(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
+ }
+
+
+ Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString()));
if (Objects.isNull(targetLoc)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
- targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
+ targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
if (!locService.updateById(targetLoc)) {
throw new CoolException("鐩爣搴撲綅棰勭害澶辫触锛侊紒");
@@ -197,6 +204,10 @@
.setTaskStatus(TaskStsType.GENERATE_IN.id)
.setBarcode(orgLoc.getBarcode());
+ if (!taskService.save(task)) {
+ throw new CoolException("鏂板缓绉诲簱浠诲姟澶辫触锛侊紒");
+ }
+
List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId()));
if (locItems.isEmpty()) {
throw new CoolException("搴撲綅鏄庣粏涓嶅瓨鍦紒锛�");
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 d6484af..30f92ac 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
@@ -390,14 +390,72 @@
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
//1.鍏ュ簱
complateInstock(task);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//53.鎷ｆ枡鍐嶅叆搴�
- pickComplateInStock(task);
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
//57.鐩樼偣鍐嶅叆搴�
pickComplateInStock(task);
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+ //绉诲簱
+ moveInStock(task);
}
}
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public void moveInStock(Task task) {
+ if (Objects.isNull(task)) {
+ return;
+ }
+
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
+ }
+
+ Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(orgLoc)) {
+ throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒");
+ }
+
+ if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬S.鍏ュ簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
+ if (!orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ throw new CoolException("褰撳墠搴撲綅鐘舵�佷笉澶勪簬R.鍑哄簱棰勭害锛屼笉鍙墽琛屽叆搴撴搷浣滐紒");
+ }
+
+ List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+ if (taskItems.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ try {
+ //鏇存柊搴撲綅鏄庣粏
+ saveLocItem(taskItems, task.getId());
+ } catch (Exception e) {
+ throw new CoolException("搴撲綅鏄庣粏鏇存柊澶辫触锛侊紒");
+ }
+// /**瀵逛换鍔℃槑缁嗘寜缁勬嫋鏄庣粏杩涜鍒嗙粍*/
+// try {
+// //淇濆瓨搴撳瓨鏄庣粏
+// saveStockItems(taskItems, null, null, pakinItem.getWkType(), pakinItem.getType());
+// } catch (Exception e) {
+// log.error("<UNK>", e);
+// throw new CoolException(e.getMessage());
+// }
+ /**淇敼搴撲綅鐘舵�佷负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 (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getOrgLoc()))) {
+ throw new CoolException("搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
}
@@ -906,6 +964,7 @@
if (Objects.isNull(task)) {
throw new CoolException("浠诲姟涓嶅瓨鍦�!!");
}
+
List<LocItem> locItems = new ArrayList<>();
items.forEach(taskItem -> {
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
--
Gitblit v1.9.1