库存条码查询修改

src/com/uas/pda/service/impl/PdaCheckServiceImpl.java

@@ -33,22 +33,21 @@ public class PdaCheckServiceImpl implements PdaCheckService{
 		String condition ="";
 		Object obj=baseDao.getFieldDataByCondition("barcode","bar_prodcode","bar_code='"+pr_code+"'");
 		if(obj!=null){
-			condition =" upper(bar_prodcode) like '%"+obj.toString().toUpperCase()+"%'";
+			condition =" upper(v_pw_prodcode) like '%"+obj.toString().toUpperCase()+"%'";
 		}
 		String prcode =  baseDao.getFieldDataByCondition("barcode", "NVL(MAX(bar_prodcode),' ')", "bar_code = '" + pr_code + "' or bar_prodcode = '"+pr_code+"'").toString();
 		if(prcode.equals(" ") && "".equals(condition)) {
 			throw new APIErrorException(APIErrorCode.DATA_NOT_FOUND,"条码不存在！");
 		}else{
-			condition = "".equals(condition) ? "BAR_PRODCODE='"+prcode+"'" : condition+" and BAR_PRODCODE='"+prcode+"'";
+			condition = "".equals(condition) ? "v_pw_prodcode='"+prcode+"'" : condition+" and v_pw_prodcode='"+prcode+"'";
 		}
 
 		if (wh_code == null || "".equals(wh_code)||"null".equals(wh_code)) {
-			rs = baseDao.queryForRowSet(" select WMS_LOCATION_VIEW.*,nvl((select sum(nvl(remain,0)) from " +
-					"WMS_LOCATION_VIEW where "+condition+"),0) qty from WMS_LOCATION_VIEW WHERE "+condition);
+			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 " +
+					"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 WMS_LOCATION_VIEW.*,nvl((select sum(nvl(remain,0)) from " +
-					" WMS_LOCATION_VIEW where "+condition+" and (bar_whcode = '"+wh_code+"' or bar_location='"+wh_code+"')),0) qty" +
-					"  from WMS_LOCATION_VIEW WHERE "+condition +" and (bar_whcode = '"+wh_code+"' or bar_location='"+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 " +
+					"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()) {
 			return rs.getResultList();