Adding new field In stock on Sales Order Wizard componant

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

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

@@ -1456,8 +1456,15 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			}
 			else if ("item_code".equalsIgnoreCase(field))
 			{
+				//changed by kaustubh on 13 nov 2017     start
 				//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL AND ITEM_SER = ? ";
-				sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL ";
+				//sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE ITEM_PARNT IS NULL ";
+				
+				sql = " SELECT ITEM_CODE,DESCR FROM ITEM WHERE PRODUCT_CODE IS NULL ";
+				
+				//changed by kaustubh on 13 nov 2017     End
+				
+				
 			}
 			else if ("state_code__dlv".equalsIgnoreCase(field))
 			{
@@ -1783,7 +1790,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		ResultSet rs = null;
 		String color,size,dimension,itemCode = "";
 		
-		String dColor,dSize,dDim = "",dColorDescr = "",dDimDescr = "";
+		String dColor,dSize,dDim = "",dColorDescr = "",dDimDescr = "",totalQty="";
 		
 		HashMap dataMap = new HashMap();
 		ArrayList sizeList = new ArrayList();
@@ -1823,7 +1830,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			//Added by Santosh on 04-11-2017 to get physical attributes values from item_type [Start]
 			String itemType = "",phyAttribute1 = "", phyAttribute2 = "", phyAttribute3 = "", phyAttribute4 = "", phyAttribute5 = "";
 			
-			sql = "SELECT ITEM_TYPE FROM ITEM WHERE ITEM_CODE = ?";
+			sql = "SELECT ITEM_TYPE FROM ITEM WHERE PRODUCT_CODE = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, itemParent);
 			
@@ -1874,11 +1881,47 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 			
 			//Added by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
 			
+			
+			//Added by Kaustubh on 10-11-2017 to get Total Quantity attributes values from stock [start]
+			
+			    sql = "select sum (quantity- (case when ALLOC_QTY is null then 0 else ALLOC_QTY end)" + 
+					"- (case when HOLD_QTY is null then 0 else HOLD_QTY end)) as in_stock from STOCK s,item i"
+					+ " where s.item_code=i.ITEM_CODE and  i.product_code= ? ";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString(1, itemParent);
+			
+				rs = pstmt.executeQuery();
+			
+				while (rs.next())
+				{
+					totalQty = checkNullAndTrim(rs.getString(1));
+					
+					if(totalQty == null || totalQty =="")
+					{
+						totalQty="0";
+					}
+					//if(totalQty.length()==0 || totalQty==)
+				}
+
+				if (rs != null) 
+				{					
+					rs.close();rs = null;
+				}
+				if (pstmt != null ) 
+				{					
+					pstmt.close();pstmt = null;
+				}
+				
+			 System.out.println("totalQty:"+totalQty);
+			//Added by Kaustubh on 10-11-2017 to get Total Quantity attributes values from stock[end]
+			
+			 //valueXmlString.append("<tot_qty>").append("<![CDATA["+totalQty+"]]>").append("</tot_qty>");
+				
 			//if(tranType.equals("T"))
 			//{
 				valueXmlString.append("<TH_SET selected = 'N'>\r\n");
 				sql = " SELECT DISTINCT TRIM(V.ATTRIB_ID),SORT_ORDER AS PSIZE,V.DESCR FROM ITEM I, ITM_ATTRIB_VAL V WHERE V.ATTRIB_ID = I.PHY_ATTRIB_1 AND "
-					+" I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND V.ATTRIB_CODE = I.PHY_ATTRIB_22 "
+					+" I.PRODUCT_CODE = ? AND I.ITEM_CODE != ? AND V.ATTRIB_CODE = I.PHY_ATTRIB_22 "
 					+ " AND I.ACTIVE = 'Y' "
 					+" order by SORT_ORDER ";
 				pstmt = conn.prepareStatement(sql);
@@ -1893,6 +1936,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				valueXmlString.append("<SET><![CDATA[").append(colName1 ).append("]]></SET>\r\n");
 				valueXmlString.append("<SET><![CDATA[").append(colName2).append("]]></SET>\r\n");
 				//Commented and Changes by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
+				
+			/*	valueXmlString.append("<SET><![CDATA[").append("In Stock").append("]]></SET>\r\n");*/
 				valueXmlString.append("<SET><![CDATA[").append("Quantity").append("]]></SET>\r\n");
 				while (rs.next())
 				{
@@ -1916,7 +1961,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 
 				valueXmlString.append("</TH_SET>\r\n");
 			
-				sql = " SELECT DISTINCT I.PHY_ATTRIB_2,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ?"
+				sql = " SELECT DISTINCT I.PHY_ATTRIB_2,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V WHERE I.PRODUCT_CODE = ? AND I.ITEM_CODE != ?"
 					 +" AND I.PHY_ATTRIB_2 = V.ATTRIB_ID "
 					 //Changed by Santosh on 04-11-2017
 					 //+" AND V.ATTRIB_CODE='COLOR' " 
@@ -1947,7 +1992,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				}
 
 				sql = " SELECT DISTINCT I.PHY_ATTRIB_3,V.DESCR FROM ITEM I,ITM_ATTRIB_VAL V "
-					 +" WHERE I.ITEM_PARNT = ? AND I.ITEM_CODE != ? AND I.PHY_ATTRIB_3 = V.ATTRIB_ID"
+					 +" WHERE I.PRODUCT_CODE = ? AND I.ITEM_CODE != ? AND I.PHY_ATTRIB_3 = V.ATTRIB_ID"
 					 //Changed by Santosh on 04-11-2017
 					 //+" AND V.ATTRIB_CODE='DIMENSION' " 
 					 +" AND V.ATTRIB_CODE= '"+colName2.toUpperCase()+"' " 
@@ -1976,7 +2021,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				}
 				
 				sql = " SELECT PHY_ATTRIB_2 COLOR, PHY_ATTRIB_3 ITEMDIMENSION,ITEM_CODE,PHY_ATTRIB_1 SIZE1"
