小片尺寸和成品尺寸不相同时，打印显示小片信息

guoyuji

2025-03-07 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb

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

@@ -135,7 +135,7 @@
           hollowThickness:'*中空厚度',
           hollowGasType:'*充气方式:',
           hollowType:'*封胶',
           hollowGlueDepth:'*默认胶深:',
           hollowGlueDepth:'默认胶深:',
           hollow:'中空间隔物',
           hollowUpdate:'中空间隔物修改',
           interlayerThickness:'*夹层厚度',
@@ -273,6 +273,7 @@

            pleaseCancelTheFilteringFirst:'请先取消筛选',
            grossAreaIsNot0:'存在实际总面积等于0',
            differentSize:'此订单含有手动修改大小片，反审修改订单后请重新重置大小片！是否反审？'
        }

    },
@@ -331,9 +332,10 @@
        tag:'打标使能',
        tag2:'二维码打印1',
        tag3:'二维码打印2',
        xMargin:'X轴边距',
        yMargin:'Y轴边距',
        xMargin:'宽方向坐标',
        yMargin:'高方向坐标',
        location:'商标位置',
        sort:'玻璃反弯'

    },

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

    },
    processCard:{
@@ -377,6 +380,7 @@
        weight:'重量',
        selectedQuantity:'选中数量',
        establishProcessCards:'建立流程卡',
        createBySequenceNumber:'按序号创建',
        return:'返回',
        ProductionSchedulingOk:'已排产',
        ProductionSchedulingNo:'未排产',
@@ -411,6 +415,7 @@
        composingOk:'可排版',
        composingNo:'不可排版',
        typesetter:'已排版',
        revoke:'撤销可排版',
        scheduledStartTime:'计划开始时间',
        planEndTime:'计划结束时间',
        customerId:'客户编码',
@@ -432,9 +437,12 @@
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，请检查下工序是否已报工或者已补片返工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',
        notSelectTheOptionData:'请勿勾选已排版数据',
        landingSequence:'落架顺序',

        labelStyle:'标签样式',
        detailPrinting:'明细打印',
        detailsPrintedSeparately:'明细分架打印',
        customLabelPrinting:'自定义标签打印',
        labelPrinting:'标签打印',
        sortingSuccessful:'排序成功',
@@ -449,11 +457,19 @@
        mergePrinting:'合并打印',
        printStatus:'打印次数',
        labelPrinting2:'标签打印2',
        finishedProductPrinting2:'成品打印2',
        editablePrinting:'可编辑打印',
        invertSelection:'反选',
        sortSummary:'排序汇总',
        addAutomatically:'自动填充',
        selectFill:'选中填充',
        engineeringPrinting:'工程打印',

        pleaseSelectProject:'请选择工程',
        mergeState:'合并状态',
        merge:'合并',
        printQuantity:'打印数',
        printWarn1:'打印数量不能大于订单数量'

    },
    reportingWorks:{
        page:{
@@ -533,6 +549,7 @@
        thisCompletedQuantity:'本工序完工',
        thisWornQuantity:'本工序次破',
        passAudit:'审核通过',
        patchCondition:'补片状态',


        selectResponsibleTeam:'请选择责任班组',
@@ -560,6 +577,7 @@
        pleaseNumber7:'的数量不能大于上工序数量',
        pleaseNumber8:'请输入序号',
        pleaseNumber9:'正确的完工或次破数量',
        pleaseNumber10:'完工数不能大于流程卡数量',
    },
    productStock:{
        page:{
@@ -664,7 +682,8 @@

        boxNumber:'箱号',
        msg1:'发货单已出库请刷新界面',
        msg2:'发货单库存数不存在'
        msg2:'发货单库存数不存在',
        msg3:'入库数量不能超过订单总数'
    },
    customer:{
        page:{
@@ -771,6 +790,7 @@
        reworkProcess:'返工工序',
        reworkType:'返工类型',
        reworkArea:'返工面积',
        responsibilityInformation:'责任信息',
        PleaseSelectAReworkTeam:'请选择返工班组',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'返工数量不能大于次破数量',
        reworkQuantityCannotBeEmptyOr0:'返工数量不能为空或者是0',
@@ -802,6 +822,7 @@
        userId:'用户ID',
        user:'用户',
        setUpRoles:'设置角色',
        setProcess:'设置工序',
        changePassword:'修改密码',
        OldPassword:'旧密码',
        TheNewPassword:'新密码',
@@ -812,6 +833,7 @@
        ConfirmPasswordCannotBeEmpty:'确认密码不能为空',
        TheTwoPasswordsAreNotTheSame:'两次密码不相同',
        OldPasswordError:'旧密码错误',
        roleSelection:'角色选择',

        userName:'用户名称',
        changeUserName:'修改用户名称',
@@ -856,6 +878,8 @@
        msg2:'上传图片只能是 JPG或者PNG 格式!',
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
@@ -993,6 +1017,7 @@
        pleaseEnterData :'请输入数据',
        pleaseEnter :'请输入',
        msg1 :'库存已存在此物料不能删除',
        unit :'单位',
    },
    ingredientsStock:{
        page:{
@@ -1060,8 +1085,18 @@
    },
    stockReport:{
        page:{
            warehouseReport:"仓储报表"
        }
            warehouseReport:"仓储报表",
            finishedProductReport:"成品报表",
            materialReport:"物料报表",

        },
        finishedProductInventoryReport:"成品入库报表",
        finishedProductOutboundReport:"成品出库报表",
        finishedProductTransferReport:"成品调拨报表",
        finishedProductDeliveryReport:"成品领出报表",
        materialAdditionReport:"物料新增报表",
        materialOutboundReport:"物料出库报表",
        materialReturnReport:"物料返库报表",
    },
    components:{
        addNewSignature :'新增标签名',
@@ -1111,6 +1146,25 @@
        user :'用户列表',
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格'
    },

    glassPrice:{
        glassPriceComputed:'玻璃报价',
        priceSet:'价格设置',
        priceList:'价格列表',
        msg:{
            error1:'请选择全部参数',
            error2:'此膜系已经存在，请重新选择',
            success:'数据保存成功',
            addProduce:'请先添加产品'
        },
        glass:'玻璃',
        interlayer:'夹胶',
        hollow:'中空',
        process:'工艺',
        addProduce:'选择产品',
        reorder:'转订单'
    }