diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index b7b79ab40..98856c850 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -407,6 +407,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("物流公司", json.getString("cust_name")); mp.put("运费", json.getString("estimated_freight")); mp.put("木箱号", json.getString("box_no")); + mp.put("木箱编码", json.getString("box_material_code")); + mp.put("木箱描述", json.getString("box_material_name")); mp.put("物料编码", json.getString("material_code")); mp.put("物料名称", json.getString("material_name")); mp.put("子卷号", json.getString("pcsn")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql index 4c0bacbcd..05a64a90d 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql @@ -266,6 +266,8 @@ base.cust_name, dis.sect_name, dis.box_no, + bib.material_code box_material_code, + bib.material_name box_material_name, dis.qty_unit_name, mater.material_code, mater.material_name, @@ -317,6 +319,7 @@ a.pcsn ) AS c inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id + inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code @@ -385,6 +388,8 @@ base.cust_name, dis.sect_name, dis.box_no, + bib.material_code box_material_code, + bib.material_name box_material_name, dis.qty_unit_name, mater.material_code, mater.material_name, @@ -436,6 +441,7 @@ a.pcsn ) AS c inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id + inner JOIN bst_ivt_boxinfo bib ON dis.box_no = bib.box_no inner JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_id LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code