skyouc
2025-03-31 f330e285adc14c50c5b781dc23c27449f1c88792
修改
新增任务工作档
4个文件已修改
87 ■■■■■ 已修改文件
rsf-admin/src/i18n/en.js 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/zh.js 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/ResourceContent.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/i18n/en.js
@@ -153,6 +153,8 @@
        deviceSite: 'deviceSite',
        waitPakin: 'WaitPakin',
        waitPakinItem: 'WaitPakinItem',
        task: 'Task',
        taskItem: 'TaskItem',
    },
    table: {
        field: {
@@ -662,6 +664,38 @@
                qty: "qty",
                batch: "batch",
            },
            task: {
                taskCode: "TaskCode",
                taskStatus: "Status",
                taskType: "Type",
                orgLoc: "orgLoc",
                orgSite: "orgSite",
                targLoc: "targLoc",
                targSite: "targSite",
                barcode: "barcode",
                robotCode: "robotCode",
                exceStatus: "exceStatus",
                expDesc: "expDesc",
                sort: "sort",
                expCode: "expCode",
                startTime: "startTime",
                endTime: "endTime",
            },
            taskItem: {
                taskId: "taskId",
                orderId: "orderId",
                orderType: "orderType",
                orderItemId: "orderItemId",
                sourceCode: "sourceCode",
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",
                unit: "unit",
                anfme: "anfme",
                batch: "batch",
                spec: "spec",
                model: "model",
            },
        }
    },
    page: {
rsf-admin/src/i18n/zh.js
@@ -155,6 +155,8 @@
        waitPakinItem: '组拖档明细',
        waitPakinLog: '组拖历史档',
        waitPakinItemLog: '组拖历史档明细',
        task: '任务工作档',
        taskItem: '任务档明细',
    },
    table: {
        field: {
@@ -671,6 +673,38 @@
                qty: "已完成",
                batch: "批次",
            },
            task: {
                taskCode: "任务号",
                taskStatus: "任务状态",
                taskType: "任务类型",
                orgLoc: "源库位",
                orgSite: "源站点",
                targLoc: "目标库位",
                targSite: "目标站点",
                barcode: "拖盘码",
                robotCode: "机器编码",
                exceStatus: "执行状态",
                expDesc: "异常说明",
                sort: "优先级",
                expCode: "异常编码",
                startTime: "开始时间",
                endTime: "结束时间",
            },
            taskItem: {
                taskId: "taskId",
                orderId: "订单ID",
                orderType: "单据类型",
                orderItemId: "订单明细ID",
                sourceCode: "订单号",
                matnrId: "物料ID",
                maktx: "物料名称",
                matnrCode: "物料编码",
                unit: "单位",
                anfme: "数量",
                batch: "批次",
                spec: "规格",
                model: "型号",
            },
        }
    },
    page: {
rsf-admin/src/page/ResourceContent.js
@@ -46,6 +46,9 @@
import waitPakinItemLog from './waitPakinItemLog';
import asnOrderLog from './asnOrderLog';
import asnOrderItemLog from './asnOrderItemLog';
import task from './task';
import taskItem from './taskItem';
const ResourceContent = (node) => {
    switch (node.component) {
@@ -133,9 +136,10 @@
            return waitPakinLog;
        case 'waitPakinItemLog':
            return waitPakinItemLog;
        case 'task':
            return task;
        case 'taskItem':
            return taskItem;
        default:
            return {
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyInspectServiceImpl.java
@@ -100,7 +100,6 @@
    * @return
    * @time 2025/3/31 10:12
    */
    @Override
    public List<AsnOrder> getUnInspect(Map<String, Object> params) {
        List<AsnOrder> asnOrders = asnOrderService.list(new LambdaQueryWrapper<AsnOrder>()
@@ -110,6 +109,14 @@
        return asnOrders;
    }
    /**
    * @author Ryan
    * @description 保存
    * @param
    * @return
    * @time 2025/3/31 14:54
    */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveSelected(IsptOrderParam param) {