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

chenlu

8 小时以前 33dbc6a161554f3a897f9e9273feb4f2c1b47381

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

@@ -69,6 +69,14 @@
        partiallySelected:'부분 선택',
        unchecked :'미선택 데이터',
        copy:'주문 복제',

        orderRemarks:'订单备注',
        filmNumber:'产品备注',
        remarks1:'备注1',
        remarks2:'备注2',
        remarks3:'备注3',
        remarks4:'备注4',
        otherColumns:'其他列',
        msg:{
            max255:"최대 255자 입력 가능",
            max10:"最多输入10个字符",
@@ -96,7 +104,10 @@
            range9999Dec: "4자리 정수 입력하세요",
            quantityError: '수량 오류, 새로고침 후 저장하세요',
            dataDoesNotExist: "데이터 없음",
            greater0Sec1:"请输入大于0的整数或者保留一位小数"
            greater0Sec1:"请输入大于0的整数或者保留一位小数",
            greater0Msg:"请输入大于0的数字",
            notExport:"该格式不支持导出",
            notUpdate:"参数未修改",
        }
    },
    product:{
@@ -167,7 +178,8 @@

            productAbbreviation:'제품명 축약',
            productDuplication:'제품 중복',
            default:'默认'
            msg1:'创建人是：',
            msg2:'无法操作！',
        }
    },
    order:{
@@ -273,6 +285,7 @@
        surtax:'부가세',
        valueAddedTax:'부가세',
        cuttingTransport:'재단전송',
        colourCeramicGlaze:'彩釉图号',
        transferPage:{
            oldOrderId:'기존 주문 번호',
            newOrderId:'신규 주문 번호',
@@ -315,7 +328,24 @@
            updateOrderIdErrorDiscrepancyInLength:'주문번호 자릿수 불일치',
            updateOrderIdErrorInputNumber:'숫자 입력 필요',
            updateOrderIdErrorNotNo1:'첫 번째 항목 수정 불가',
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！'
            updateOrderError:'此订单已工艺审核或修改无法再次修改,页面将自动刷新！',
            pleaseProcessType:'请选择磨边类型',
            pleaseUploadPicture1:"请先选择要上传的DWG文件或图片文件",
            pleaseUploadPicture2:"准备上传...",
            pleaseUploadPicture3:"上传中...",
            pleaseUploadPicture4:"上传完成!",
            pleaseUploadPicture5:"上传失败!",
            pleaseUploadPicture6:"请选择DWG文件或JPG、PNG格式的图片文件",
            pleaseUploadPicture7:"文件大小不能超过50MB",
            pleaseUploadPicture8:"已选择文件:",
            pleaseUploadPicture9:"文件上传",
            pleaseUploadPicture10:"拖拽文件到此处或",
            pleaseUploadPicture11:"点击选择文件",
            pleaseUploadPicture12:"仅支持 .dwg、.jpg、.png 格式文件，且文件大小不超过50MB",
            pleaseUploadPicture13:"上传进度",
            pleaseUploadPicture14:"上传结果",
            pleaseUploadPicture15:"文件已成功转格式",
            pleaseUploadPicture16:"下载",
        },
        preciseMode:'精确模式',
        ambiguityModels:'模糊模式',
@@ -325,6 +355,7 @@
        layer:'单片模式',
        notFinish:'待完成',
        processCardCollect:'流程卡汇总',
        fileUpload:'文件上传'

    },
    searchOrder:{
@@ -352,7 +383,8 @@
            isOptimize:'경고! 해당 주문은 최적화되었습니다.되돌릴 수 없습니다!',
            isReportingWork:'작업 실적 등록 완료된 주문은 되돌리기가 제한 됩니다.',
            isStorage:'입고 완료된 주문은 시스템 되돌리기가 불가능 합니다.',
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?'
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?',
            filterError:'请输入正确格式的筛选条件'
        },
        updateOrderId:'주문 번호 수정',
        reportingTransfer:'작업 실적 이관'
@@ -391,7 +423,11 @@
        xMargin:'X축 여백',
        yMargin:'Y축 여백',
        location:'상표 위치',
        sort:'유리 굽힘 방지'
        sort:'유리 굽힘 방지',
        archRise:'拱高',
        qr1Local:'二维码1位置',
        qr2Local:'二维码2位置',
        default:'默认'

    },

@@ -424,6 +460,8 @@
            selectDetailProcessCard:'프로세스 카드 상세 조회'

        },
        yesTitle:'有标题打印',
        noTitle:'无标题打印',
        buildingNumber:'楼号',
        longSide:'长边',
        shortSide:'短边',
