change in get data wave gen functionality

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

webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java

@@ -470,50 +470,55 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 			printLabel = genericUtility.getColumnValue("print_label",headerDom);
 			
 			getDataSql =" SELECT SORDER.CUST_CODE, CUSTOMER.CUST_NAME,SORDDET.LINE_NO, "
-			       +"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
-				   +"ITEM.DESCR,SORDITEM.QUANTITY,"
-				   +"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
-				   +"SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR,"
-				   +"SORDITEM.SITE_CODE,SORDITEM.EXP_LEV, "
-				 //Changed by sankara on 01/08/13 single_lot also available in sales order  
-				   // +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
-				  //Chnaged by Rohan on 27-08-13 to get Max self life
-				   //+"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
-				   +"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE ,  SORDITEM.MAX_SHELF_LIFE AS MAX_SHELF_LIFE"
-				   +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW  "
-				   +" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS  UNIT__STD, SORDDET.CONV__QTY_STDUOM "
-				   +" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
-				   +"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE,CUSTOMER C  "
-				   +"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
-				   +"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
-				   +"( SORDDET.LINE_NO = SORDITEM.LINE_NO ) AND "
-				   +"( SORDITEM.ITEM_CODE = ITEM.ITEM_CODE ) AND "
-				   +"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND  "
-				   +"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
-				   //Changed By Pragyan 17-SEP-13 To join the wave type with cust_code__dlv
-				   //+"( CUSTOMER.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
-				   +"( C.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
-				   +" SORDITEM.SITE_CODE = ? AND "
-				   +" ITEM.ITEM_SER >=? AND "
-				   +" ITEM.ITEM_SER <=? AND "  
-				   +" ITEM.ITEM_CODE >=? AND "
-				   +" ITEM.ITEM_CODE <=? AND "
-				   +" CUSTOMER.CUST_CODE >=? AND "
-				   +" CUSTOMER.CUST_CODE <=? AND "  
-				   +" SORDER.CUST_CODE__DLV >=? AND " 	
-				   +" SORDER.CUST_CODE__DLV <=? AND " 
-				   +" SORDER.SALE_ORDER >= ? AND "
-				   +" SORDER.SALE_ORDER <= ? AND " 
-				   +" SORDER.DUE_DATE >=  ?  AND" 
-				   +" SORDER.DUE_DATE <= ? " 
-				   +" AND SORDER.CUST_CODE__DLV = C.CUST_CODE "  
-				   +" AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
-				   +" AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end = 'P' "
-				   +" AND CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG end <> 'Y'"
-				   +" AND ((SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "  
-				   +" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"				   
-				   +" AND SORDITEM.LINE_TYPE = 'I'"
-				   +" ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
+				       +"SORDER.SALE_ORDER,SORDER.DUE_DATE,SORDITEM.ITEM_CODE,"
+					   +"ITEM.DESCR,SORDITEM.QUANTITY,"
+				       //Changed By Pragyan 13-nov-13 to get pending qty
+					   //+"(SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC) PENDING_QUANTITY,"
+					   +" FN_GET_CONV_QTY(SORDER.SALE_ORDER, SORDDET.LINE_NO) PENDING_QUANTITY,"
+					   +" SORDITEM.QTY_ALLOC,SORDDET.PACK_INSTR, "
+					   +" SORDITEM.SITE_CODE,SORDITEM.EXP_LEV, "
+					 //Changed by sankara on 01/08/13 single_lot also available in sales order  
+					   // +"SORDER.PART_QTY AS PART_QTY, CUSTOMER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+					  //Chnaged by Rohan on 27-08-13 to get Max self life
+					   //+"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE "//Gulzar 5/13/2012
+					   +"SORDER.PART_QTY AS PART_QTY, SORDER.SINGLE_LOT AS SINGLE_LOT, SORDITEM.MIN_SHELF_LIFE AS MIN_SHELF_LIFE ,  SORDITEM.MAX_SHELF_LIFE AS MAX_SHELF_LIFE"
+					   +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW  "
+					   +" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS  UNIT__STD, SORDDET.CONV__QTY_STDUOM "
+					   +" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
+					   +"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE,CUSTOMER C  "
+					   +"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
+					   +"( SORDITEM.SALE_ORDER = SORDER.SALE_ORDER ) AND "
+					   +"( SORDDET.LINE_NO = SORDITEM.LINE_NO ) AND "
+					   +"( SORDITEM.ITEM_CODE = ITEM.ITEM_CODE ) AND "
+					   +"( SORDER.CUST_CODE = CUSTOMER.CUST_CODE ) AND  "
+					   +"( SORDDET.SITE_CODE = SORDITEM.SITE_CODE ) AND  "
+					   //Changed By Pragyan 17-SEP-13 To join the wave type with cust_code__dlv
+					   //+"( CUSTOMER.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
+					   +"( C.WAVE_TYPE = WAVE_TYPE.WAVE_TYPE(+)) AND "
+					   +" SORDITEM.SITE_CODE = ? AND "
+					   +" ITEM.ITEM_SER >=? AND "
+					   +" ITEM.ITEM_SER <=? AND "  
+					   +" ITEM.ITEM_CODE >=? AND "
+					   +" ITEM.ITEM_CODE <=? AND "
+					   +" CUSTOMER.CUST_CODE >=? AND "
+					   +" CUSTOMER.CUST_CODE <=? AND "  
+					   +" SORDER.CUST_CODE__DLV >=? AND " 	
+					   +" SORDER.CUST_CODE__DLV <=? AND " 
+					   +" SORDER.SALE_ORDER >= ? AND "
+					   +" SORDER.SALE_ORDER <= ? AND " 
+					   +" SORDER.DUE_DATE >=  ?  AND" 
+					   +" SORDER.DUE_DATE <= ? " 
+					   +" AND SORDER.CUST_CODE__DLV = C.CUST_CODE "  
+					   +" AND CASE WHEN SORDDET.STATUS IS NULL THEN 'P' ELSE SORDDET.STATUS end <> 'C' "
+					   +" AND CASE WHEN SORDER.STATUS IS NULL THEN 'P' ELSE SORDER.STATUS end = 'P' "
+					   +" AND CASE WHEN SORDDET.HOLD_FLAG IS NULL THEN 'N' ELSE SORDDET.HOLD_FLAG end <> 'Y'"
+					   //Changed By Pragyan 13-nov-13 to get pending qty
+					  // +" AND ((SORDITEM.QUANTITY - SORDITEM.QTY_DESP - SORDITEM.QTY_ALLOC > 0 ) "
+					   +" AND ((FN_GET_CONV_QTY(SORDER.SALE_ORDER, SORDDET.LINE_NO) > 0 ) "
+					   //FN_GET_CONV_QTY(SORDER.SALE_ORDER, SORDDET.LINE_NO)
+					   +" OR (FN_CHECK_MANUAL_STOCK_ALLOC(SORDER.SALE_ORDER, SORDDET.LINE_NO) = 0 ) )"				   
+					   +" AND SORDITEM.LINE_TYPE = 'I'"
+					   +" ORDER BY SORDER.CUST_CODE,SORDER.SALE_ORDER,SORDITEM.ITEM_CODE__ORD"; 
 
 			
 				resrvLoc  = discommon.getDisparams("999999","RESERV_LOCATION",conn);         
