Commit b72bbc7a authored by kdabholkar's avatar kdabholkar

Commited new Changes of Sales Order Wizard

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@174853 ce508802-f39f-4f6c-b175-0d175dae99d5
parent f17512d9
......@@ -2109,7 +2109,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");*/
//temStrBuffer.append("<td><![CDATA[").append(6).append("]]></td>\r\n");
......@@ -2143,11 +2143,6 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
}
}
//Changed by wasim
//key = key + ":"+ getItemRate(dataMap.get(key).toString(), otherDetails, conn);
/*itmCode = dataMap.get(key).toString();
......@@ -2159,6 +2154,46 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
itmCode = dataMap.get(key).toString();
System.out.println("itmCode::1"+itmCode);
//changes by kaustubh on 27 nov 2017 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= ? and i.product_code= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itmCode);
pstmt.setString(2, 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_ItemCodeWise:"+totalQty);
//changes by kaustubh on 27 nov 2017 End
if(orderDate !=null && orderDate.length()>0)
{
orderDateString = Timestamp.valueOf(genericUtility.getValidDateString(orderDate,
......@@ -2249,12 +2284,12 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
"&#010;Dimension- "+dimensionList.get(i)+
"&#010;Size- "+sizeList.get(k)+""+
"&#010;Rate- "+rate+"";*/
String toolTipData = key + ":"+ "Item Code - "+itmCode+""+
"&#010;"+colName1+" - "+colorList.get(j)+
"&#010;"+colName2+" - "+dimensionList.get(i)+
"&#010;Size - "+sizeList.get(k)+""+
"&#010;Rate - "+newRate+"";
String toolTipData = key + ":"+ "Item Code = "+itmCode+""+
"&#010;"+colName1+" = "+colorList.get(j)+
"&#010;"+colName2+" = "+dimensionList.get(i)+
"&#010;Size = "+sizeList.get(k)+""+
"&#010;Rate = "+newRate+""+
"&#010;In Stock = "+totalQty+"";
//Commented and Changed by Santosh on 04-11-2017 to get physical attributes values from item_type [End]
System.out.println("Your Key is="+key);
System.out.println("itmCode"+itmCode);
......@@ -3300,6 +3335,8 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
String empCode = detail[1];
String siteCode = detail[2];
System.out.println("status::"+status+"empCode::"+empCode+"siteCode::"+siteCode);
sql = "UPDATE SORDER_TEMP SET STATUS = ? WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "C");
......
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