Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

Ryan

2025-04-03 313f0515b65ab69e6e811c199f4b33eb630509f3

 rsf-admin/src/i18n/en.js

@@ -155,6 +155,8 @@
        waitPakinItem: 'WaitPakinItem',
        task: 'Task',
        taskItem: 'TaskItem',
        taskItemLog: 'TaskItemLog',
        taskLog: 'TaskLog',
    },
    table: {
        field: {
@@ -684,6 +686,24 @@
                startTime: "startTime",
                endTime: "endTime",
            },
            taskLog: {
                taskId: "taskId",
                taskCode: "taskCode",
                taskStatus: "taskStatus",
                taskType: "taskType",
                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",
@@ -693,6 +713,23 @@
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",
                unit: "unit",
                anfme: "anfme",
                batch: "batch",
                spec: "spec",
                model: "model",
            },
            taskItemLog: {
                taskItemId: "taskItemId",
                taskId: "taskId",
                orderId: "orderId",
                orderType: "orderType",
                orderItemId: "orderItemId",
                source: "source",
                matnrId: "matnrId",
                maktx: "maktx",
                matnrCode: "matnrCode",
                trackCode: "trackCode",
                unit: "unit",
                anfme: "anfme",
                batch: "batch",
@@ -802,6 +839,7 @@
        complete: "complete",
        close: "close",
        asnCreate: "asnCreate",
        createTask: "createTask",
    },
};