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

huang

2024-11-11 93b80ffb7f7ffc02bc414271b8ebeac82be6bcb9

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

@@ -462,7 +462,8 @@
        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',

        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'

    },
    reportingWorks:{
@@ -571,6 +572,7 @@
        pleaseNumber7:'的数量不能大于上工序数量',
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{