SET STATUS ON DIST. ORDER

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

webitm-dis/ibase/webitm/ejb/dis/DistOrderAmdIC.java

@@ -239,7 +239,8 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 									
 								if(	lineNoOrder != null && lineNoOrder.trim().length() > 0 )
 								{
-									sql = " SELECT COUNT(*) FROM distorder_det WHERE dist_order = ? and line_no = ? ";
+									//	SQL CHANGE BY RITESH FOR DI3HSUP004
+									sql = " SELECT COUNT(*) FROM distorder_det WHERE dist_order = ? and line_no = ? and status = 'O' ";
 									pstmt = conn.prepareStatement( sql );
 									pstmt.setString(1,distOrder.trim());
 									pstmt.setInt(2,Integer.parseInt(lineNoOrder.trim()));
@@ -868,6 +869,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 						Timestamp dueDateTime = null;
 						Timestamp shipDateTime = null;
 						Timestamp allocDateTime = null;
+						String status = "";
 						
 						lineNoOrder = genericUtility.getColumnValue( "line_no_distord", dom );
 						distOrder = genericUtility.getColumnValue( "dist_order", dom1 );
@@ -880,6 +882,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 								 +"	 DET.OVER_SHIP_PERC, DET.RATE__CLG, DET.QTY_ALLOC, DET.DATE_ALLOC, DET.UNIT__ALT, DET.CONV__QTY__ALT, "         
 								 +"	 DET.QTY_ORDER__ALT, DET.SHIP_DATE, DET.PACK_INSTR, DET.CUST_ITEM__REF, DET.CUSTOM_DESCR, "
 								 +"	 DET.REAS_CODE, DET.WORK_ORDER "
+								 +"  ,DET.STATUS "                       // ADDED BY RITESH FOR DI3HSUP004
 								 +"	 FROM DISTORDER_DET DET, ITEM I "
 								 +"  WHERE DIST_ORDER  = ? "
 								 +"	 and line_no  = ? " 
@@ -917,6 +920,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 								itemDescr = vRs.getString( "DESCR" );
 								
 								dueDate = vRs.getString( "DUE_DATE" );
+
 								if( dueDate != null )
 								{
 									dueDateTime = Timestamp.valueOf(dueDate);
@@ -945,7 +949,7 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 								packInstr = vRs.getString( "PACK_INSTR" );
 								saleOrder = vRs.getString( "SALE_ORDER" );
 								custSpecNo = vRs.getString( "CUST_SPEC__NO" );
-
+								status = vRs.getString( "STATUS" );     // ADDED BY RITESH FOR DI3HSUP004
 																
 							}
 							vRs.close();
@@ -1012,6 +1016,10 @@ public class DistOrderAmdIC extends ValidatorEJB implements DistOrderAmdICLocal
 							valueXmlString.append("<qty_order>").append("<![CDATA[" + ( qtyOrder != null ? qtyOrder.trim() : ""  )+ "]]>").append("</qty_order>");
 							valueXmlString.append("<qty_received_o>").append("<![CDATA[" + ( qtyReceived != null ? qtyReceived.trim() : ""  )+ "]]>").append("</qty_received_o>");
 							valueXmlString.append("<qty_confirm_o>").append("<![CDATA[" + ( qtyConfirm != null ? qtyConfirm.trim() : ""  )+ "]]>").append("</qty_confirm_o>");
+						
+							valueXmlString.append("<status>").append("<![CDATA[" + ( status != null ? status.trim() : ""  )+ "]]>").append("</status>"); // ADDED BY RITESH FOR DI3HSUP004
+
+
 						}
 					}
 					if (currentColumn.trim().equals( "qty_order" ))