-					 +" FROM ITEM WHERE item_parnt = ? AND ITEM_CODE != ? and  decode(catalog_no,null,'N',catalog_no) ='N' "
+					 +" FROM ITEM WHERE PRODUCT_CODE = ? AND ITEM_CODE != ? and  decode(catalog_no,null,'N',catalog_no) ='N' "
 					 +" AND ACTIVE = 'Y' "
 					 +" GROUP BY ITEM_CODE,PHY_ATTRIB_2,PHY_ATTRIB_1,PHY_ATTRIB_3 " 		
 					 +" ORDER BY PHY_ATTRIB_1 ";
@@ -2026,6 +2071,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 						temStrBuffer.append("<td><![CDATA[").append(colorData.get(colorList.get(j))).append("]]></td>\r\n"); 
 						temStrBuffer.append("<td><![CDATA[").append(dimensionData.get(dimensionList.get(i))).append("]]></td>\r\n");
 						temStrBuffer.append("<td><![CDATA[").append(0).append("]]></td>\r\n");
+						/*temStrBuffer.append("<td><![CDATA[").append(0).append("]]></td>\r\n");*/
 						for(int k=0;k<sizelen;k++)
 						{
 							key = colorList.get(j) + ":"+ dimensionList.get(i) + ":"+ sizeList.get(k);
@@ -2159,7 +2205,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				valueXmlString.append("<item_parent_rate><![CDATA[").append(itemParentRate).append("]]></item_parent_rate>\r\n");
 
 				valueXmlString.append("<tab_no><![CDATA[").append(tabNum).append("]]></tab_no>\r\n");
-				
+				valueXmlString.append("<tot_qty><![CDATA[").append(totalQty).append("]]></tot_qty>\r\n");
 				valueXmlString.append("</RECORDS>\r\n");
 				valueXmlString.append("</PRODUCT_SET>\r\n");
 				valueXmlString.append("</Root>");