W16FKAT002 fixed QC issues

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

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

@@ -204,18 +204,38 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 						}
 					    if (childNodeName.equalsIgnoreCase("order_date")) 
 						{
-					    	String statSal = "";
+					    	String statSal = "",prdCode = "";
 					    	int count = 0;
 					    	System.out.println("Order Date="+columnValue);
 					    	
 					    	String ordDate = genericUtility.getValidDateTimeString(
 									checkNullAndTrim(columnValue), genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
 					    	
-					    	sql = " SELECT STAT_SAL FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE ";
+					    	String siteCode = checkNullAndTrim(genericUtility.getColumnValue("site_code", dom1));
+					    	
+					    	sql = " SELECT CODE FROM PERIOD WHERE ? BETWEEN FR_DATE AND TO_DATE ";
 							pstmt = conn.prepareStatement(sql);
 							pstmt.setTimestamp(1, java.sql.Timestamp.valueOf(ordDate));
 							rs = pstmt.executeQuery();
 							if (rs.next())
+							{
+								prdCode = checkNullAndTrim(rs.getString("CODE"));
+							}
+							if (rs != null) 
+							{					
+								rs.close();rs = null;
+							}
+							if (pstmt != null ) 
+							{					
+								pstmt.close();pstmt = null;
+							}
+							
+							sql = " SELECT STAT_SAL FROM PERIOD_STAT WHERE PRD_CODE = ? AND SITE_CODE = ?";
+							pstmt = conn.prepareStatement(sql);
+							pstmt.setString(1, prdCode);
+							pstmt.setString(2, siteCode);
+							rs = pstmt.executeQuery();
+							if (rs.next())
 							{
 								statSal = checkNullAndTrim(rs.getString("STAT_SAL"));
 								count++;
@@ -1847,11 +1867,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 		double rate = 0,netAmount = 0,lcStdrate = 0,rateClg = 0;
 		String lineNo = "",itemDescr = "",unit = "",siteCode = "",itemSer = "",custCodeDlv = "",custCodeBil = "",orderType = "",priceList = "",priceListClg = "",
 				taxChap = "",taxClass = "",taxEnv = "",stationFrom = "",stationTo = "",unitRate = "",itmStru = "",packInstr = "",
-			    lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "";
+			    lsPriceList = "",orderDate = "",dueDate = "",custCode = "",custItemRef = "",saleOrder = "";
 		try
 		{		
 				valueXmlString.append("<Detail3 domID='"+domID+"' selected = 'Y'>\r\n");
 				
+				saleOrder   = checkNullAndTrim(genericUtility.getColumnValue("sale_order", dom1));
 				siteCode 	= checkNullAndTrim(genericUtility.getColumnValue("site_code", dom1));
 				orderDate 	= checkNullAndTrim(genericUtility.getColumnValue("order_date", dom1));
 				custCodeDlv = checkNullAndTrim(genericUtility.getColumnValue("cust_code__dlv", dom1));
@@ -1978,16 +1999,39 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
 				valueXmlString.append("<dsp_date><![CDATA[").append(ordDate).append("]]></dsp_date>\r\n");
 				valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
 				
-				lsPriceList = checkNullAndTrim(distCommon.getDisparams("999999", "STD_SO_PL", conn));
-
-				if (lsPriceList.length() > 0)
-				{
-					lcStdrate = distCommon.pickRate(lsPriceList, orderDate, itemCode,"","L", conn);
+				if(saleOrder.length() > 0)
+				{
+					 sql = "SELECT RATE FROM SORDDET WHERE ITEM_CODE = ? AND SALE_ORDER = ? ";
+					 pstmt = conn.prepareStatement(sql);
+					 pstmt.setString(1, itemCode);
+					 pstmt.setString(2, saleOrder);
+					 rs = pstmt.executeQuery();
+					 if ( rs.next() )
+					 {
+						 lcStdrate = rs.getDouble("RATE");
+					 }
+					if( rs != null )
+					{
+						rs.close();rs = null;
+					}
+					if( pstmt != null )
+					{
+						pstmt.close();pstmt = null;
+					}
 				}
 				else
 				{
-					lcStdrate = distCommon.pickRate(priceList, orderDate, itemCode,"","L", conn);
-				}
+					lsPriceList = checkNullAndTrim(distCommon.getDisparams("999999", "STD_SO_PL", conn));
+					if (lsPriceList.length() > 0)
+					{
+						lcStdrate = distCommon.pickRate(lsPriceList, orderDate, itemCode,"","L", conn);
+					}
+					else
+					{
+						lcStdrate = distCommon.pickRate(priceList, orderDate, itemCode,"","L", conn);
+					}
+				}	
+				
 				if( priceListClg.length() > 0 )
 				{
 					rateClg = distCommon.pickRate( priceListClg, orderDate, itemCode, "", "L", conn );