Skip to content

B
business-java
Commit 307aa722 authored by wansari's avatar wansari
Browse files
Options

W16LKAT002 updated source for Sales Order wizard previous issue for rate 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43434 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cbdc86df
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 38 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ 307aa722
...@@ -1092,7 +1092,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1092,7 +1092,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
HashMap<String, ArrayList> tempMap = new HashMap<String, ArrayList>(); HashMap<String, ArrayList> tempMap = new HashMap<String, ArrayList>();
ArrayList tempList = null; ArrayList tempList = null;
String itemParnt = "",quantity = "",tabNo = "",discount = ""; String itemParnt = "",quantity = "",tabNo = "",discount = "",rate = "";
for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++) for(int ctr = 0 ;ctr < detail2NodeListlen;ctr++)
{ {
...@@ -1143,6 +1143,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1143,6 +1143,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
discount = itmNode.getFirstChild().getNodeValue(); discount = itmNode.getFirstChild().getNodeValue();
} }
else if(itmNode !=null && ("rate").equalsIgnoreCase(itmNode.getNodeName()))
{
rate = itmNode.getFirstChild().getNodeValue();
}
} }
System.out.println("itemParnt["+itemParnt+"]"); System.out.println("itemParnt["+itemParnt+"]");
...@@ -1150,7 +1154,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1150,7 +1154,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
//String dataStr = itemCode + "~" + quantity + "~" + ordDate; //String dataStr = itemCode + "~" + quantity + "~" + ordDate;
//String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo; //String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo;
String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount; String dataStr = itemCode + "~" + quantity + "~" + ordDate + "~" + tabNo +"~"+ discount +"~"+ rate;
System.out.println("Data String="+dataStr); System.out.println("Data String="+dataStr);
...@@ -1905,7 +1909,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1905,7 +1909,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<RECORDS>\r\n"); valueXmlString.append("<RECORDS>\r\n");
String qty ="0",discount = "0.0"; String qty ="0",discount = "0.0",rate = "0.0";
String itmCode = "";
int dimlistlen = dimensionList.size(); int dimlistlen = dimensionList.size();
int colorlen = colorList.size(); int colorlen = colorList.size();
int sizelen = sizeList.size(); int sizelen = sizeList.size();
...@@ -1936,6 +1941,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1936,6 +1941,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
//String qty ="0",discount = "0"; //String qty ="0",discount = "0";
qty ="0"; qty ="0";
discount = "0.0"; discount = "0.0";
rate = "0.0";
for (int x=1;x<paraDatas.length; x++) for (int x=1;x<paraDatas.length; x++)
{ {
String itmQty[] = paraDatas[x].split("::"); String itmQty[] = paraDatas[x].split("::");
...@@ -1944,6 +1950,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1944,6 +1950,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
qty = itmQty[1]; qty = itmQty[1];
discount = itmQty[2]; discount = itmQty[2];
rate = itmQty[3];
break; break;
} }
} }
...@@ -1951,20 +1958,26 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -1951,20 +1958,26 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
if(qty.equals("0")) if(qty.equals("0"))
{ {
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n"); //temStrBuffer.append("<![CDATA[").append(dataMap.get(key)).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount).append("]]>\r\n"); temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+rate).append("]]>\r\n");
} }
else else
{ {
//temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty).append("]]>\r\n"); //temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty).append("]]>\r\n");
temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount).append("]]>\r\n"); temStrBuffer.append("<![CDATA[").append(dataMap.get(key)+"~"+qty+"~"+discount+"~"+rate).append("]]>\r\n");
} }
//Changed by wasim //Changed by wasim
//key = key + ":"+ getItemRate(dataMap.get(key).toString(), otherDetails, conn); //key = key + ":"+ getItemRate(dataMap.get(key).toString(), otherDetails, conn);
String itmCode = dataMap.get(key).toString(); /*itmCode = dataMap.get(key).toString();
String rate = getItemRate(dataMap.get(key).toString(), otherDetails, conn); rate = getItemRate(dataMap.get(key).toString(), otherDetails, conn);
key = key + ":"+ rate; key = key + ":"+ rate;*/
itmCode = dataMap.get(key).toString();
if("0.0".equalsIgnoreCase(rate) || "0".equalsIgnoreCase(rate) || rate == null || rate == "" || rate.trim().length() == 0)
{
rate = getItemRate(itmCode, otherDetails, conn);
}
key = key + ":"+ rate;
String toolTipData = key + ":"+ "Item Code- "+itmCode+""+ String toolTipData = key + ":"+ "Item Code- "+itmCode+""+
"&#010;Color- "+colorList.get(j)+ "&#010;Color- "+colorList.get(j)+
"&#010;Dimension- "+dimensionList.get(i)+ "&#010;Dimension- "+dimensionList.get(i)+
...@@ -2144,13 +2157,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2144,13 +2157,14 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
try try
{ {
System.out.println("Inside getSorderDetails-->ItemParent["+itemParent+"] DetailString["+aString+"] DOMId["+domID+"]"); System.out.println("Inside getSorderDetails-->ItemParent["+itemParent+"] DetailString["+aString+"] DOMId["+domID+"]");
String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = ""; String itemCode = "",quantity = "",ordDate = "",tabNo = "",discount = "",itemRate = "";
String[] arr = aString.split("~"); String[] arr = aString.split("~");
itemCode = arr[0]; itemCode = arr[0];
quantity = arr[1]; quantity = arr[1];
ordDate = arr[2]; ordDate = arr[2];
tabNo = arr[3]; tabNo = arr[3];
discount = arr[4]; discount = arr[4];
itemRate = arr[5];
valueXmlString.append("<Detail3 domID='"+domID+"' selected = 'Y'>\r\n"); valueXmlString.append("<Detail3 domID='"+domID+"' selected = 'Y'>\r\n");
...@@ -2281,43 +2295,66 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2281,43 +2295,66 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<dsp_date><![CDATA[").append(ordDate).append("]]></dsp_date>\r\n"); valueXmlString.append("<dsp_date><![CDATA[").append(ordDate).append("]]></dsp_date>\r\n");
valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n"); valueXmlString.append("<quantity><![CDATA[").append(quantity).append("]]></quantity>\r\n");
if(saleOrder.length() > 0)
if(itemRate != null && itemRate.trim().length() > 0)
{ {
sql = "SELECT RATE FROM SORDDET WHERE ITEM_CODE = ? AND SALE_ORDER = ? "; try
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; lcStdrate = Double.parseDouble(itemRate);
} }
if( pstmt != null ) catch(Exception e)
{ {
pstmt.close();pstmt = null; System.out.println("Rate exception in Detail3 Sorder Details");
lcStdrate = 0;
} }
} }
else
{ System.out.println("Item Rate="+lcStdrate);
lsPriceList = checkNullAndTrim(distCommon.getDisparams("999999", "STD_SO_PL", conn)); int cntRate = 0;
if (lsPriceList.length() > 0)
if(lcStdrate <= 0)
{
if(saleOrder.length() > 0)
{ {
lcStdrate = distCommon.pickRate(lsPriceList, orderDate, itemCode,"","L", conn); 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");
cntRate++;
}
if( rs != null )
{
rs.close();rs = null;
}
if( pstmt != null )
{
pstmt.close();pstmt = null;
}
} }
else //else
if(cntRate == 0)
{ {
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 );
}
if( priceListClg.length() > 0 )
{
rateClg = distCommon.pickRate( priceListClg, orderDate, itemCode, "", "L", conn );
}
System.out.println("Rate Clg="+rateClg); System.out.println("Rate Clg="+rateClg);
if ( rateClg == 0 ) if ( rateClg == 0 )
{ {
...@@ -2613,7 +2650,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2613,7 +2650,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
{ {
String itemQtyStr = hm.get(itemParent); String itemQtyStr = hm.get(itemParent);
//hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "~"); //hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount +"~"); //hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount +"~");
hm.put(itemParent, itemQtyStr + itemCode + "::" + quantity + "::" + discount + "::" + 0 +"~");
} }
else else
{ {
...@@ -2621,8 +2659,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca ...@@ -2621,8 +2659,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String itemParentMain = itemParentValue[0]; String itemParentMain = itemParentValue[0];
String itemParentTabNum = itemParentValue[1];*/ String itemParentTabNum = itemParentValue[1];*/
//hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "~")); //hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "~"));
hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount +"~")); //hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount +"~"));
//hm.put(itemParent, (itemParentMain + "****" + itemCode + "~" + dlvDate + "****" +itemCode + "::" + quantity + "****" + itemParentTabNum + "~")); hm.put(itemParent, (itemParent + "****" + itemCode + "~" + dspDateStr + "****" +itemCode + "::" + quantity + "::" + discount + "::" + 0 + "~"));
} }
itemParent = ""; itemParent = "";
itemCode = ""; itemCode = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment