feat(wms): 出库查询新增木箱编码和木箱描述字段
- 在出库查询界面添加木箱编码和木箱描述两个新字段 - 更新后端服务和数据库查询以支持新增字段
This commit is contained in:
@@ -407,6 +407,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService {
|
|||||||
mp.put("物流公司", json.getString("cust_name"));
|
mp.put("物流公司", json.getString("cust_name"));
|
||||||
mp.put("运费", json.getString("estimated_freight"));
|
mp.put("运费", json.getString("estimated_freight"));
|
||||||
mp.put("木箱号", json.getString("box_no"));
|
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_code"));
|
||||||
mp.put("物料名称", json.getString("material_name"));
|
mp.put("物料名称", json.getString("material_name"));
|
||||||
mp.put("子卷号", json.getString("pcsn"));
|
mp.put("子卷号", json.getString("pcsn"));
|
||||||
|
|||||||
@@ -266,6 +266,8 @@
|
|||||||
base.cust_name,
|
base.cust_name,
|
||||||
dis.sect_name,
|
dis.sect_name,
|
||||||
dis.box_no,
|
dis.box_no,
|
||||||
|
bib.material_code box_material_code,
|
||||||
|
bib.material_name box_material_name,
|
||||||
dis.qty_unit_name,
|
dis.qty_unit_name,
|
||||||
mater.material_code,
|
mater.material_code,
|
||||||
mater.material_name,
|
mater.material_name,
|
||||||
@@ -317,6 +319,7 @@
|
|||||||
a.pcsn
|
a.pcsn
|
||||||
) AS c
|
) AS c
|
||||||
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
|
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_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
|
||||||
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_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
|
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
|
||||||
@@ -385,6 +388,8 @@
|
|||||||
base.cust_name,
|
base.cust_name,
|
||||||
dis.sect_name,
|
dis.sect_name,
|
||||||
dis.box_no,
|
dis.box_no,
|
||||||
|
bib.material_code box_material_code,
|
||||||
|
bib.material_name box_material_name,
|
||||||
dis.qty_unit_name,
|
dis.qty_unit_name,
|
||||||
mater.material_code,
|
mater.material_code,
|
||||||
mater.material_name,
|
mater.material_name,
|
||||||
@@ -436,6 +441,7 @@
|
|||||||
a.pcsn
|
a.pcsn
|
||||||
) AS c
|
) AS c
|
||||||
inner JOIN st_ivt_iostorinvdis dis ON dis.iostorinvdis_id = c.iostorinvdis_id
|
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_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id
|
||||||
inner JOIN st_ivt_iostorinvdtl dtl ON dtl.iostorinvdtl_id = dis.iostorinvdtl_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
|
LEFT JOIN md_cs_transportationbase base ON base.cust_code = mst.trans_code
|
||||||
|
|||||||
Reference in New Issue
Block a user