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

廖井涛

8 天以前 ceb1dea2b24d5c3216816f42fd0e514613656416

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

@@ -364,7 +364,9 @@
            isOptimize:'경고! 해당 주문은 최적화되었습니다.되돌릴 수 없습니다!',
            isReportingWork:'작업 실적 등록 완료된 주문은 되돌리기가 제한 됩니다.',
            isStorage:'입고 완료된 주문은 시스템 되돌리기가 불가능 합니다.',
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?'
            BackSure:'해당 프로세스를 원클릭으로 되돌리시겠습니까?',
            filterError:'请输入正确格式的筛选条件'

        },
        updateOrderId:'주문 번호 수정',
        reportingTransfer:'작업 실적 이관'
@@ -576,7 +578,8 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

@@ -679,7 +682,7 @@
        hiddenVal:'隐藏',

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'담당 팀을 선택해 주세요.',
        selectWorkReportingTeam:'담당 팀을 선택해 주세요.',
        successfulModificationOfWorkApplication:'작업 보고 수정 성공',
@@ -1130,6 +1133,7 @@
        pleaseSelectADateFirst:'날짜를 선택하세요',
        pleaseSelectAProcessFirst:'공정을 선택하세요',
        theFilteringTimeForExportCannotExceed180Days:'내보내기 필터링 기간은 180일을 초과할 수 없습니다.',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'주문 일시',
        deliveryDate:'납기 일자',
        completedQuantity:'완료 수량',
@@ -1154,7 +1158,8 @@
        finishedProductReport :'완제품 보고서',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{
@@ -1329,7 +1334,8 @@
        userPassWord :'비밀번호 변경',
        glassPrice:'유리 가격',
        glassOptimize:'유리 최적화',
        finishedGlassShelf:'成品料架'
        finishedGlassShelf:'成品料架',
        userLog:'登录日志'
    },

    glassPrice:{