desp id set in dom

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

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

@@ -452,7 +452,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					else if(childNodeName.equalsIgnoreCase("quantity")) 
 					{	
 						System.out.println("-------------wfvalData..quantity.............");
-						String lotNo="",locCodeL="";
+						String lotNo="",locCodeL="",despId="";
 						double sdetQty=0,despatchQty=0,actQty=0;
 						HashMap<String,String>invHoldMap=new HashMap<String,String>();
 						sorderNo = checkNull(genericUtility.getColumnValue("sale_order_no", dom1));
@@ -463,10 +463,12 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						itemCode = checkNull(genericUtility.getColumnValue("item_code", dom2,"3"));
 						locCodeL = checkNull(genericUtility.getColumnValue("loc_code", dom2,"3"));
 						lotNo = checkNull(genericUtility.getColumnValue("lot_no", dom2,"3"));						
+						despId = checkNull(genericUtility.getColumnValue("desp_id", dom2,"3"));
 						
 						avalyn=getColumnDescr(conn, "available_yn", "sorder", "sale_order", sorderNo);
 						avalyn=avalyn==null ? "N" : avalyn.trim();
                         System.out.println("sorderNo--->>["+sorderNo+"]");
+                        System.out.println("DespId--->>["+despId+"]");
                         System.out.println("lotSl--->>["+lotSl+"]");
                         System.out.println("siteCode--->>["+siteCode+"]");
                         System.out.println("locCodeL--->>["+locCodeL+"]");
@@ -517,8 +519,11 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						rs = null;
 						System.out.println("despatchQty--->>["+despatchQty+"]");//280
 						
+						if(despId.length() > 0){
+							totquantity = despatchQty;
+						}else{
 							totquantity = despatchQty + quantity;//0+20=20
-						
+						}
 						
 						sql = "select sum(quantity) from sorddet where sale_order = ? and item_code = ?";
 						pstmt=conn.prepareStatement(sql);
@@ -536,6 +541,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						
 						actQty=getQtyFromSordItem(sorderNo, conn);
 						System.out.println("actQty--->["+actQty+"]");//280
+						System.out.println("totquantity--->>["+totquantity+"]");
+						System.out.println("sdetQty--->>["+sdetQty+"]");
 						if(totquantity > sdetQty)
 						{
 							errCode = "VTDPCCSQ";
@@ -676,7 +683,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 		
 		//Dadaso
 		String sql="",currencyCode="",exchRate1="",currCodeFrt="",currCodeIns="",currCodedlv="",stanCode="",custCode="",custCodeDlv="",siteCodeDesc="";
-		String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",stanCodeInit="",status="",statusRemarks="",
+		String stanCodeDlv="",dlvCity="",dlvPin="",countCodeDlv="",stanCodeInit="",status="",statusRemarks="",despIdNew="",
 				custCodeBil="",dlvAdd1="",dlvAdd2="",dlvAdd3="",despId="",remarksDes="",noArtDes="",sorderNo="",
 				siteCodeShip="",availableYn="",addUser="",chgUserL="",chgTermL="",lotslL="",lotStatus="HOLD";
 		ArrayList<String> addUsersList=new ArrayList<String>();
@@ -983,10 +990,57 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				pstmt.close();
 				pstmt = null;
 				}
+				if(addUsersList.contains(chgUser))
+				{
+					for(int i = 0;i < addUsersList.size(); i++)
+					{
+						
+						addUser = addUsersList.get(i);
+						System.out.println("addUser>>>>>"+addUser);
+						
+						if(chgUser.equalsIgnoreCase(addUser))
+						{
+							sql = "select desp_id from despatch where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and sord_no = ? and add_user = ?";
+							pstmt1=conn.prepareStatement(sql);
+							pstmt1.setString(1,sorderNo);
+							pstmt1.setString(2,addUser);
+							rs1 = pstmt1.executeQuery();
+							if(rs1.next())
+							{
+								despIdNew = rs1.getString(1) == null ? "":rs1.getString(1);
+							}
+							pstmt1.close();
+							rs1.close();
+							pstmt1 = null;
+							rs1 = null;
+						}
+					}					
+					
+				}
+				else
+				{					
+					sql = "select desp_id from despatch where CASE WHEN confirmed IS NULL THEN 'N' ELSE CONFIRMED  END = 'N' and sord_no = ?";
+					pstmt1=conn.prepareStatement(sql);
+					pstmt1.setString(1,sorderNo);
+					rs1 = pstmt1.executeQuery();
+					if(rs1.next())
+					{
+						despIdNew = rs1.getString(1) == null ? "":rs1.getString(1);
+					}
+					pstmt1.close();
+					rs1.close();
+					pstmt1 = null;
+					rs1 = null;						
+				}
+
+				
+				System.out.println("tranid FROM QUERY----->["+despIdNew+"]");
+				
+				
 				
 				if(currentColumn.trim().equalsIgnoreCase("itm_default"))
 				{
-					System.out.println("Form 3 itm_default called.................");
+					System.out.println("Form 3 itm_default called234.................");
 					sql="select despatchdet.desp_id,despatchdet.line_no,despatchdet.sord_no,despatchdet.line_no__sord,"
 							+ "despatchdet.exp_lev,despatchdet.item_code__ord,despatchdet.item_code,despatchdet.lot_no, "   
 				         +"despatchdet.lot_sl,despatchdet.quantity__ord,despatchdet.quantity,item.descr, "
@@ -1042,7 +1096,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					
 					valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
 					valueXmlString.append("<sord_no><![CDATA["+ checkNull(rs.getString("sord_no")) +"]]></sord_no>");
-					valueXmlString.append("<line_no><![CDATA["+ checkNull(rs.getString("line_no")) +"]]></line_no>");					
+					valueXmlString.append("<line_no><![CDATA["+ rs.getInt("line_no") +"]]></line_no>");					
 					valueXmlString.append("<line_no__sord><![CDATA["+ checkNull(rs.getString("line_no__sord")) +"]]></line_no__sord>");					
 					valueXmlString.append("<lot_no><![CDATA["+ checkNull(rs.getString("lot_no")) +"]]></lot_no>");					
 					valueXmlString.append("<lot_sl><![CDATA["+ checkNull(rs.getString("lot_sl")) +"]]></lot_sl>");					
@@ -1178,7 +1232,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					rs = pstmt.executeQuery();
 				   if( rs.next() )
 				   {
-					   lnNoSord = rs.getString("line_no");	
+					   lnNoSord = checkNull(rs.getString("line_no"));	
 						itemCode = rs.getString("item_code") == null ? " " : rs.getString("item_code");
 						itemCodeOrd = rs.getString("item_code__ord") == null ? " " : rs.getString("item_code__ord");
 						quantity = rs.getString("quantity") == null ? "0" : rs.getString("quantity")  ;
@@ -1208,12 +1262,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 				   
 					
 				   System.out.println("lnNoSord-------->>["+lnNoSord+"]");
+				   System.out.println("lineNo1-------->>["+lineNo1+"]");
+				   System.out.println("despIdNew-------->>["+despIdNew+"]");
 				  
 				   valueXmlString.append("<Detail3 domID='" +lineNo1+ "'  objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
 					valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
 					
 					
-					valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
+					//valueXmlString.append("<desp_id><![CDATA["+ despIdNew +"]]></desp_id>");
 					valueXmlString.append("<sord_no><![CDATA["+ sorderNo +"]]></sord_no>");
 					valueXmlString.append("<line_no><![CDATA["+ lineNo1 +"]]></line_no>");					
 					valueXmlString.append("<line_no__sord><![CDATA["+ lnNoSord +"]]></line_no__sord>");					
@@ -1310,6 +1366,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 					avalyn=avalyn==null ? "N" : avalyn.trim();
 					//ADDED nEW
 					
+					String currDomStr = genericUtility.serializeDom(dom);
+					System.out.println("currDomStr--------->>["+currDomStr+"]");
 					sql = "select line_no,item_code,item_code__ord,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom," +
 							"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom from sorddet where sale_order = ? order by line_no";
 					pstmt = conn.prepareStatement(sql);
@@ -1357,7 +1415,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
 						 valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"N\" pkNames=\"\"/>\r\n");
 				  }
 					
-					valueXmlString.append("<desp_id><![CDATA["+ despId +"]]></desp_id>");
+					valueXmlString.append("<desp_id><![CDATA["+ despIdNew +"]]></desp_id>");
 								
 					
 					valueXmlString.append("<lot_no><![CDATA[]]></lot_no>");