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

rev：库存查询增加显示字段：毛重；导出excel增加字段：毛重

Browse Source
This commit is contained in:
liuxy
2023-07-31 10:34:11 +08:00
parent 173e710e6f
commit 44dc4aab81
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -266,6 +266,7 @@ public class StructivtServiceImpl implements StructivtService {
mp.put("产品厚度", json.getString("thickness"));
mp.put("单位面积重量", json.getString("mass_per_unit_area"));
mp.put("净重", json.getString("net_weight"));
mp.put("毛重", json.getString("box_weight"));
mp.put("长度", json.getString("length"));
mp.put("计划外分切的子卷", json.getString("is_un_plan_production"));
mp.put("子卷的物性值1", json.getString("un_plan_product_property1"));

7
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
View File

@@ -63,7 +63,8 @@
region.region_name,
sub.sap_pcsn,
sub.package_box_sn,
sub.sale_order_name
sub.sale_order_name,
sub.box_weight
FROM
ST_IVT_StructIvt ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id
@@ -72,6 +73,7 @@
LEFT JOIN md_pb_measureunit unit ON unit.measure_unit_id = ivt.qty_unit_id
LEFT JOIN SCH_BASE_Region region ON region.region_id = ivt.region_id
LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = ivt.pcsn AND attr.storagevehicle_code = sub.package_box_sn
WHERE
1 = 1
and attr.stor_id in 输入.in_stor_id
@@ -168,7 +170,8 @@
sub.isUnPackBox,
sub.isRePrintPackageBoxLabel,
sub.width_standard,
sub.thickness_request
sub.thickness_request,
sub.box_weight
FROM
ST_IVT_StructIvt ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id

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

@@ -168,6 +168,7 @@
<el-table-column prop="package_box_sn" label="木箱码" :min-width="flexWidth('package_box_sn',crud.data,'木箱码')" />
<el-table-column prop="pcsn" label="子卷号" :min-width="flexWidth('pcsn',crud.data,'子卷号')" />
<el-table-column prop="sap_pcsn" label="sap批次" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次')" />
<el-table-column prop="box_weight" label="毛重" :formatter="rounding2" />
<el-table-column prop="canuse_qty" label="可用数" :formatter="rounding" />
<el-table-column prop="frozen_qty" label="冻结数" :formatter="rounding" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="rounding" />
@@ -233,6 +234,12 @@ export default {
rounding(row, column) {
return parseFloat(row[column.property]).toFixed(2)
},
rounding2(row, column) {
debugger
if (row.box_weight !== '') {
return parseFloat(row[column.property]).toFixed(2)
}
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true