From 5b517c38b66eb63c7c56c980aba438bc879e123a Mon Sep 17 00:00:00 2001 From: ls <1793460677@qq.com> Date: Mon, 19 Jan 2026 13:07:44 +0800 Subject: [PATCH] =?UTF-8?q?add=20bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iostorInv/impl/StIvtIostorinvServiceImpl.java | 4 +++- .../nl/system/service/menu/dao/mapper/SysMenuMapper.xml | 3 +++ .../org/nl/wms/pda/st/service/impl/PrintServiceImpl.java | 9 +++++++-- .../src/main/resources/config/application-prod.yml | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java index 3b8876e..1de23bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java @@ -817,8 +817,10 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl().eq(PdmBiSubpackagerelation::getPackage_box_sn, rows.get(0).getString("package_box_sn"))); + List packageBoxSnList = pdmBiSubpackagerelationMapper.selectList(new LambdaQueryWrapper().eq(PdmBiSubpackagerelation::getPackage_box_sn, rows.get(0).getString("package_box_sn"))); + + PdmBiSubpackagerelation packageBoxSn = !packageBoxSnList.isEmpty() ? packageBoxSnList.get(0) : null; // 仓库信息 StorattrDto storattrDto = storattrService.findById((String) whereJson.get("stor_id")); diff --git a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml index eef70f0..10be995 100644 --- a/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml @@ -98,6 +98,9 @@ max( sys_roles_menus.menu_id ) AS menu_id, max( sys_menu.component ) AS component, max( sys_menu.title ) AS title, + max( sys_menu.zh_title ) AS zh_title, + max( sys_menu.id_title ) AS id_title, + max( sys_menu.en_title ) AS en_title, max( sys_menu.path ) AS path, max( sys_menu.component_name ) AS component_name FROM diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index b473996..89fdb13 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -166,13 +166,18 @@ public class PrintServiceImpl implements PrintService { bw.close(); jo.put("message", "打印成功！"); + } catch (SecurityException e) { + jo.put("message", "打印失败！无文件夹写入权限：" + e.getMessage()); + } catch (FileNotFoundException e) { + jo.put("message", "打印失败！路径不存在：" + e.getMessage()); + } catch (IOException e) { + jo.put("message", "打印失败！IO异常：" + e.getMessage()); } catch (Exception e) { jo.put("message", "打印失败！" + e.getMessage()); - } finally { + }finally { try { fw.close(); } catch (Exception e) { - jo.put("message", "打印失败！" + e.getMessage()); } } return jo; diff --git a/lms/nladmin-system/src/main/resources/config/application-prod.yml b/lms/nladmin-system/src/main/resources/config/application-prod.yml index bf68961..f5ba359 100644 --- a/lms/nladmin-system/src/main/resources/config/application-prod.yml +++ b/lms/nladmin-system/src/main/resources/config/application-prod.yml @@ -84,7 +84,7 @@ spring: reset-enable: false filters: DruidFilter,stat - url: jdbc:mysql://10.100.9.7:2306/ynhl_lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://10.100.9.6:2306/ynhl_lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: root password: P@ssw0rd rules: