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

chenlu

2025-11-26 53bc276bdc4aaefc2a2ecadc472f2c2f18e93490

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

@@ -576,7 +576,8 @@
        mainHeight:'高宽',
        terminationQuantity:'生产终止数量',
        terminationMsg:'请输入正确的可修改数量',
        maxCompleted:'最大已完工数量',
        maxCompleted:'终止数量',
        terminationNo:'取消终止',
        updateProcessMsg:'保存失败！请检查变更工序是否报工',
        termination:'终止',

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

        futureTime:'报工时间不能大于当前时间',
        longTime:'报工时间与当前时间超过15天',
        longTime:'报工时间与当前时间超过13个月',
        selectResponsibleTeam:'담당 팀을 선택해 주세요.',
        selectWorkReportingTeam:'담당 팀을 선택해 주세요.',
        successfulModificationOfWorkApplication:'작업 보고 수정 성공',
@@ -1105,6 +1106,7 @@
            finishedProductReport :'완제품 보고서',
            orderWorkReportForm :'订单报工报表',
        },
        allProcess:'全部',
        teamsGroupsName:'上工序报工',
        WorkInProgressCombination:'在制品汇总报表',
        processCompleted:'工序待完成汇总报表',
@@ -1129,6 +1131,7 @@
        pleaseSelectADateFirst:'날짜를 선택하세요',
        pleaseSelectAProcessFirst:'공정을 선택하세요',
        theFilteringTimeForExportCannotExceed180Days:'내보내기 필터링 기간은 180일을 초과할 수 없습니다.',
        theTimeLimitCannotExceed180Days:'选择的时间不能超过180天',
        orderTime :'주문 일시',
        deliveryDate:'납기 일자',
        completedQuantity:'완료 수량',
@@ -1153,7 +1156,8 @@
        finishedProductReport :'완제품 보고서',
        workProcessName:'在制品名称',
        StorageArea:'入库面积',
        shippedArea:'发货面积'
        shippedArea:'发货面积',
        thicknessArea:'平方毫米'

    },
    productionBasicData:{