diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index f2dcf5279..5e56d3626 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -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")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index 2e7c64937..bd46cdf03 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -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 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 c7dab74a9..6174b2533 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 @@ -168,6 +168,7 @@ + @@ -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