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: diff --git a/lms/nladmin-system/src/main/resources/language/i18n/en.js b/lms/nladmin-system/src/main/resources/language/i18n/en.js index dd68615..51f594b 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/en.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/en.js @@ -48,6 +48,11 @@ var config = { "load_text5": "Only one Excel file can be uploaded!" }, "common": { + "warehousing_time": "Warehousing Time", + "stock_age": "Stock Age", + "produce_age": "Production Duration (Days)", + "reason_for_overdue": "Reason for Overdue", + "box_weight": "Gross Weight", "documentNumber": "Document Number", "biheight": "Height", "biwidth": "Width", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/id.js b/lms/nladmin-system/src/main/resources/language/i18n/id.js index 8bc80d8..b4ee5bb 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/id.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/id.js @@ -48,6 +48,11 @@ var config = { "load_text5": "Hanya dapat mengunggah satu file excel!" }, "common": { + "warehousing_time": "Waktu Pemasukan Gudang", + "stock_age": "Usia Inventaris", + "produce_age": "Durasi Produksi (hari)", + "reason_for_overdue": "Alasan Keterlambatan", + "box_weight": "Berat Kotor", "documentNumber": "Nomor Dokumen", "biheight": "Tinggi", "biwidth": "Lebar", diff --git a/lms/nladmin-system/src/main/resources/language/i18n/zh.js b/lms/nladmin-system/src/main/resources/language/i18n/zh.js index b40e0f4..21677fd 100644 --- a/lms/nladmin-system/src/main/resources/language/i18n/zh.js +++ b/lms/nladmin-system/src/main/resources/language/i18n/zh.js @@ -48,6 +48,11 @@ var config = { "load_text5": "只能上传一个excel文件!" }, "common": { + "warehousing_time":"入库时间", + "stock_age":"库龄", + "produce_age":"生产时长(天)", + "reason_for_overdue":"超期原因", + "box_weight":"毛重", "documentNumber": "单据号", "biheight":"高度", "biwidth":"宽度", @@ -134,7 +139,7 @@ var config = { "syscompanyid": "公司ID", "sysdeptid": "部门ID", "product_name": "产品编码", - "package_box_sn": "木箱唯一码", + "package_box_sn": "木箱码", "ext_code": "外部编码", "bill_code": "单据编号", "io_type": "出入类型", @@ -1497,7 +1502,7 @@ var config = { "product_description": "产品描述", "product_name": "产品编码", "quality_guaran_period": "保质期", - "quanlity_in_box": "箱内子卷数量", + "quanlity_in_box": "子卷数", "real_weight": "实际木箱自身重量", "remark": "备注", "sale_order_description": "销售订单描述", diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index e90e7e9..24ac1d2 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -304,21 +304,21 @@ :label="$t('common.vbeln_order')" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" /> - + - - + + - + - +