From a106e3e7008ec11019be849bb3854e8fcc7c0519 Mon Sep 17 00:00:00 2001 From: liuxy <lxy1605052545@163.com> Date: Wed, 11 Jun 2025 09:39:49 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=89=8B=E6=8C=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java | 2 +- .../service/dao/mapper/StIvtCheckdtlMapper.xml | 2 +- .../service/impl/RawAssistIStorServiceImpl.java | 2 +- wms/nladmin-ui/README.md | 2 +- wms/nladmin-ui/src/i18n/langs/zh-CN.js | 2 +- wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java index 1859e2c..78d2637 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -138,7 +138,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { groupDao.setExt_code(ext_code); groupDao.setExt_type(ext_type); groupDao.setCreate_id(SecurityUtils.getCurrentUserId()); - groupDao.setCreate_name(SecurityUtils.getCurrentUsername()); + groupDao.setCreate_name(SecurityUtils.getCurrentNickName()); groupDao.setCreate_time(DateUtil.now()); iMdPbGroupplateService.save(groupDao); } diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml index ccce1d6..e65bfe8 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/dao/mapper/StIvtCheckdtlMapper.xml @@ -27,7 +27,7 @@ <select id="getPdaDtl" resultType="com.alibaba.fastjson.JSONObject"> SELECT dtl.checkdtl_id, - ios.check_code, + ios.check_code AS bill_code, material.material_code, material.material_name, dtl.pcsn, diff --git a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java index 34686d4..3f91c0d 100644 --- a/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java +++ b/wms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_management/service/impl/RawAssistIStorServiceImpl.java @@ -140,7 +140,7 @@ public class RawAssistIStorServiceImpl extends ServiceImpl<IOStorInvMapper, IOSt public String insertDtl(Map whereJson) { ArrayList<HashMap> rows = (ArrayList<HashMap>) whereJson.get("tableData"); String currentUserId = SecurityUtils.getCurrentUserId(); - String nickName = SecurityUtils.getCurrentUsername(); + String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); double total_qty = 0; JSONObject io_mst = new JSONObject(); diff --git a/wms/nladmin-ui/README.md b/wms/nladmin-ui/README.md index 97747e6..91585ff 100644 --- a/wms/nladmin-ui/README.md +++ b/wms/nladmin-ui/README.md @@ -1,3 +1,3 @@ -# 诺力开发平台 +# 新生北安系统 /api/sysMenu/build?systemType=1 \ No newline at end of file diff --git a/wms/nladmin-ui/src/i18n/langs/zh-CN.js b/wms/nladmin-ui/src/i18n/langs/zh-CN.js index 3556d31..540ae60 100644 --- a/wms/nladmin-ui/src/i18n/langs/zh-CN.js +++ b/wms/nladmin-ui/src/i18n/langs/zh-CN.js @@ -2,7 +2,7 @@ export default { 'lang': 'zh', // 平台 'platform': { - 'title': '诺力开发平台', + 'title': '新生北安系统', 'tip1': '用户名不能为空', 'tip2': '密码不能为空', 'tip3': '验证码不能为空' diff --git a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue index 75734b1..96979ca 100644 --- a/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue +++ b/wms/nladmin-ui/src/layout/components/Sidebar/Logo.vue @@ -26,7 +26,7 @@ export default { }, data() { return { - title: '诺力开发平台', + title: '新生北安系统', logo: Logo, title_param: 'platform' }