Changes in pick_iss_hdr sql

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

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

@@ -24,16 +24,11 @@ import org.w3c.dom.*;
 @Stateless 
 public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtcnWizConfLocal, MultiplePtcnWizConfRemote
 {
-	boolean isError = false,isMultipleLines = false;
+	boolean isError = false;
 	
 	GenericUtility genericUtility = GenericUtility.getInstance();
-	String chgUser = "",chgTerm = "",empCode = "",pickIsseTranId = "";
-	public String getPickIsseTranId() {
-		return pickIsseTranId;
-	}
-	public void setPickIsseTranId(String pickIsseTranId) {
-		this.pickIsseTranId = pickIsseTranId;
-	}
+	String chgUser = "",chgTerm = "",empCode = "";
+	
 	public String confirm(String tranID,String xtraParams, String forcedFlag) throws RemoteException,ITMException
 	{
 
@@ -78,9 +73,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 		double quantity = 0,noArt =0,stkGrossRate = 0,convQtyStduom = 0,batchSize = 0,holdQuantity = 0,stkRate = 0;
 		double shipperSize = 0,	itemGrossWeight = 0, caseGrossWeight = 0, itemNetWeight = 0, caseNetWeight = 0,
 				qtyOrd = 0,sordAllocQty = 0;
-		isError = false;
-		isMultipleLines = false;
-		pickIsseTranId = "";
+		isError = false;		
 		boolean isUpdatehdr= false;
 		java.sql.Timestamp expDate = null,currDate = null, mfgDate = null,restestDate = null,dateAlloc = null;		
 
@@ -159,11 +152,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 						System.out.println("dataMap clear..............");
 						dataMap.clear();
 					}
-					System.out.println("WHILE CONDITION12.........."+(++rowsCount));
-					if(rowsCount > 1)
-					{
-						isMultipleLines = true;
-					}
+					System.out.println("WHILE CONDITION12.........."+(++rowsCount));					
 					lineNoOrd = rs.getInt( "LINE_NO__ORD" );
 					waveId = checkNull(rs.getString( "WAVE_ID" ));
 					ptcn = checkNull(rs.getString( "PTCN" ));
@@ -772,7 +761,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 						}							
 
 
-						sql = 	" SELECT * FROM PICK_ORD_HDR WHERE PICK_ORDER = ? AND PICK_TYPE = 'M' ";
+						/*sql = 	" SELECT * FROM PICK_ORD_HDR WHERE PICK_ORDER = ? AND PICK_TYPE = 'M' ";
 						pstmt1 = conn.prepareStatement(sql);
 						pstmt1.setString(1, replOrder);
 						rs1 = pstmt1.executeQuery();
@@ -791,7 +780,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 							pstmt2.close();pstmt2 = null;
 						}
 						rs1.close(); rs1 = null;
-						pstmt1.close(); pstmt1 = null;
+						pstmt1.close(); pstmt1 = null;*/
 
 						updCnt= 0;
 						// Checking whether all task are done for particular wave_id and sale order
@@ -839,9 +828,10 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 									
 
 					}
+					
 
 				} //end while
-				isMultipleLines = false;
+				
 				if(rs != null)
 				{
 					rs.close();
@@ -952,53 +942,44 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				xmlValues = xmlValues +        "<site_code>" + siteCode + "</site_code>";
 				xmlValues = xmlValues +        "<tran_date>" + currDateStr + "</tran_date>";
 				xmlValues = xmlValues + "</Detail1></Root>";
-				System.out.println("xmlValues  :["+xmlValues+"]");
-				System.out.println("isMultipleLines------>>["+isMultipleLines+"]TranId : ["+pickIsseTranId+"]");
-				if(isMultipleLines)
-				{
-					tranId = pickIsseTranId;
-					System.out.println("tranId pick Issue------>>["+tranId+"]");
-				}
-				else
+				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")));
+
+				rowIns = pstmt.executeUpdate();
+				System.out.println("rowIns------>>["+rowIns+"]");
+				if(rowIns > 0)
 				{
-					TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
-					tranId = tg.generateTranSeqID(tranSer, keyCol, keyString, conn);
-					pickIsseTranId = tranId;
-					System.out.println("TranId put in globle var@@@------->>"+pickIsseTranId);		
-					
-					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")));
-
-					rowIns = pstmt.executeUpdate();
-					System.out.println("rowIns------>>["+rowIns+"]");
-					if(rowIns > 0)
-					{
-						count++;
-						System.out.println("row insert in PICK_ISS_HDR table.................");
-					}			
-					pstmt.close();
-					pstmt =null;
-				}
-				
+					count++;
+					System.out.println("row insert in PICK_ISS_HDR table.................");
+				}			
+				pstmt.close();
+				pstmt =null;
+
+
 				System.out.println("@@tranId@@ ---->>["+tranId+"]");