@@ -558,7 +596,25 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

        quantity:'工程用数量',
        print1:'11列4行',
        print2:'6行3列',
        glassId:'玻璃编号',
        polysId:'小片序号',
        msg:{
            msg1:'流程卡创建失败',
            msg2:'请输入小于等于待分数量的数字',
            msg3:'所选数据的数量总和',
            msg4:'与订单数量',
            msg5:'不匹配，请检查后重试！',
            msg6:'是否合并?',
            msg7:'撤销失败，请检查是否已生成工程号',
        }
    },
    reportingWorks:{
        page:{
@@ -566,6 +622,9 @@
            addReportingWork:"공수 보고 추가",
            qualityInspectionReview:"검품 승인",
        },
        msgMannerPacking:'请选择包装方式',
        saveWorkStorage:'报工入库',
        mannerPacking:'包装方式',
        glassNumber:'일련번호',
        glassAddress:'마킹',
        WorkReportingManagement:'업무 보고 관리',
@@ -643,7 +702,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'담당 팀을 선택해 주세요.',
        selectWorkReportingTeam:'담당 팀을 선택해 주세요.',
        successfulModificationOfWorkApplication:'작업 보고 수정 성공',
@@ -675,6 +734,17 @@
        pleaseNumber13:'下工序报工数:',
        pleaseNumber14:'本工序修改数不能小于下工序报工数',
        pleaseNumber15:'已入库数量不能大于已完工数量',

        pleaseNumber16:'请选择最后工序报工入库',

        woodenBox:'木箱:',
        brandreth:'铁架',
        tilting:'倒架',
        secondaryBreakage:'序号次破相同',
        checkedBreakage:'选中次破相同',
        unreviewed:'未审核',
        notunreviewed:'审核未通过',
        notQualified:'无需质检',
    },
    productStock:{
        page:{
@@ -785,6 +855,8 @@
        packing:'装箱调架',
        msgPacking:'装箱调架成功',
        boxNumberOrRemarks:'箱号或备注',
        msg4:'发货单已创建',
        msg5:'物料可能存在装箱调架，无法退回',
    },
    customer:{
        page:{
@@ -862,6 +934,9 @@
        freightQuantity:'운송 수량',
        freight:'운송 비용',
        pleaseMsg1:'주문서 기타금액 단가가 기입되지 않았습니다',
        print1:'洛阳打印无尺寸',
        print2:'洛阳打印有尺寸',
        orderAdd:'订单添加',

    },
    replenish:{
@@ -901,6 +976,7 @@
        PleaseSelectAReworkTeam:'재작업 팀을 선택해 주세요',
        TheReworkQuantityCannotBeGreaterThanTheSecondBreakQuantity:'재작업 수량은 첫번째 파손 수량을 초과할 수 없음',
        reworkQuantityCannotBeEmptyOr0:'재작업 수량은 공백이거나 0일 수 없음',
        msg1:'请填入需要合并的层',
    },


@@ -946,10 +1022,19 @@
        changeUserName:'사용자 명 수정',
        userNameCannotBeEmpty:'사용자 이름은 필수 입력 항목입니다',
    },
    userLog:{
        page:{
            userListLog:'日志首页',
        },
        loginName:'登录名',
        userName:'用户名',
        loginDate:'登录时间',
    },
    orderBasicData:{
        page:{
            searchOrderBasicData:'기본 유형',
            searchGlassType:'유리 분류',
            searchProcessAttributeConfig:'工艺属性类别',
        },
        glassCategory:'유리 분류',
        order:'주문 관리',
@@ -990,6 +1075,9 @@
        laminatingProcessB:'중공 후 접합 공정',
        laminatingProcessC:'적층 공정',
        laminatingProcessD:'중공 유리 제조 공정',
        please1:'请选择类别',
        please2:'请输入名称',
        please3:'请输入别名',
    },
    machine:{
        page:{
@@ -1053,7 +1141,10 @@
            finishedProductReport :'완제품 보고서',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
        productionReport:'생산 보고서',
        workInProgressReport:'진행 중인 제품 보고서',
        processToBeCompleted:'완료해야 할 프로세스 보고서',
@@ -1069,11 +1160,13 @@
        qualityReport:'품질 보고서',
        productionScheduling:'생산 일정 편성',
        yieldReport:'양품률 보고서',
        yieldProcessReport:'成品率工序汇总报表',
        workingProcedure:'공정',
        inventoryArea:'재고 지역',
        pleaseSelectADateFirst:'날짜를 선택하세요',
        pleaseSelectAProcessFirst:'공정을 선택하세요',
        theFilteringTimeForExportCannotExceed180Days:'내보내기 필터링 기간은 180일을 초과할 수 없습니다.',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'주문 일시',
        deliveryDate:'납기 일자',
        completedQuantity:'완료 수량',
@@ -1098,7 +1191,9 @@
        finishedProductReport :'완제품 보고서',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
        page:{
@@ -1133,6 +1228,7 @@
        pleaseEnter :'입력',
        msg1 :'최대 5MB 이내 이미지 파일을 선택해주세요',
        unit :'单位',
        msg2 :'该物料已存在',
    },
    ingredientsStock:{
        page:{
@@ -1187,7 +1283,10 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
        pleaseSelectTheTypeOfReturnToStock:'请选择返库类型',
        pleaseSelectOneData:'请选中一行数据'
        pleaseSelectOneData:'请选中一行数据',
        msg1:'库存存在多条',
        msg2:'数量不对请检查',
        msg3:'库存不存在或者存在多条',
    },
    warehouseBasicData:{
        page:{
@@ -1215,6 +1314,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'라벨명 추가',
@@ -1265,7 +1366,9 @@
        role :'역할 권한',
        userPassWord :'비밀번호 변경',
        glassPrice:'유리 가격',
        glassOptimize:'유리 최적화'
        glassOptimize:'유리 최적화',
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{
@@ -1285,6 +1388,61 @@
        addProduce:'제품 선택',
        reorder:'이월 주문',
        unit:'메타/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
        summary:'汇总',
        detail:'明细',
    },
    bom:{
        orderBOM:'订单BOM',
        productBOM:'产品BOM',
        materialBOM:'物料BOM',
        msg:{
            msg1:'请先选择一个产品标签',
        },
        bomType:'类型',
        consume:'消耗量',
        price:'使用价格',
        price1:'价格',
        usageType:'使用类型',
        bomPrice:'BOM成本',
        other:'其它',

    }