Migration Of Consumption Issue Confirm and Accounting effects for taxes not...

Migration Of Consumption Issue Confirm and Accounting effects for taxes not taking place on confirmation of consumption Issue.

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

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

@@ -296,7 +296,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 								errString = itmDBAccessEJB.getErrorString("", "GPNOERR", "", "", conn);
 								return errString;
 							} else {
-								gpDate = getCurrtDate();
+								gpDate = new java.sql.Timestamp(System.currentTimeMillis());
 								sql = "update consume_iss set gp_no = ?, gp_date = ? where cons_issue = ? ";
 								pstmt = conn.prepareStatement(sql);
 								pstmt.setString(1, gpno);
@@ -326,7 +326,6 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 						System.out.println("@@@@@@@@@@@118:::::::::::confirm record successfully........");
 						errString = itmDBAccessEJB.getErrorString("","CONFSUCC","");
 						
-						
 					}
 
 				}
@@ -424,6 +423,11 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 				if (rs1.next()) {
 					keyFld = rs1.getString("cons_issue");
 				}
+				else
+				{
+					errString = itmDBAccessEJB.getErrorString("","VTLCKERR","","",conn);
+					return errString;
+				}
 				rs1.close();
 				rs1 = null;
 				pstmt1.close();
@@ -435,7 +439,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 			pstmt = null;
 
 			sql = "select cons_issue,  issue_date,  dept_code,   item_ser,site_code__req,available_yn,"
-					+ "curr_code,tran_type from consume_iss where cons_issue= ? and ( tran_type     = 'I' )";
+					+ "curr_code,tran_type from consume_iss where cons_issue= ? ";
 
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, consIssue);
@@ -464,7 +468,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 			consIssHdrMap.put("tran_type", mtranType);
 			consIssHdrMap.put("available_yn", avail);
 
-			consIssHdrList.add(consIssHdrMap);
+	
 
 			sql = " select cons_issue,line_no,cons_order,line_no__ord,item_code,quantity,unit,rate,"
 					+ "acct_code,cctr_code,loc_code,lot_no,lot_sl,quantity__std,unit__std,"
@@ -473,7 +477,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1, consIssue);
 			rs = pstmt.executeQuery();
-			if (rs.next()) {
+			while (rs.next()) {
 				detconsIssue = rs.getString("cons_issue");
 				lineNo = rs.getString("line_no");
 				consOrder = rs.getString("cons_order");
@@ -494,12 +498,6 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 				cctrCodeInv = rs.getString("cctr_code__inv");
 				noArt = rs.getInt("no_art");
 				
-			}
-			rs.close();
-			rs = null;
-			pstmt.close();
-			pstmt = null;
-
 				consIssDetMap = new HashMap();
 				consIssDetMap.put("cons_issue", detconsIssue);
 				consIssDetMap.put("line_no", lineNo);
@@ -523,7 +521,15 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 
 				consIssDetList.add(consIssDetMap);
 
-			errString = gbfPostConsIss(consIssHdrList, consIssDetList, tranSer, xtraParams, conn);
+			}
+			rs.close();
+			rs = null;
+			pstmt.close();
+			pstmt = null;
+
+			
+
+			errString = gbfPostConsIss(consIssHdrMap, consIssDetList, tranSer, xtraParams, conn);
 			if (errString != null && errString.trim().length() > 0) {
 				return errString;
 			}
@@ -556,7 +562,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 
 	}
 
-	private String gbfPostConsIss(ArrayList consIssHdrList, ArrayList consIssDetList, String tranSer, String xtraParams,
+	private String gbfPostConsIss(HashMap consIssHdrMap, ArrayList consIssDetList, String tranSer, String xtraParams,
 			Connection conn) throws RemoteException, ITMException {
 		String consIss = "", tranType = "",tranTypeStk="", unit = "", acctCodeOrd = "", cctrCodeOrd = "", locCode = "", lotNo = "",locCodeIss="",
 				temp = "", ret = "", invlink = "", invStat = "", sundryType = "",qOrderType="";
@@ -590,7 +596,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 		StockUpdate	stkUpd ;
 		InvHoldGen invHoldGen = new InvHoldGen();
 
-		HashMap consIssHdrMap = null, consIssDetMap = null, updConsiss = null,lstrQOrd = null,stkUpdMap= null;
+		HashMap  consIssDetMap = null, updConsiss = null,lstrQOrd = null,stkUpdMap= null;
 		HashMap  stockQtyMap = new HashMap();
 		ArrayList<HashMap<String, String>> stockList = new ArrayList<HashMap<String, String>>();
 		boolean rateChanged = false;
@@ -601,11 +607,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 			/*
 			 * temp="confirmed object"; sql ="select :ls_temp into :ls_temp from dual";
 			 */
-
-			for (int ctr = 0; ctr < consIssHdrList.size(); ctr++) {
-				consIssHdrMap = new HashMap();
-				consIssHdrMap = (HashMap) consIssHdrList.get(ctr);
-
+				//header Data
 				hdrconsIssue = (String) consIssHdrMap.get("cons_issue");
 				issueDate = (Timestamp)consIssHdrMap.get("issue_date");
 				sundryCode = (String) consIssHdrMap.get("dept_code");
@@ -615,7 +617,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 				tranType = (String) consIssHdrMap.get("tran_type");
 				avail=(String) consIssHdrMap.get("available_yn");
 				/* taxAmt =Double.parseDouble(detListMap.get("tax_amt").toString()); */
-			}
+			
 
 			for (int ctr = 0; ctr < consIssDetList.size(); ctr++) {
 				consIssDetMap = new HashMap();
@@ -642,7 +644,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 				cctrCodeInv = (String) consIssDetMap.get("cctr_code__inv");
 				noArt = Integer.parseInt(consIssDetMap.get("no_art").toString());
 				
-			}
+				
 				
 				// pb Code is not migrated
 				/*
@@ -1399,6 +1401,7 @@ public class ConsumeIssueConf extends ActionHandlerEJB implements ConsumeIssueCo
 					}
 				}
 				
+			}
 
 		} // try