pick_issue_det make same tran id

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

webitm-wms/ibase/webitm/ejb/wms/MultiplePtcnWizConf.java

@@ -965,18 +965,48 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		PreparedStatement pstmt = null; //currDate
 		java.sql.Timestamp currDate = null;
 		String sql = "",keyString = "",keyCol = "",tranSer = "",xmlValues = "",siteCode = "",tranId = "",
-				currDateStr = "",cartonNo = "",packCode ="",locCodeTo = "";
-		int count = 0,rowIns = 0 ;
+				currDateStr = "",cartonNo = "",packCode ="",locCodeTo = "",pickOrder = "";
+		int count = 0,rowIns = 0,maxLine = 0 ;
 		try
 		{
 			if(issueDataMap != null && issueDataMap.size() > 0)
 			{				
+				sql = "SELECT COUNT(*),MAX(LINE_NO) FROM PICK_ISS_DET WHERE PICK_ORDER = ?";
+				pstmt = conn.prepareStatement(sql);
+				pstmt.setString( 1, pickOrder );
+				rs = pstmt.executeQuery();
+				if (rs.next())
+				{
+					count = rs.getInt(1);
+					maxLine = rs.getInt(2);					
+				}
+				rs.close();rs = null;
+				pstmt.close();pstmt = null;
+				System.out.println("count :"+count);
+				System.out.println("maxLine :"+maxLine);
+				
+				
 				siteCode = checkNull(issueDataMap.get("site_code"));
 				SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
 
 				currDate = new java.sql.Timestamp(System.currentTimeMillis());
 				currDateStr = sdfAppl.format(currDate);
+				
+				if(count == 0)
+				{
 					sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setString( 1, "w_active_pick" );
+					rs = pstmt.executeQuery();
+					if (rs.next())
+					{
+						keyString = rs.getString("KEY_STRING");
+						keyCol = rs.getString("TRAN_ID_COL");
+						tranSer = rs.getString("REF_SER");
+					}
+					rs.close();rs = null;
+					pstmt.close();pstmt = null;
+					
 					//System.out.println("selSql :"+selSql);
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString( 1, "w_active_pick" );
@@ -1029,12 +1059,16 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					System.out.println("rowIns------>>["+rowIns+"]");
 					if(rowIns > 0)
 					{						
-					count++;
 						System.out.println("row insert in PICK_ISS_HDR table.................");
 					}			
 					pstmt.close();
 					pstmt =null;
-
+				}
+				else
+				{
+					System.out.println("Existing pick order found...................");
+					tranId = getColumnDescr(conn, "tran_id", "PICK_ISS_DET", "PICK_ORDER", pickOrder);
+				}
 			
 				System.out.println("@@tranId@@ ---->>["+tranId+"]");
 
@@ -1078,7 +1112,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				pstmt.setDouble(6, Double.parseDouble(checkNull(issueDataMap.get("quantity"))));
 				pstmt.setString(7, locCodeTo);
 				pstmt.setString(8, tranId);
-				pstmt.setString(9, checkNull(issueDataMap.get("line_no")));
+				pstmt.setInt(9, ++maxLine);
 				pstmt.setString(10, siteCode);
 				pstmt.setString(11, checkNull(issueDataMap.get("no_art")));			
 				pstmt.setString(12, issueDataMap.get("line_no__ord"));
@@ -1090,12 +1124,8 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				System.out.println("rowIns------>>["+rowIns+"]");
 				if(rowIns > 0)
 				{					
-					count++;
 					System.out.println("row insert in PICK_ISS_DET table.................");
-				}
-				if(count == 2 )
-				{
-					return "Success";
+					return "success";
 				}				
 			}