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

廖井涛

2025-08-21 bf90cf8568301edb38920e8b0a0ce7e137a668ef

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

@@ -312,7 +312,8 @@
        glassQuantity:'小片数量',
        merge:'完整模式',
        layer:'单片模式',
        notFinish:'待完成'
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',

    },
    searchOrder:{
@@ -664,7 +665,7 @@
        pleaseNumber12:'本工序报工数:',
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',

        pleaseNumber15:'已入库数量不能大于已完工数量',
    },
    productStock:{
        page:{