From 8f7af0507c883e5df9f8a4b2eb703946788c3363 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 15:35:12 +0800
Subject: [PATCH] 盘点任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 3 ++-
rsf-admin/src/page/orders/check/CheckOrderPub.jsx | 16 ++++++++--------
rsf-admin/src/page/task/TaskList.jsx | 5 +----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 5 +++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 1 -
5 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
index 24dade3..242a1e7 100644
--- a/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
+++ b/rsf-admin/src/page/orders/check/CheckOrderPub.jsx
@@ -428,21 +428,21 @@
const submit = async () => {
const items = gridRef.current?.getSortedRows();
let selctRecord = items.filter(item => selectedIds.includes(item?.id));
+ //杩囨护锛屽皢搴撲綅娣诲姞鑷崇洏鐐瑰崟鏄庣粏涓�
const records = rowSelectedIds.map(map =>{
return {
...map,
items: selctRecord.filter(item => item.matnrCode == map.matnrCode)
}
})
- console.log(records);
- // const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records);
- // if (code == 200) {
- // refresh();
- // redirect("/task")
- // } else {
- // notify(msg);
- // }
+ const { data: { code, data, msg } } = await request.post('/check/generate/tasks', records);
+ if (code == 200) {
+ refresh();
+ redirect("/task")
+ } else {
+ notify(msg);
+ }
}
return (
<ConfirmButton
diff --git a/rsf-admin/src/page/task/TaskList.jsx b/rsf-admin/src/page/task/TaskList.jsx
index 49479c4..4fa167a 100644
--- a/rsf-admin/src/page/task/TaskList.jsx
+++ b/rsf-admin/src/page/task/TaskList.jsx
@@ -109,8 +109,6 @@
/>,
]
-
-
return (
<Box display="flex">
<List
@@ -162,7 +160,6 @@
<TextField source="createBy$" label="common.field.createBy" />
<DateField source="updateTime" label="common.field.updateTime" showTime />
<DateField source="createTime" label="common.field.createTime" showTime />
- {/* <BooleanField source="statusBool" label="common.field.status" sortable={false} /> */}
<TextField source="memo" label="common.field.memo" sortable={false} />
<WrapperField cellClassName="opt" label="common.field.opt" onClick={(e) => e.stopPropagation()} >
<EditButton label="toolbar.detail" />
@@ -281,7 +278,7 @@
}
}
return (
- (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 103 || record.taskType == 11) ?
+ (record.taskStatus == 1 || record.taskStatus == 101) && (record.taskType == 1 || record.taskType == 101 || record.taskType == 10 || record.taskType == 107 || record.taskType == 103 || record.taskType == 11) ?
<ConfirmButton
onConfirm={clickCancel}
startIcon={<CancelIcon />}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 3b6dde3..1e3df96 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -108,7 +108,6 @@
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return taskService.removeTask(ids, getLoginUserId());
-// return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('manager:task:list')")
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index 88ee4ef..e94be30 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -281,7 +281,12 @@
List<CheckOrderItemParams> itemParams = listMap.get(key);
CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
Task task = new Task();
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TASK_CODE, null);
+ if (StringUtils.isBlank(ruleCode)) {
+ throw new CoolException("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
task.setOrgLoc(loc.getCode())
+ .setTaskCode(ruleCode)
.setTargSite(checkItem.getSiteNo())
.setResource(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)
.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
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 6577655..2e66a96 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
@@ -761,7 +761,8 @@
throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
}
}
-
+ } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
+
}
if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {
--
Gitblit v1.9.1