Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-11-26 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490

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

@@ -255,10 +255,10 @@
        orderHasBeenReceived:'订单已入库',
        printingNumber:'打印次数',
        processingOrder:'加工单',
        sheet2:'横版-多层明细',
        sheet4:'生产加工单纵版',
        sheet2:'横版-多层明细(推荐)',
        sheet4:'纵版-成品信息',
        sheet3:'浏览发货信息',
        sheet5:'生产加工单弯钢(单片)',
        sheet5:'纵版-单片弯钢',
        oneClickStorage:'一键完工',
        oneClickReturn:'一键退回',

@@ -576,7 +576,8 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

@@ -679,7 +680,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'请选择责任班组',
        selectWorkReportingTeam:'请选择责任班组',
        successfulModificationOfWorkApplication:'报工修改成功',
@@ -1105,6 +1106,7 @@
            finishedProductReport :'成品报表',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        productionReport:'生产报表',
        workInProgressReport:'在制品明细报表',
@@ -1116,6 +1118,8 @@
        orderPlanDecomposition:'订单计划分解报表',
        secondaryBrokenReport:'次破报表',
        crossProcessBreakdown:'跨工序次破报表',
        notCrossProcessBreakdown:'非跨工序次破报表',
        secondaryBrokenTotal:'次破总报表',
        teamOutput:'班组产量报表',
        splittingDetails:'分架明细报表',
        TaskCompletionStatus:'任务完成情况报表',
@@ -1129,6 +1133,7 @@
        pleaseSelectADateFirst:'请先选择日期',
        pleaseSelectAProcessFirst:'请先选择工序',
        theFilteringTimeForExportCannotExceed180Days:'导出的筛选时间不能超过180天',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'下单时间',
        deliveryDate:'交货日期',
        completedQuantity:'已完成数量',
@@ -1153,7 +1158,8 @@
        finishedProductReport :'成品报表',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{