Sarita: Done changes to get item details on [01DEC2017]

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

webitm-dis/ibase/webitm/ejb/dis/SorderStatusEJB.java

@@ -280,8 +280,8 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
 	    			   valueXmlString.append("</policy>");
 	    		   }	   
 	    	   }//end of if block for dataSize
-			
-	    	   sql = "SELECT SORDITEM.SALE_ORDER,SORDDET.ITEM_CODE__ORD,SORDDET.LINE_NO,SORDITEM.EXP_LEV ," +
+			   // Committed and Added by sarita on 01DEC2017
+	    	  /* sql = "SELECT SORDITEM.SALE_ORDER,SORDDET.ITEM_CODE__ORD,SORDDET.LINE_NO,SORDITEM.EXP_LEV ," +
 	    	   		 "SORDITEM.SITE_CODE,SORDITEM.ITEM_CODE__ORD,SORDITEM.ITEM_FLAG,SORDITEM.ITEM_CODE," +
 	    	   		 "ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,SORDITEM.QTY_ALLOC,SORDITEM.DATE_ALLOC," +
 	    	   		 "SORDITEM.NATURE,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP," +
@@ -302,23 +302,36 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
 	    	   		 "SORDITEM.DATE_ALLOC,SORDITEM.QTY_ALLOC,SORDITEM.STATUS,SORDITEM.NATURE," +
 	    	   		 "SORDDET.LINE_NO,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP," +
 	    	   		 "SORDITEM.PLAN_PROD_DATE,SORDITEM.REMARKS,SORDDET.DSP_DATE,SORDITEM.EXP_DLV_DATE " +
-	    	   		 "ORDER BY SORDDET.LINE_NO ASC, SORDITEM.EXP_LEV ASC";			
-				pstmt =  conn.prepareStatement(sql);
+	    	   		 "ORDER BY SORDDET.LINE_NO ASC, SORDITEM.EXP_LEV ASC";*/
+	    	   
+	    	    sql = "SELECT SORDITEM.SALE_ORDER,SORDITEM.ITEM_CODE,SORDITEM.LINE_NO,SORDITEM.EXP_LEV ," +
+	    	    	  "SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY," +
+	    	    	  "SORDITEM.UNIT,SORDITEM.QTY_ALLOC,SORDITEM.DATE_ALLOC,SORDITEM.NATURE,SORDITEM.REAS_CODE," +
+	    	    	  "SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.STATUS,SORDITEM.PLAN_PROD_DATE,SORDITEM.EXP_DLV_DATE," +
+	    	    	  "SORDITEM.REMARKS,SORDITEM.DUE_DATE,(SELECT SUM(QUANTITY - ALLOC_QTY - CASE WHEN HOLD_QTY IS NULL THEN 0 ELSE HOLD_QTY END) " +
+	    	    	  "FROM STOCK,LOCATION,INVSTAT WHERE STOCK.ITEM_CODE = SORDITEM.ITEM_CODE AND STOCK.SITE_CODE = SORDITEM.SITE_CODE " +
+	    	    	  "AND LOCATION.LOC_CODE=STOCK.LOC_CODE AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND INVSTAT.AVAILABLE= 'Y') STK_QTY, " +
+	    	    	  "(SORDITEM.QUANTITY - SORDITEM.qty_desp) AS PEND_QTY FROM SORDITEM, ITEM WHERE (SORDITEM.ITEM_CODE        = item.ITEM_CODE) " +
+	    	    	  "AND SORDITEM.SALE_ORDER        = ? GROUP BY SORDITEM.SALE_ORDER,SORDITEM.SITE_CODE,SORDITEM.ITEM_FLAG,SORDITEM.EXP_LEV," +
+	    	    	  "SORDITEM.ITEM_CODE,ITEM.DESCR,SORDITEM.QUANTITY,SORDITEM.UNIT,SORDITEM.DATE_ALLOC,SORDITEM.QTY_ALLOC,SORDITEM.STATUS,SORDITEM.NATURE," +
+	    	    	  "SORDITEM.LINE_NO,SORDITEM.REAS_CODE,SORDITEM.REAS_DETAIL,SORDITEM.QTY_DESP,SORDITEM.PLAN_PROD_DATE,SORDITEM.REMARKS," +
+	    	    	  "SORDitem.due_DATE,SORDITEM.EXP_DLV_DATE ORDER BY SORDITEM.LINE_NO ASC, SORDITEM.EXP_LEV ASC";
+	    	    pstmt =  conn.prepareStatement(sql);
 				pstmt.setString(1,saleOrder);
 				rs = pstmt.executeQuery();
 				while(rs.next())
 				{
-					despDate = rs.getString("DSP_DATE");					
+					/*despDate = rs.getString("DSP_DATE");					
 					if(despDate != null)
 			    	{
 						despDate1 =  genericUtility.getValidDateString(despDate, genericUtility.getDBDateFormat(), genericUtility.getApplDateFormat());
-			    	}
+			    	}*/
 					
 					valueXmlString.append("<Item>\n");
 					valueXmlString.append("<sale_order><![CDATA["+checkNull(rs.getString("SALE_ORDER"))+"]]></sale_order>\n");
 					valueXmlString.append("<line_no><![CDATA["+checkNull(rs.getString("LINE_NO"))+"]]></line_no>\n");
 					valueXmlString.append("<exp_lev><![CDATA["+checkNull(rs.getString("EXP_LEV"))+"]]></exp_lev>\n");
-					valueXmlString.append("<item_code__ord><![CDATA["+checkNull(rs.getString("ITEM_CODE__ORD"))+"]]></item_code__ord>\n");
+					//valueXmlString.append("<item_code__ord><![CDATA["+checkNull(rs.getString("ITEM_CODE__ORD"))+"]]></item_code__ord>\n");
 					valueXmlString.append("<item_flag><![CDATA["+checkNull(rs.getString("ITEM_FLAG"))+"]]></item_flag>\n");
 					valueXmlString.append("<item_code><![CDATA["+checkNull(rs.getString("ITEM_CODE"))+"]]></item_code>\n");
 					valueXmlString.append("<item_descr><![CDATA["+checkNull(rs.getString("DESCR"))+"]]></item_descr>\n");
@@ -333,7 +346,7 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
 					valueXmlString.append("<desp_qty><![CDATA["+checkNull(rs.getString("QTY_DESP"))+"]]></desp_qty>\n");
 					valueXmlString.append("<plan_prod_date><![CDATA["+checkNull(rs.getString("PLAN_PROD_DATE"))+"]]></plan_prod_date>\n");
 					valueXmlString.append("<remarks><![CDATA["+checkNull(rs.getString("REMARKS"))+"]]></remarks>\n");
-					valueXmlString.append("<dsp_date><![CDATA["+despDate1+"]]></dsp_date>\n");
+					//valueXmlString.append("<dsp_date><![CDATA["+despDate1+"]]></dsp_date>\n");
 					valueXmlString.append("<exp_dlv_date><![CDATA["+checkNull(rs.getString("EXP_DLV_DATE"))+"]]></exp_dlv_date>\n");
 					valueXmlString.append("<pend_qty><![CDATA["+checkNull(rs.getString("PEND_QTY"))+"]]></pend_qty>\n");
 					valueXmlString.append("<stk_qty><![CDATA["+checkNull(rs.getString("STK_QTY"))+"]]></stk_qty>\n");
@@ -422,39 +435,4 @@ public class SorderStatusEJB extends ValidatorEJB implements SorderStatusEJBRemo
 	}
 }
 	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	/*int total_rows = rs.getMetaData().getColumnCount();
-	   System.out.println("Total Rows ::"+total_rows);
-	   for (int i = 0; i < total_rows; i++) 
-	   {
-		   String columnValue = "";			    		  
-		   //jsonObj.put(rs.getMetaData().getColumnLabel(i+1).toLowerCase(getMetaData), rs.getObject(i + 1));
-		   int type = rs.getMetaData().getColumnType(i+1);
-		   System.out.println("column type ::"+type);
-		   columnName = rs.getMetaData().getColumnLabel(i+1).toLowerCase();
-		   if (type == Types.DATE || type == Types.TIMESTAMP)
-		   {
-			   System.out.println("Inside if block of type!!!!!!!");
-			   if(rs.getDate(i+1) != null)
-			   {			    				  
-				   columnValue = sdf.format(rs.getDate(i+1));
-				   System.out.println("columnValue is::::"+columnValue);
-				   genericUtility.getValidDateTimeString(columnValue,genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat());
-			   }
-		   }
-		   else
-		   {
-			   columnValue = checkNull(rs.getString(i + 1));
-		   }
-		   valueXmlString.append("<"+columnName+"><![CDATA["+(columnValue)+"]]></"+columnName+">"+"\n");			    		  
-	   }*/
+