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

备注修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-06-27 16:45:12 +08:00
parent b5da790c94
commit 27e70ef67a
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/service/impl/InAndOutRetrunServiceImpl.java
View File

@@ -962,7 +962,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
item.appendChild(nweight); item.appendChild(nweight);
Element vnotebody = doc.createElement("vnotebody"); Element vnotebody = doc.createElement("vnotebody");
vnotebody.setTextContent("诺力正式"); vnotebody.setTextContent("诺力正式-"+jo.getString("label"));
item.appendChild(vnotebody); item.appendChild(vnotebody);
} }
@@ -1279,7 +1279,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
item.appendChild(vchangerate); item.appendChild(vchangerate);
Element vnotebody = doc.createElement("vnotebody"); Element vnotebody = doc.createElement("vnotebody");
vnotebody.setTextContent("诺力正式"); vnotebody.setTextContent("诺力正式-"+jo.getString("label"));
item.appendChild(vnotebody); item.appendChild(vnotebody);
} }
@@ -1593,9 +1593,9 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
Element vnotebody = doc.createElement("vnotebody"); Element vnotebody = doc.createElement("vnotebody");
if (is_zero){ if (is_zero){
vnotebody.setTextContent("诺力正式，末次回传"); vnotebody.setTextContent("诺力正式，末次回传-"+jo.getString("label"));
}else { }else {
vnotebody.setTextContent("诺力正式"); vnotebody.setTextContent("诺力正式-"+jo.getString("label"));
} }
item.appendChild(vnotebody); item.appendChild(vnotebody);
} }
@@ -1840,7 +1840,7 @@ public class InAndOutRetrunServiceImpl implements InAndOutReturnService {
item.appendChild(vchangerate); item.appendChild(vchangerate);
Element vnotebody = doc.createElement("vnotebody"); Element vnotebody = doc.createElement("vnotebody");
vnotebody.setTextContent("诺力正式"); vnotebody.setTextContent("诺力正式-"+jo.getString("label"));
item.appendChild(vnotebody); item.appendChild(vnotebody);
} }

20
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/returns/wql/QST_IVT_INANDOUTRETRUN.wql
View File

@@ -141,10 +141,12 @@
proc.M_UNIT_ID, proc.M_UNIT_ID,
userper.ext_id AS make_ext_id, userper.ext_id AS make_ext_id,
userper.extuser_id AS create_user_id, userper.extuser_id AS create_user_id,
mb.measrate AS vchangerate mb.measrate AS vchangerate,
dict.label
FROM FROM
st_ivt_iostorinvdtl dtl st_ivt_iostorinvdtl dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id 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 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 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 md_me_materialbase mb ON mb.material_id = dtl.material_id
@@ -194,12 +196,14 @@
SUM( dtl.real_qty ) AS num, SUM( dtl.real_qty ) AS num,
dtl.pcsn, dtl.pcsn,
MAX( mst.bill_type ) AS bill_type, 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 FROM
st_ivt_iostorinvdis dtl st_ivt_iostorinvdis dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id 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_user erpuser ON erpuser.user_id = mst.input_optid
LEFT JOIN sys_dept dept ON dept.dept_id = mst.sysdeptid 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_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 md_pb_measureunit mu ON mu.measure_unit_id = mb.ass_unit_id
WHERE WHERE
@@ -237,13 +241,15 @@
MAX(proc.M_UNIT_ID) AS M_UNIT_ID, MAX(proc.M_UNIT_ID) AS M_UNIT_ID,
MAX(userper.ext_id) AS make_ext_id, MAX(userper.ext_id) AS make_ext_id,
userper.extuser_id AS create_user_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 FROM
st_ivt_iostorinvdtl dtl st_ivt_iostorinvdtl dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id 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 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 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 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 WHERE
dtl.iostorinv_id IN 输入.ids dtl.iostorinv_id IN 输入.ids
GROUP BY GROUP BY
@@ -267,7 +273,8 @@
MAX(mb.material_name) AS material_name, MAX(mb.material_name) AS material_name,
SUM(dtl.real_qty) AS real_qty, SUM(dtl.real_qty) AS real_qty,
dtl.pcsn, dtl.pcsn,
MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate MAX(IFNULL(mb.measrate,'1/1')) AS vchangerate,
MAX(dict.label) AS label
FROM FROM
st_ivt_iostorinvdis dtl st_ivt_iostorinvdis dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id 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 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_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 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 WHERE
dtl.iostorinv_id IN 输入.ids dtl.iostorinv_id IN 输入.ids
GROUP BY GROUP BY
@@ -318,10 +326,12 @@
dtl.seq_no, 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, (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, dtl.pcsn,
IFNULL(mb.measrate,'1/1') AS vchangerate IFNULL(mb.measrate,'1/1') AS vchangerate,
dict.label
FROM FROM
st_ivt_iostorinvdtl dtl st_ivt_iostorinvdtl dtl
LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dtl.iostorinv_id 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_user erpuser ON erpuser.user_id = mst.input_optid
LEFT JOIN sys_dept dept ON dept.dept_id = mst.sysdeptid 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_me_materialbase mb ON mb.material_id = dtl.material_id