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

guoyujie

2025-08-01 cd084621774f86c415e42baf22804e45d3481949

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

@@ -254,6 +254,12 @@

        graphic:'图形',
        drawingNo:'图号',
        upper:'上',
        down:'下',
        horizontal:'横',
        vertical:'竖',
        exportDXF:'导出dxf',
        selectFile:'选择文件',
        transferPage:{
            oldOrderId:'原订单号',
            newOrderId:'新订单号',
@@ -644,6 +650,7 @@
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
        pleaseNumber11:'可修改数量不足',
    },
    productStock:{
        page:{