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

opt:国际化新增

Browse Source
This commit is contained in:
ls
2026-01-19 13:07:44 +08:00
committed by 郑旭明\73939
parent 74b71aa283
commit 40508a86ce
9 changed files with 38 additions and 13 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:

5
lms/nladmin-system/src/main/resources/language/i18n/en.js
View File

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

5
lms/nladmin-system/src/main/resources/language/i18n/id.js
View File

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

9
lms/nladmin-system/src/main/resources/language/i18n/zh.js
View File

@@ -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": "销售订单描述",

10
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -304,21 +304,21 @@
:label="$t('common.vbeln_order')"
:min-width="flexWidth('sale_order_name',crud.data,'销售订单')"
/>
<el-table-column prop="box_weight" :label="$t('pdm_bi_subpackagerelation.box_weight')" :formatter="rounding2" />
<el-table-column prop="box_weight" :label="$t('common.box_weight')" :formatter="rounding2" />
<el-table-column prop="canuse_qty" :label="$t('st_ivt_structivt.canuse_qty')" :formatter="rounding" />
<el-table-column prop="frozen_qty" :label="$t('st_ivt_structivt.frozen_qty')" :formatter="rounding" />
<el-table-column prop="ivt_qty" :label="$t('st_ivt_structivt.ivt_qty')" :formatter="rounding" />
<el-table-column prop="warehousing_qty" :label="$t('st_ivt_structivt.warehousing_qty')" :formatter="rounding" />
<el-table-column prop="unit_name" :label="$t('common.qty_unit_name')" />
<el-table-column prop="confirm_time" :label="$t('common.confirm_time')" min-width="150" />
<el-table-column prop="stock_age" :label="$t('common.create_time')" min-width="150" />
<el-table-column prop="confirm_time" :label="$t('common.warehousing_time')" min-width="150" />
<el-table-column prop="stock_age" :label="$t('common.stock_age')" min-width="150" />
<el-table-column prop="joint_type" :label="$t('pdm_bi_subpackagerelation.joint_type')" min-width="150" />
<el-table-column prop="sub_type" :label="$t('common.sub_type')" min-width="150" :formatter="formatSubType" />
<el-table-column prop="produce_age" :label="$t('common.create_time')" min-width="120" />
<el-table-column prop="produce_age" :label="$t('common.produce_age')" min-width="120" />
<el-table-column prop="paper_type" :label="$t('common.quality_scode')" min-width="150" />
<el-table-column prop="paper_code" :label="$t('pdm_bi_slittingproductionplan.paper_code')" min-width="150" />
<el-table-column prop="paper_name" :label="$t('pdm_bi_slittingproductionplan.paper_name')" min-width="250" />
<el-table-column prop="remark" :label="$t('common.remark')" min-width="250">
<el-table-column prop="remark" :label="$t('common.reason_for_overdue')" min-width="250">
<template scope="scope">
<el-select
v-model="scope.row.remark"

4
lms/nladmin-ui/src/views/wms/st/inStor/reCutPlan/AddDialog.vue
View File

@@ -39,11 +39,11 @@
<el-input v-show="false" v-model="form.stor_code" :placeholder="$t('common.storCode')"/>
<el-input v-show="false" v-model="form.stor_name" :placeholder="$t('common.storName')"/>
<el-form-item :label="$t('common.bill_code')" prop="plan_code">
<label slot="label">{{$t('common.bill_code')}}</label>
<label slot="label">单&nbsp;&nbsp;据&nbsp;号:</label>
<el-input v-model="form.plan_code" disabled :placeholder="$t('common.systemGenerated')" clearable style="width: 210px"/>
</el-form-item>
<el-form-item :label="$t('common.warehouse')" prop="stor_id"/>
<label slot="label">{{$t('common.warehouse')}}</label>
<label slot="label">仓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;库:</label>
<el-select
v-model="form.stor_id"
clearable