@@ -653,7 +658,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
 						{
 							convQtyStduom= Double.parseDouble(convQtyList.get(0).toString());
 						}
-						pendingQty = meffQty;
+						//pendingQty = meffQty;
+						if(unit != null && !"CS".equalsIgnoreCase(unit.trim()))
+						{
+							pendingQty = meffQty;
+						}
 						convQtyList = new ArrayList();
 						convQtyList = discommon.getConvQuantityFact(unit, mbaseUnit, itemCode, quantity, convFact,conn);						
 						quantity = Double.parseDouble(convQtyList.get(1).toString());

webitm-wms/module-resource/sql/update.sql

@@ -44695,4 +44695,30 @@ VALUES (
 
 UPDATE MESSAGES SET MSG_STR='No pending Tasks', MSG_DESCR='All tasks are Processed' 
 WHERE MSG_NO='RECONEXIST';
+--Changed By Pragyan 13-nov-13 last updated function
+CREATE OR REPLACE FUNCTION FN_GET_CONV_QTY(SI_SALE_ORDER IN CHAR,
+SI_LINE_NO IN CHAR )
+  RETURN number is
+  FLAG number ;
+  quantity NUMBER;
+  qtyDesp NUMBER;
+  quantityAlloc NUMBER;
+  convQtyStdU   NUMBER;
+  UNIT char(3);
+  BEGIN
+   BEGIN
+    SELECT  QUANTITY,qty_alloc,QTY_DESP,CONV__QTY_STDQTY,UNIT INTO
+quantity,quantityAlloc,qtyDesp,convQtyStdU,UNIT
+    FROM SORDITEM WHERE SALE_ORDER = SI_SALE_ORDER AND TRIM(LINE_NO) =
+	TRIM(SI_LINE_NO);
+      FLAG := ((quantity * convQtyStdU)-(qtyDesp *
+convQtyStdU)-quantityAlloc );
+  EXCEPTION
+  WHEN NO_DATA_FOUND  THEN
+   FLAG :=2;
+  END;
+  RETURN FLAG;
+  END;
+/
+
 COMMIT;
\ No newline at end of file