|
|
@@ -43,10 +43,10 @@ public class PdaCheckServiceImpl implements PdaCheckService{
|
|
|
}
|
|
|
|
|
|
if (wh_code == null || "".equals(wh_code)||"null".equals(wh_code)) {
|
|
|
- rs = baseDao.queryForRowSet(" select MADEDATE,V_PW_WHCODE BAR_WHCODE,V_PW_ONHAND REMAIN,PR_DETAIL,pr_location BAR_LOCATION,PR_SPEC,PR_DETAIL||' '||pr_location PR_DETAIL from PM_PWONHAND_VIEW left join product on pr_code=v_pw_prodcode " +
|
|
|
+ rs = baseDao.queryForRowSet(" select MADEDATE,V_PW_WHCODE BAR_WHCODE,V_PW_ONHAND REMAIN,PR_DETAIL||' '||'料号:'||pr_code,pr_location BAR_LOCATION,PR_SPEC,PR_DETAIL||' '||pr_location PR_DETAIL from PM_PWONHAND_VIEW left join product on pr_code=v_pw_prodcode " +
|
|
|
"left join (select to_char(max(bar_madedate),'yyyymmdd')MADEDATE,bar_prodcode from barcode where bar_status=1 group by bar_prodcode) on bar_prodcode=v_pw_prodcode WHERE V_PW_WHCODE <>'在制仓(虚拟)' and "+condition);
|
|
|
} else {
|
|
|
- rs = baseDao.queryForRowSet(" select MADEDATE,V_PW_WHCODE BAR_WHCODE,V_PW_ONHAND REMAIN,PR_DETAIL,pr_location BAR_LOCATION,PR_SPEC,PR_DETAIL||' '||pr_location PR_DETAIL from PM_PWONHAND_VIEW left join product on pr_code=v_pw_prodcode " +
|
|
|
+ rs = baseDao.queryForRowSet(" select MADEDATE,V_PW_WHCODE BAR_WHCODE,V_PW_ONHAND REMAIN,PR_DETAIL||' '||'料号:'||pr_code,pr_location BAR_LOCATION,PR_SPEC,PR_DETAIL||' '||pr_location PR_DETAIL from PM_PWONHAND_VIEW left join product on pr_code=v_pw_prodcode " +
|
|
|
"left join (select to_char(max(bar_madedate),'yyyymmdd')MADEDATE,bar_prodcode from barcode where bar_status=1 group by bar_prodcode) on bar_prodcode=v_pw_prodcode WHERE V_PW_WHCODE <>'在制仓(虚拟)' and V_PW_WHCODE='"+wh_code+"' and "+condition);
|
|
|
}
|
|
|
if (rs.next()) {
|
