root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add bug修改

Browse Source
This commit is contained in:
ls
2026-01-19 13:07:44 +08:00
parent 74b71aa283
commit 5b517c38b6
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/impl/StIvtIostorinvServiceImpl.java
View File

@@ -817,8 +817,10 @@ public class StIvtIostorinvServiceImpl extends ServiceImpl<StIvtIostorinvMapper,
// .uniqueResult(0);
PdmBiSubpackagerelation packageBoxSn = pdmBiSubpackagerelationMapper.selectOne(new LambdaQueryWrapper<PdmBiSubpackagerelation>().eq(PdmBiSubpackagerelation::getPackage_box_sn, rows.get(0).getString("package_box_sn")));
List<PdmBiSubpackagerelation> packageBoxSnList = pdmBiSubpackagerelationMapper.selectList(new LambdaQueryWrapper<PdmBiSubpackagerelation>().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"));

3
lms/nladmin-system/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml
View File

@@ -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

9
lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java
View File

@@ -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;

2
lms/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -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: