packlist button in case of parent sales order only order_type I only...

packlist button in case of parent sales order only order_type I only considered, stock button std rate also set


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

webitm-dis/ibase/webitm/ejb/dis/adv/DespatchAct.java

@@ -1289,6 +1289,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 					//lineNoSord = getChangeSord(dom,  dom1, "line_no__sord", xtraParams ,conn);
 					//valueXmlString.append(lineNoSord);  /// 16-08
 					tempStr = getChangeSord(dom,  dom1, "lot_no", xtraParams ,conn);
+					
 					valueXmlString.append(tempStr);  ///// 16-08
 					// chandni shah  - 02/02/11
 					rateStdUomStr = genericUtility.getColumnValue("rate__stduom", dom);
@@ -1834,8 +1835,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				//			  +"SALE_ORDER ='"+saleOrder+"'"+") AND ORDER_TYPE = 'P' AND CONFIRMED = 'Y'";
 				sqlOrderNoPo = "select order_no from inv_pack "
 					+ " where order_no 	in ( select purc_order from porder where sale_order = '" + saleOrder + "') "
-					+ " and order_type	in	('P','I') "
+					+ " and order_type	= 'I'  "
 					+ " and confirmed 	= 'Y' ";
+					//+ " and order_type	in	('P','I') "
 				// end 27/02/10 manoharan changed as per PB code
 				System.out.println("sqlOrderNoPo :"+sqlOrderNoPo);
 				stmt = conn.createStatement();
@@ -1878,8 +1880,9 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 				//			  +"WHERE SALE_ORDER ='"+saleOrder+"' ) AND ORDER_TYPE ='D' AND CONFIRMED = 'Y'";	
 				sqlOrderNoDo = "select order_no from inv_pack  "
 					+ " where order_no 	in ( select dist_order from distorder where sale_order = '" + saleOrder + "') "
-					+ " and order_type	in	('D','I')  "
+					+ " and order_type	= 'I'  "
 					+ " and confirmed 	= 'Y' ";
+					//+ " and order_type	in	('D','I')  "
 				// end 27/02/10 manoharan
 				System.out.println("sqlOrderNoDo :"+sqlOrderNoDo);
 				stmt = conn.createStatement();
@@ -7490,6 +7493,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 										//pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"B",sordQuantity , conn); //miss23 function
 										pickRate = distCommon.pickRate(priceList,sDespDate,itemCode,lotNo,"B",sordQuantity, conn);
 										System.out.println("pickRate :"+pickRate);
+										valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(pickRate).append("]]>").append("</rate__stduom>\r\n");
+										setNodeValue( dom, "rate__stduom", pickRate );
 									}
 									else 
 									{
@@ -7502,6 +7507,8 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 									//pickRate = distCommon.pickRateGSM(priceList,sDespDate,itemCode,lotNo,"I",sordQuantity , conn); 
 									pickRate = distCommon.pickRate(priceList,sDespDate,itemCode,lotNo,"I",sordQuantity, conn);
 									System.out.println("count >0 pickRate :"+pickRate);
+									valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(pickRate).append("]]>").append("</rate__stduom>\r\n");
+									setNodeValue( dom, "rate__stduom", pickRate );
 								}
 								
 							}
@@ -7516,13 +7523,14 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 							if(sConv ==null || conv == 0)
 							{
 								conv = 1;
+							} // 13/04/12 manoharan
 								rateStduom1 = pickRate * conv;
 								//rateStduom1 = df.parse(df.format(rateStduom1)).doubleValue(); 
 								valueXmlString.append("<rate__stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(rateStduom1).append("]]>").append("</rate__stduom>\r\n");
 								setNodeValue( dom, "rate__stduom", rateStduom1 );
 								valueXmlString.append("<conv__rtuom_stduom isSrvCallOnChg='0'>").append("<![CDATA[").append(conv).append("]]>").append("</conv__rtuom_stduom>\r\n");///13-08
 								setNodeValue( dom, "conv__rtuom_stduom", (conv) );///13-08
-							}
+							//} // 13/04/12 manoharan
 							
 						}
 						
@@ -7605,7 +7613,7 @@ public class DespatchAct extends ActionHandlerEJB implements DespatchActLocal, D
 			}
 			catch (Exception e){}
 		}*/
-		System.out.println("valueXmlString return from getChangeSord [actionSord]] :"+valueXmlString.toString());
+		System.out.println("Return getChangeSord currentColumn[" + currentColumn + "] valueXmlString [" + valueXmlString.toString() + "]");
 		return valueXmlString.toString();
 	}