updated

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95293 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-mfg/ibase/webitm/ejb/mfg/WoTransferPrc.java

@@ -288,20 +288,26 @@ public class WoTransferPrc extends ProcessEJB implements WoTransferPrcLocal,WoTr
 //					" and loc_code in(select loc_code from location where inv_stat = ?) ";
 			if(worder != null && worder.trim().length() > 0)
 			{
+//				sql = " select tran_id,item_code,lot_no,lot_sl,loc_code,sum(quantity) as quantity  "
+//			    		+" from inv_alloc_det GROUP BY tran_id, item_code, lot_no, lot_sl, loc_code having  tran_id = ? "
+//			    		+" and loc_code in(select loc_code from location where inv_stat = ? ) ";
+
 				sql = " select tran_id,item_code,lot_no,lot_sl,loc_code,sum(quantity) as quantity  "
-			    		+" from inv_alloc_det GROUP BY tran_id, item_code, lot_no, lot_sl, loc_code having  tran_id = ? "
-			    		+" and loc_code in(select loc_code from location where inv_stat = ? ) ";
-				
+			    		+" from inv_alloc_det where (case when alloc_qty is null then 0 else alloc_qty end - case when dealloc_qty is null then 0 else dealloc_qty end) > 0 AND   tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE  WHERE WORK_ORDER = ?)  "
+			    		+" and loc_code in(select loc_code from location where inv_stat = ? ) GROUP BY tran_id, item_code, lot_no, lot_sl, loc_code ";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString(1,tranIdInvAlloc);
+//				pstmt.setString(1,tranIdInvAlloc);
+				pstmt.setString(1,worder);
 				pstmt.setString(2,invstat1);
 			}
 			if(campNo != null && campNo.trim().length() > 0)
 			{
+//				sql = " select item_code,lot_no,lot_sl,loc_code,sum(quantity) as quantity  "
+//			    		+" from inv_alloc_det  where  tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE WHERE WORK_ORDER  IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "
+//			    		+" and loc_code in(select loc_code from location where inv_stat = ? ) GROUP BY  item_code, lot_no, lot_sl, loc_code ";
 				sql = " select item_code,lot_no,lot_sl,loc_code,sum(quantity) as quantity  "
-			    		+" from inv_alloc_det  where  tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE WHERE WORK_ORDER  IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "
+			    		+" from inv_alloc_det  where  (case when alloc_qty is null then 0 else alloc_qty end - case when dealloc_qty is null then 0 else dealloc_qty end) > 0 and  tran_id IN (SELECT TRAN_ID FROM INV_ALLOCATE WHERE WORK_ORDER  IN (SELECT WORK_ORDER FROM WORKORDER WHERE CAMPGN_NO = ? AND STATUS = 'R')) "
 			    		+" and loc_code in(select loc_code from location where inv_stat = ? ) GROUP BY  item_code, lot_no, lot_sl, loc_code ";
-				
 				pstmt = conn.prepareStatement(sql);
 				pstmt.setString(1,campNo);
 				pstmt.setString(2,invstat1);