diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml index 07317de8..9e79641b 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/stor_manage/struct/service/dao/mapper/xml/StIvtStructattrMapper.xml @@ -49,7 +49,7 @@ and md_pb_vehicleMater.pcsn = #{query.pcsn} - and md_pb_vehicleMater.material_code = #{query.material_code} + and md_me_materialbase.material_code = #{query.material_code} and struct.sect_code = #{query.sect_code} diff --git a/wms_pro/qd/src/i18n/index.js b/wms_pro/qd/src/i18n/index.js index 9f6cbe26..6597369c 100644 --- a/wms_pro/qd/src/i18n/index.js +++ b/wms_pro/qd/src/i18n/index.js @@ -3,7 +3,7 @@ import VueI18n from 'vue-i18n' import locale from 'element-ui/lib/locale' import zh from './langs/chinese' import en from './langs/english' -import vietnamese from './langs/Vietnamese' +import es from './langs/Espana' Vue.use(VueI18n) const messages = { en: { @@ -12,8 +12,8 @@ const messages = { zh: { ...zh }, - vi: { - ...vietnamese + es: { + ...es } } const i18n = new VueI18n({ diff --git a/wms_pro/qd/src/layout/components/Navbar.vue b/wms_pro/qd/src/layout/components/Navbar.vue index fef30a55..d87764d6 100644 --- a/wms_pro/qd/src/layout/components/Navbar.vue +++ b/wms_pro/qd/src/layout/components/Navbar.vue @@ -54,7 +54,7 @@ 简体中文 English - Vietnamese + Vietnamese @@ -134,8 +134,8 @@ export default { this.language = 'English' } else if (command === 'zh') { this.language = '简体中文' - } else if (command === 'vi') { - this.language = 'Vietnamese' + } else if (command === 'es') { + this.language = 'España' } }, toggleSideBar() { diff --git a/wms_pro/qd/src/views/login.vue b/wms_pro/qd/src/views/login.vue index 9fbc85bc..ddae488a 100644 --- a/wms_pro/qd/src/views/login.vue +++ b/wms_pro/qd/src/views/login.vue @@ -36,7 +36,7 @@ 简体中文 English - Vietnamese + Vietnamese @@ -117,8 +117,8 @@ export default { this.language = 'English' } else if (command === 'zh') { this.language = '简体中文' - } else if (command === 'vi') { - this.language = 'Vietnamese' + } else if (command === 'es') { + this.language = 'España' } }, getCode() {