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

guoyujie

2025-07-08 7104751e2f26872d4891d01d42ee88cf19715d01

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

@@ -125,7 +125,7 @@
           glassRepeat:'请先选择间隔物',
           HollowReview:'请选择全部中空间隔物下拉框',
           firstGlass:"请先选择产品",
           InterlayerReview:'请选择全部中空间隔物下拉框',
           InterlayerReview:'请选择全部间隔物带星号下拉框',
           glassTypeTitle:'材料属性',
           thickness:'*厚度',
           color:'*颜色',
@@ -141,7 +141,7 @@
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',
           interlayerType:'*类型',
           interlayerColor:'*颜色',
           interlayerColor:'颜色',
           interlayer:'夹层间隔物',
           interlayerUpdate:'夹层间隔物修改',
           glassAttribute:'单片玻璃属性:',
@@ -293,7 +293,11 @@
            updateOrderIdErrorDiscrepancyInLength:'输入订单号长度不符',
            updateOrderIdErrorInputNumber:'请输入数字',
            updateOrderIdErrorNotNo1:'不能修改第一个单子',
        }
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
        glassSizeRange:'玻璃尺寸范围'

    },
    searchOrder:{
@@ -321,6 +325,7 @@
            isOptimize:'此订单已转优化，回退失败！',
            isReportingWork:'此订单已报工，回退失败！',
            isStorage:'此订单已入库，回退失败！',
            BackSure:"确定一键退回相应流程?"
        },
        updateOrderId:"修改订单号",
        reportingTransfer:'报工转移'
@@ -392,6 +397,8 @@
            selectDetailProcessCard:"流程卡明细查询"

        },
        printCompound:'需要同架的层',
        flashback:'倒序',
        processId:'流程卡号',
        founder:'分架员',
        layoutStatus:'排版状态',
@@ -482,7 +489,7 @@
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        editablePrinting:'标签自定义打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
@@ -492,7 +499,32 @@
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'
        printWarn1:'打印数量不能大于订单数量',
        depthShelf:"架子纵深(mm)",
        shelfCapacity:"架子承重(KG)",
        IntervalThickness:"间隔厚度(mm)",
        LongestLargestMax:"长边最大(mm)",
        LongestShortestMax:"长边最短(mm)",
        quantityMax:"最大数量",
        shortestLongest:"短边最大(mm)",
        shortestSide:"短边最短(mm)",
        intelligentBranching:"智能分架",
        reset:"重置",
        combinedFrame:"合架",
        shelfNumber:'架号',
        totalSequenceNumber:'总序号',
        cancelMerger:'取消合并',
        projectMsg1:'请选择工程对应的版图号',
        orderPrint:'订单打印',
        numberLabelPrintingOperations:'标签打印次数',
        numberTimesProcessCardPrinted:'流程卡打印次数',
        projectMsg2:'请选择标签模板',
        layoutNumber:'版图号',
        addFlowCardMsg1:'请选择已分架订单打印',
        addFlowCardMsg2:'请选择未分架订单打印',
        okFlowCard:'已分架',
        noFlowCard:'未分架',


    },
    reportingWorks:{
@@ -501,6 +533,9 @@
            addReportingWork:"报工新增",
            qualityInspectionReview:"质检审核",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'编号',
        glassAddress:'片标记',
        WorkReportingManagement:'报工管理',
@@ -708,7 +743,8 @@
        boxNumber:'箱号',
        msg1:'发货单已出库请刷新界面',
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过订单总数'
        msg3:'入库数量不能超过订单总数',
        boxingPrinting:'装箱打印',
    },
    customer:{
        page:{
@@ -801,7 +837,9 @@
        patchNumber:'补片单号',
        mark:'标记',
        sliceMarking:'片标记',

        printPatchesMsg1:'请选择标签模板',
        labelTemplate:'标签模板：',
        listLabelTemplates:'标签模板列表'
    },
    rework:{
        page:{
@@ -907,7 +945,10 @@
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
        laminatingProcessA:'夹胶后合片工序',
        laminatingProcessB:'中空后合片工序',
        laminatingProcessC:'夹胶工序',
        laminatingProcessD:'中空工序',
    },
    machine:{
        page:{
@@ -969,7 +1010,9 @@
            productionScheduling:'排产计划报表',
            yield:'成品率报表',
            finishedProductReport :'成品报表',
            orderWorkReportForm :'订单报工报表',
        },
        teamsGroupsName:'上工序报工',
        productionReport:'生产报表',
        workInProgressReport:'在制品报表',
        processToBeCompleted:'工序待完成报表',
@@ -1177,7 +1220,8 @@
        user :'用户列表',
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格'
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
    },

    glassPrice:{