diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java index cedbd9f5..2c36c3b7 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java @@ -962,7 +962,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { item.appendChild(nweight); Element vnotebody = doc.createElement("vnotebody"); - vnotebody.setTextContent("诺力正式"); + vnotebody.setTextContent("诺力正式-"+jo.getString("label")); item.appendChild(vnotebody); } @@ -1279,7 +1279,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { item.appendChild(vchangerate); Element vnotebody = doc.createElement("vnotebody"); - vnotebody.setTextContent("诺力正式"); + vnotebody.setTextContent("诺力正式-"+jo.getString("label")); item.appendChild(vnotebody); } @@ -1593,9 +1593,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { Element vnotebody = doc.createElement("vnotebody"); if (is_zero){ - vnotebody.setTextContent("诺力正式,末次回传"); + vnotebody.setTextContent("诺力正式,末次回传-"+jo.getString("label")); }else { - vnotebody.setTextContent("诺力正式"); + vnotebody.setTextContent("诺力正式-"+jo.getString("label")); } item.appendChild(vnotebody); } @@ -1840,7 +1840,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService { item.appendChild(vchangerate); Element vnotebody = doc.createElement("vnotebody"); - vnotebody.setTextContent("诺力正式"); + vnotebody.setTextContent("诺力正式-"+jo.getString("label")); item.appendChild(vnotebody); } diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql index 70429307..704cc687 100644 --- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql +++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql @@ -141,10 +141,12 @@ proc.M_UNIT_ID, userper.ext_id AS make_ext_id, userper.extuser_id AS create_user_id, - mb.measrate AS vchangerate + mb.measrate AS vchangerate, + dict.label FROM st_ivt_iostorinvdtl dtl LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id + LEFT JOIN sys_dict_detail dict ON dict.`value` = mst.bill_type AND dict.name = 'IO_BUSS_TYPE' INNER JOIN pcs_if_purchaseorderproc proc ON proc.id = dtl.base_billdtl_id LEFT JOIN sys_user userper ON userper.user_id = mst.input_optid LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id @@ -194,12 +196,14 @@ SUM( dtl.real_qty ) AS num, dtl.pcsn, MAX( mst.bill_type ) AS bill_type, - MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate + MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate, + MAX(dict.label) AS label FROM st_ivt_iostorinvdis dtl LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id LEFT JOIN sys_user erpuser ON erpuser.user_id = mst.input_optid LEFT JOIN sys_dept dept ON dept.dept_id = mst.sysdeptid + LEFT JOIN sys_dict_detail dict ON dict.`value` = mst.bill_type AND dict.name = 'IO_BUSS_TYPE' LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = mb.ass_unit_id WHERE @@ -237,13 +241,15 @@ MAX(proc.M_UNIT_ID) AS M_UNIT_ID, MAX(userper.ext_id) AS make_ext_id, userper.extuser_id AS create_user_id, - MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate + MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate, + MAX(dict.label) AS label FROM st_ivt_iostorinvdtl dtl LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id INNER JOIN pcs_if_purchaseorderproc proc ON proc.id = dtl.base_billdtl_id LEFT JOIN sys_user userper ON userper.user_id = mst.input_optid LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id + LEFT JOIN sys_dict_detail dict ON dict.`value` = mst.bill_type AND dict.name = 'IO_BUSS_TYPE' WHERE dtl.iostorinv_id IN 输入.ids GROUP BY @@ -267,7 +273,8 @@ MAX(mb.material_name) AS material_name, SUM(dtl.real_qty) AS real_qty, dtl.pcsn, - MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate + MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate, + MAX(dict.label) AS label FROM st_ivt_iostorinvdis dtl LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id @@ -275,6 +282,7 @@ LEFT JOIN sys_dept dept ON dept.dept_id = mst.sysdeptid LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id LEFT JOIN md_pb_measureunit mu ON mu.measure_unit_id = mb.ass_unit_id + LEFT JOIN sys_dict_detail dict ON dict.`value` = mst.bill_type AND dict.name = 'IO_BUSS_TYPE' WHERE dtl.iostorinv_id IN 输入.ids GROUP BY @@ -318,10 +326,12 @@ dtl.seq_no, (case when mst.bill_type not in ('000601','000501','010701') then dtl.real_qty else concat('-',dtl.plan_qty) end) AS real_qty, dtl.pcsn, - IFNULL(mb.measrate,'1/1') AS vchangerate + IFNULL(mb.measrate,'1/1') AS vchangerate, + dict.label FROM st_ivt_iostorinvdtl dtl LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id + LEFT JOIN sys_dict_detail dict ON dict.`value` = mst.bill_type AND dict.name = 'IO_BUSS_TYPE' LEFT JOIN sys_user erpuser ON erpuser.user_id = mst.input_optid LEFT JOIN sys_dept dept ON dept.dept_id = mst.sysdeptid LEFT JOIN md_me_materialbase mb ON mb.material_id = dtl.material_id