|
|
@@ -122,12 +122,12 @@ public class DocCommonServiceImpl implements DocCommonService {
|
|
|
}
|
|
|
//XHTZ 型号调整(其它出库单) XHTZZF 型号调整-直发（其它出库单）
|
|
|
if("XHTZ".equals(prodInOut.getPiOrderType())||"XHTZZF".equals(prodInOut.getPiOrderType())){
|
|
|
- sqlBuilder.append("select pd_piid pdPiid,min(pd_id) pdId,min(pd_pdno) pdPdno,pd_prodcode pdProdcode,ipr.pr_detail pdProdname,obr.pr_brand pdBrandName" +
|
|
|
+ sqlBuilder.append("select pd_piid pdPiid,min(pd_id) pdId,min(pd_pdno) pdPdno,pd_prodcode pdProdcode,opr.pr_detail pdProdname,opr.pr_brand pdBrandName" +
|
|
|
",sum(nvl(pd_inqty,0)+nvl(pd_outqty,0)) pdQty" +
|
|
|
",pd_whcode pdWhcode,owh.wh_description pdWhname,pd_description pdInBatch" +
|
|
|
",pd_postwhcode pdWhcodeTo,iwh.wh_description pdWhnameTo" +
|
|
|
",'"+master+"' postMasterCode,'"+prodInOut.getCurrentMasterName()+"' postMasterName " +
|
|
|
- ",pd_prodcode1_user pdProdcodeTo,ibr.pr_brand pdBrandNameTo" +
|
|
|
+ ",pd_prodcode1_user pdProdcodeTo,ipr.pr_brand pdBrandNameTo" +
|
|
|
" from "+master+".prodiodetail " +
|
|
|
" LEFT JOIN "+master+".product ipr on ipr.pr_code = pd_prodcode left join "+master+".productbrand ibr on ibr.pb_name = ipr.pr_brand " +
|
|
|
" LEFT JOIN "+master+".product opr on opr.pr_code = pd_prodcode left join "+master+".productbrand obr on obr.pb_name = opr.pr_brand " +
|
|
|
@@ -135,7 +135,7 @@ public class DocCommonServiceImpl implements DocCommonService {
|
|
|
" left join "+master+".warehouse iwh on iwh.wh_Code = pd_postwhcode " +
|
|
|
" where pd_piid = "+prodInOut.getPiId()+" and obr.pb_sendwms = -1 and ibr.pb_sendwms = -1 " +
|
|
|
" group by pd_piid,pd_prodcode,opr.pr_detail,opr.pr_brand,pd_whcode,owh.wh_description,pd_description" +
|
|
|
- " ,pd_postwhcode,iwh.wh_description,pd_prodcode1_user,ibr.pr_brand" +
|
|
|
+ " ,pd_postwhcode,iwh.wh_description,pd_prodcode1_user,ipr.pr_brand" +
|
|
|
" order by MIN(pd_pdno) ");
|
|
|
}
|
|
|
} else {
|
