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,77 +965,111 @@ 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)
-			{
-				siteCode = checkNull(issueDataMap.get("site_code"));
-				SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
-
-				currDate = new java.sql.Timestamp(System.currentTimeMillis());
-				currDateStr = sdfAppl.format(currDate);
-				sql = "SELECT KEY_STRING, TRAN_ID_COL, REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ? ";
-				//System.out.println("selSql :"+selSql);
+			{				
+				sql = "SELECT COUNT(*),MAX(LINE_NO) FROM PICK_ISS_DET WHERE PICK_ORDER = ?";
 				pstmt = conn.prepareStatement(sql);
-				pstmt.setString( 1, "w_active_pick" );
+				pstmt.setString( 1, pickOrder );
 				rs = pstmt.executeQuery();
 				if (rs.next())
 				{
-					keyString = rs.getString("KEY_STRING");
-					keyCol = rs.getString("TRAN_ID_COL");
-					tranSer = rs.getString("REF_SER");
+					count = rs.getInt(1);
+					maxLine = rs.getInt(2);					
 				}
 				rs.close();rs = null;
 				pstmt.close();pstmt = null;
-				System.out.println("keyString :"+keyString);
-				System.out.println("keyCol :"+keyCol);
-				System.out.println("tranSer :"+tranSer);
-
-				xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
-				xmlValues = xmlValues + "<Header></Header>";
-				xmlValues = xmlValues + "<Detail1>";
-				xmlValues = xmlValues +        "<tran_id></tran_id>";
-				xmlValues = xmlValues +        "<site_code>" + siteCode + "</site_code>";
-				xmlValues = xmlValues +        "<tran_date>" + currDateStr + "</tran_date>";
-				xmlValues = xmlValues + "</Detail1></Root>";
-				System.out.println("xmlValues  :["+xmlValues+"]");				
-
-				TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
-				tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);					
-
-				sql = "INSERT INTO PICK_ISS_HDR (TRAN_DATE,EMP_CODE__APRV,CHG_DATE,CONFIRMED,PICK_ORDER,CHG_TERM,"
-						+ "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,CONF_DATE,PALLET_NO ) "
-						+ "values (?,?,?,?,?,?,?,?,?,?,?,?)";
-
-				pstmt = conn.prepareStatement(sql);
-				pstmt.setTimestamp(1, currDate);
-				pstmt.setString(2, empCode);
-				pstmt.setTimestamp(3, currDate);
-				pstmt.setString(4, "Y");
-				pstmt.setString(5, checkNull(issueDataMap.get("pick_order")));			
-				pstmt.setString(6, chgTerm);
-				pstmt.setString(7, chgUser);
-				pstmt.setString(8, tranId);
-				pstmt.setString(9, checkNull(issueDataMap.get("pick_type")));
-				pstmt.setString(10, siteCode);
-				//pstmt.setString(11, checkNull(issueDataMap.get("ptcn")));
-				pstmt.setTimestamp(11, currDate);
-				pstmt.setString(12, checkNull(issueDataMap.get("ptcn")));
-				//pstmt.setString(13, checkNull(issueDataMap.get("ptcn")));
+				System.out.println("count :"+count);
+				System.out.println("maxLine :"+maxLine);
+				
+				
+				siteCode = checkNull(issueDataMap.get("site_code"));
+				SimpleDateFormat sdfAppl = new SimpleDateFormat(genericUtility.getApplDateFormat());
 
-				rowIns = pstmt.executeUpdate();
-				System.out.println("rowIns------>>["+rowIns+"]");
-				if(rowIns > 0)
+				currDate = new java.sql.Timestamp(System.currentTimeMillis());
+				currDateStr = sdfAppl.format(currDate);
+				
+				if(count == 0)
 				{
-					count++;
-					System.out.println("row insert in PICK_ISS_HDR table.................");
-				}			
-				pstmt.close();
-				pstmt =null;
-
-
+					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" );
+					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("keyString :"+keyString);
+					System.out.println("keyCol :"+keyCol);
+					System.out.println("tranSer :"+tranSer);
+
+					xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
+					xmlValues = xmlValues + "<Header></Header>";
+					xmlValues = xmlValues + "<Detail1>";
+					xmlValues = xmlValues +        "<tran_id></tran_id>";
+					xmlValues = xmlValues +        "<site_code>" + siteCode + "</site_code>";
+					xmlValues = xmlValues +        "<tran_date>" + currDateStr + "</tran_date>";
+					xmlValues = xmlValues + "</Detail1></Root>";
+					System.out.println("xmlValues  :["+xmlValues+"]");				
+
+					TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
+					tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
+					
+					sql = "INSERT INTO PICK_ISS_HDR (TRAN_DATE,EMP_CODE__APRV,CHG_DATE,CONFIRMED,PICK_ORDER,CHG_TERM,"
+							+ "CHG_USER,TRAN_ID,PICK_TYPE,SITE_CODE,CONF_DATE,PALLET_NO ) "
+							+ "values (?,?,?,?,?,?,?,?,?,?,?,?)";
+
+					pstmt = conn.prepareStatement(sql);
+					pstmt.setTimestamp(1, currDate);
+					pstmt.setString(2, empCode);
+					pstmt.setTimestamp(3, currDate);
+					pstmt.setString(4, "Y");
+					pstmt.setString(5, checkNull(issueDataMap.get("pick_order")));			
+					pstmt.setString(6, chgTerm);
+					pstmt.setString(7, chgUser);
+					pstmt.setString(8, tranId);
+					pstmt.setString(9, checkNull(issueDataMap.get("pick_type")));
+					pstmt.setString(10, siteCode);
+					//pstmt.setString(11, checkNull(issueDataMap.get("ptcn")));
+					pstmt.setTimestamp(11, currDate);
+					pstmt.setString(12, checkNull(issueDataMap.get("ptcn")));
+					//pstmt.setString(13, checkNull(issueDataMap.get("ptcn")));
+
+					rowIns = pstmt.executeUpdate();
+					System.out.println("rowIns------>>["+rowIns+"]");
+					if(rowIns > 0)
+					{						
+						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"));
@@ -1089,14 +1123,10 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				rowIns = pstmt.executeUpdate();
 				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";
+				}				
 			}
 
 		}