Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-11-11 8f7c5b48419ee7fb720f9c23884b86d09f1522f0

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -377,6 +377,7 @@
        weight:'重量',
        selectedQuantity:'选中数量',
        establishProcessCards:'建立流程卡',
        createBySequenceNumber:'按序号创建',
        return:'返回',
        ProductionSchedulingOk:'已排产',
        ProductionSchedulingNo:'未排产',
@@ -435,6 +436,8 @@
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
        detailPrinting:'明细打印',
        detailsPrintedSeparately:'明细分架打印',
        customLabelPrinting:'自定义标签打印',
        labelPrinting:'标签打印',
        sortingSuccessful:'排序成功',
@@ -449,11 +452,19 @@
        mergePrinting:'合并打印',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'选中填充',
        engineeringPrinting:'工程打印',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'

    },
    reportingWorks:{
        page:{
@@ -533,6 +544,7 @@
        thisCompletedQuantity:'本工序完工',
        thisWornQuantity:'本工序次破',
        passAudit:'审核通过',
        patchCondition:'补片状态',


        selectResponsibleTeam:'请选择责任班组',
@@ -560,6 +572,7 @@
        pleaseNumber7:'的数量不能大于上工序数量',
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{
@@ -772,6 +785,7 @@
        reworkProcess:'返工工序',
        reworkType:'返工类型',
        reworkArea:'返工面积',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
@@ -813,6 +827,7 @@
        ConfirmPasswordCannotBeEmpty:'确认密码不能为空',
        TheTwoPasswordsAreNotTheSame:'两次密码不相同',
        OldPasswordError:'旧密码错误',
        roleSelection:'角色选择',

        userName:'用户名称',
        changeUserName:'修改用户名称',