Sarita : Updated Component on 11 MARCH 2019

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

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

@@ -88,7 +88,7 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 		String errString = "";
 		PreparedStatement pstmt = null , pstmt1 = null , pstmt2 = null;
 		ResultSet rs = null , rs1 = null , rs2 = null;
-		String isConfirmed = "" , syncStatus = "" , distIssueTranId = "" , transactionMode = "", distIssueConfrmd ="" , locGroupFrom = "" , locGroupTo = "";
+		String isConfirmed = "" , syncStatus = "" , distIssueTranId = "" , transactionMode = "", distIssueConfrmd ="" , requesterLocation = "" , issueLocation = "";
 		String siteCodeIss = "" , siteCodeRcp = "";
 		String itemCodeIssue = "", lotNoIssue = "", lotSlIssue = "";
 		int cntIssData = 0 , cntSrlContentData = 0;
@@ -97,7 +97,7 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 		String srlContainerSrlNo = "" , srlContentsItemCode = "", srlContentsLotSl = "";
 		double srlContentsQty = 0.0;
 		StringBuffer finalString = new StringBuffer("<![CDATA[<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>");
-		String errMsg = "" , errorMsg = "", errorNo = "", transactionNo ="", shippedBy = "" ;
+		String errMsg = "" , errorMsg = "", errorNo = "", transactionNo ="", shippedBy = "" , requester = "" , requestTo = "" ;
 		String soapEndpointUrl = "" , soapAction = "" , sysDateStr = "";
 		ArrayList<String> itemGrpList = new ArrayList<String>();
 		HashMap<String,String> errorInformation = new HashMap<String,String>();
@@ -124,9 +124,9 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 			{
 				isConfirmed = checkNull(rs.getString("confirmed"));
 				syncStatus = checkNull(rs.getString("sync_status"));
-				locGroupFrom = checkNull(rs.getString("loc_group__from"));
-				locGroupTo = checkNull(rs.getString("loc_group__to"));
-				System.out.println("isConfirmed ["+isConfirmed+"]\t syncStatus ["+syncStatus+"] \t locGroupFrom ["+locGroupFrom+"] \t locGroupTo ["+locGroupTo+"]");
+				requesterLocation = checkNull(rs.getString("loc_group__from"));
+				issueLocation = checkNull(rs.getString("loc_group__to"));
+				System.out.println("isConfirmed ["+isConfirmed+"]\t syncStatus ["+syncStatus+"] \t locGroupFrom ["+requesterLocation+"] \t locGroupTo ["+issueLocation+"]");
 			}
 			if(rs != null)
 			{
@@ -138,7 +138,7 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 				pstmt.close(); 
 				pstmt = null;
 			}
-				if((locGroupFrom == null || locGroupFrom.trim().length() == 0) && (locGroupTo == null || locGroupTo.trim().length() == 0))
+				if((requesterLocation == null || requesterLocation.trim().length() == 0) && (issueLocation == null || issueLocation.trim().length() == 0))
 			{
 				errString = itmDBAccess.getErrorString( "", "VTINVCDLOC" , loginCode,"",conn);  
 				return errString;
@@ -167,6 +167,9 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 				itemGrpList.add(stringTokenizer.nextToken());
 			}System.out.println("Item Code in DISTISS_SYNC_LIST are " + itemGrpList);	
 			//Get Item Group Code from DISTISS_SYNC_LIST from disparm [END]
+			requester = getGencodesData("LOC_GROUP__FROM" ,requesterLocation, conn);
+			requestTo = getGencodesData("LOC_GROUP__TO" ,issueLocation, conn);
+			System.out.println("Unit[Requester] Code From ["+requester+"] \t Unit[RequestTo] Code To ["+requestTo+"]");
 			
 			finalString.append("<REQUESTINFO>\r\n");
 			finalString.append("<MATERIALREQUISITION>\r\n");
