From b9ca914824d08bf4c5f8e0a0fa9d5b5fafe2d775 Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Fri, 20 Dec 2024 11:28:59 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=A5=BF=E7=8F=AD=E7=89=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../struct/service/dao/mapper/xml/StIvtStructattrMapper.xml | 2 +-
 wms_pro/qd/src/i18n/index.js                                | 6 +++---
 wms_pro/qd/src/layout/components/Navbar.vue                 | 6 +++---
 wms_pro/qd/src/views/login.vue                              | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

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}
             </if>
             <if test="query.material_code != null and query.material_code != ''">
-                and md_pb_vehicleMater.material_code = #{query.material_code}
+                and md_me_materialbase.material_code = #{query.material_code}
             </if>
             <if test="query.sect_code != null and query.sect_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 @@
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
           <el-dropdown-item divided command="en">English</el-dropdown-item>
-          <el-dropdown-item divided command="vi">Vietnamese</el-dropdown-item>
+          <el-dropdown-item divided command="es">Vietnamese</el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
     </div>
@@ -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 @@
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item divided command="zh">简体中文</el-dropdown-item>
               <el-dropdown-item divided command="en">English</el-dropdown-item>
-              <el-dropdown-item divided command="vi">Vietnamese</el-dropdown-item>
+              <el-dropdown-item divided command="es">Vietnamese</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </el-col>
@@ -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() {