-								
-				
+
+
 
 				sql = " SELECT CARTON_NO,PACK_CODE FROM CARTON_MASTER WHERE PICK_ORDER = ?"
 						+ " AND LINE_NO__PICK = ? ";
@@ -1024,9 +1005,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				{
 					locCodeTo = "";
 				}
-				
-				
-				
+
 				sql = "INSERT INTO PICK_ISS_DET(LOC_CODE__SYS,CARTON_NO,LOT_SL,PICK_ORDER,PACK_CODE,QUANTITY,LOC_CODE__TO,"
 						+ "TRAN_ID,LINE_NO,SITE_CODE,NO_ART,LINE_NO__ORD,LOT_NO,ITEM_CODE,LOC_CODE) "
 						+ "VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
@@ -1074,13 +1053,13 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 
 		System.out.println("insertPackHdrDet----------->>"+packDataMap);		
 		ResultSet rs = null,rs1 = null;
-		PreparedStatement pstmt = null,pstmt1= null,pstmtIns =null; //currDate
+		PreparedStatement pstmt = null,pstmt1= null,pstmt2 = null,pstmtIns =null; //currDate
 		java.sql.Timestamp currDate = null;
 		String sql = "",keyString = "",keyCol = "",tranSer = "",xmlValues = "",siteCode = "",tranId = "",
 				currDateStr = "",cartonNo = "",packCode ="",status = "",cartonType = "",pickOrder = "",ptcn = "",
-				masterCarton = "",updSql = "",sql1 = "",insSql;
+				masterCarton = "",updSql = "",sql1 = "",insSql ="",updateSql= "";
 		double tareWgt = 0,fillerWgt = 0; 
-		int count = 0,rowIns = 0,successCnt = 0 ;
+		int count = 0,rowIns = 0,successCnt = 0,updCnt = 0 ;
 		try
 		{
 			siteCode = checkNull(packDataMap.get("site_code"));
@@ -1127,7 +1106,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				{
 					successCnt++;
 					updSql = "UPDATE PACK_HDR SET CONFIRMED = ?,CONF_DATE = ?,EMP_CODE__APRV = ? ,CHG_DATE = ?,CHG_TERM = ?,"
-							+ "CHG_USER = ?,TARE_WEIGHT = ?,FILLER_WEIGHT = ?   WHERE PICK_ORDER = ?"; 
+							+ "CHG_USER = ?,TARE_WEIGHT = ?,FILLER_WEIGHT = ?,OUTER_CARTON_NO = ?,PALLET_NO = ?  WHERE TRAN_ID = ?"; 
 					
 					pstmt1 = conn.prepareStatement(updSql);
 					pstmt1.setString(1, "Y");
@@ -1137,13 +1116,27 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 					pstmt1.setString(5, chgTerm);
 					pstmt1.setString(6, chgUser);
 					pstmt1.setDouble(7, tareWgt);
-					pstmt1.setDouble(8, fillerWgt);
-					pstmt1.setString(9, pickOrder);
+					pstmt1.setDouble(8, fillerWgt);//pickOrder
+					pstmt1.setString(9, masterCarton);
+					pstmt1.setString(10, ptcn);
+					pstmt1.setString(11, pickOrder);
 					
 					rowIns = pstmt1.executeUpdate();
+					System.out.println("Rows updated for PACK_HDR------>>["+rowIns+"]");					
 					if(rowIns > 0)
 					{
-						System.out.println("row successfully updated for pack_hdr table......."+rowIns);						
+						System.out.println("row successfully updated for pack_hdr table......."+rowIns);
+						updateSql = "UPDATE WAVE_TASK_DET SET WAVE_STATUS = 'V',STATUS = 'Y' WHERE REF_SER = 'M-PACK'" +
+								" AND  PTCN = ? AND REF_ID = ?";
+						pstmt2 = conn.prepareStatement(updateSql);
+						pstmt2.setString(1, ptcn);
+						pstmt2.setString(2, pickOrder);
+						updCnt = pstmt2.executeUpdate();
+						if( updCnt > 0 )
+						{					
+							System.out.println( updCnt + " M-PACK rows updated successfully" );
+						}
+						pstmt2.close();pstmt2 = null;
 					}
 					pstmt1.close();
 					pstmt1 = null;
@@ -1333,7 +1326,7 @@ public class MultiplePtcnWizConf extends ActionHandlerEJB implements MultiplePtc
 				}
 
 
-				sqlBuf.append("UPDATE CARTON_MASTER SET STATUS = ? WHERE PTCN IN (");
+				sqlBuf.append("UPDATE CARTON_MASTER SET STATUS = ?,PALLET_NO = PTCN WHERE PTCN IN (");
 				for(int i = 0; i < ptcnList.size(); i++)
 				{
 					mark = mark + "?,";