@@ -175,10 +178,10 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 			finalString.append("<ISSUENUMBER>").append("").append("</ISSUENUMBER>\r\n");
 			finalString.append("<MQNDATE>").append(sysDateStr).append("</MQNDATE>\r\n");
 			finalString.append("<MQNNUMBER>").append("").append("</MQNNUMBER>\r\n");
-			finalString.append("<REQUESTER>").append(locGroupFrom).append("</REQUESTER>\r\n");
-			finalString.append("<REQUESTERLOCATION>").append("").append("</REQUESTERLOCATION>\r\n");
-			finalString.append("<REQUESTTO>").append(locGroupTo).append("</REQUESTTO>\r\n");
-			finalString.append("<ISSUELOCATION>").append("").append("</ISSUELOCATION>\r\n");
+			finalString.append("<REQUESTER>").append(requester).append("</REQUESTER>\r\n");
+			finalString.append("<REQUESTERLOCATION>").append(requesterLocation).append("</REQUESTERLOCATION>\r\n");
+			finalString.append("<REQUESTTO>").append(requestTo).append("</REQUESTTO>\r\n");
+			finalString.append("<ISSUELOCATION>").append(issueLocation).append("</ISSUELOCATION>\r\n");
 			finalString.append("<ISSUESUBLOCATION>").append("").append("</ISSUESUBLOCATION>\r\n");
 			finalString.append("<ISSUINGENTITY>").append("").append("</ISSUINGENTITY>\r\n");
 			finalString.append("<SHIPPEDBY>").append(shippedBy).append("</SHIPPEDBY>\r\n");
@@ -189,16 +192,15 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 			errorInformation.put("ISSUENUMBER", "");
 			errorInformation.put("MQNDATE", sysDateStr);
 			errorInformation.put("MQNNUMBER", "");
-			errorInformation.put("REQUESTER", locGroupFrom);
-			errorInformation.put("REQUESTERLOCATION", "");
-			errorInformation.put("REQUESTTO", locGroupTo);
-			errorInformation.put("ISSUELOCATION", "");
+			errorInformation.put("REQUESTER", requester);
+			errorInformation.put("REQUESTERLOCATION", requesterLocation);
+			errorInformation.put("REQUESTTO", requestTo);
+			errorInformation.put("ISSUELOCATION", issueLocation);
 			errorInformation.put("ISSUESUBLOCATION", "");
 			errorInformation.put("ISSUINGENTITY", "");
 			errorInformation.put("SHIPMENTDATE", sysDateStr);
 
 			
-			
 			sql = "select issdet.item_code as item_code , "  
 				+ "issdet.lot_no as lot_no , " 
 				+ "issdet.lot_sl as lot_sl , "  
@@ -231,7 +233,8 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 				sql1 = "select serial_no from srl_container "
 					 + "where item_code = ? "
 					 + "AND lot_no = ? "
-					 + "AND lot_sl = ?";	
+					 + "AND lot_sl = ?"
+				     + "AND status = 'C'";
 				pstmt1 = conn.prepareStatement(sql1);
 				pstmt1.setString(1, itemCodeIssue);
 				pstmt1.setString(2, lotNoIssue);
@@ -396,14 +399,14 @@ public class DistIssueSync extends ActionHandlerEJB implements DistIssueSyncLoca
 		ResultSet rs = null;	
 		try
 		{
-			sql = "select udf_str1 from gencodes where fld_name = ? and mod_name = 'W_DIST_ORDER' and fld_value = ?";
+			sql = "select udf_str2 from gencodes where fld_name = ? and mod_name = 'W_DIST_ORDER' and fld_value = ?";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, fldName);
 			pstmt.setString(2, fldVal);
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
-				udfStr = checkNull(rs.getString("udf_str1"));
+				udfStr = checkNull(rs.getString("udf_str2"));
 				System.out.println("UDF String Against This Site is == ["+udfStr+"]");
 			}
 			if(rs != null)