add bug修改

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<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"));
 

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

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;

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: