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

chenlu

2024-09-24 edc227277159601c5cb86829f1c5ce14cf7903a4

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

@@ -335,7 +335,8 @@
        deleteOk:'删除成功',
        transferOrder:'转工单',
        perimeter:'周长',
        deleteNo:'删除失败，检查是否已分架'
        deleteNo:'删除失败，检查是否已分架',
        msg:'请选择所有数据'

    },
    processCard:{
@@ -425,7 +426,9 @@
        labelPrinting2:'标签打印2',
        addAutomatically:'自动填充',
        selectFill:'选中填充',
        engineeringPrinting:'工程打印'
        engineeringPrinting:'工程打印',

        mergeState:'合并状态',
    },
    reportingWorks:{
        glassNumber:'编号',