盘点任务优化

skyouc

2 天以前 8f7af0507c883e5df9f8a4b2eb703946788c3363

盘点任务优化

 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

 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 />}

 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')")

 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)

 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)) {