W15FSUN008, Updated class file for Palletization, Validation for QC sample...

W15FSUN008, Updated class file for Palletization, Validation for QC sample type. values for Qc_type and pallet_status in swma_to_awms table.


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

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

@@ -462,7 +462,8 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
 			pstmt = null;
 
 			sql = "select det.item_code, det.lot_no, det.lot_sl, det.quantity, det.pallet_no, " 
-				+ "hdr.inv_stat, det.site_code, det.loc_code, hdr.tran_date, det.line_no, i.descr, i.unit, i.item_type " 
+				+ "hdr.inv_stat, det.site_code, det.loc_code, hdr.tran_date, det.line_no, i.descr, i.unit, i.item_type, " 
+				+ "det.qc_sample_type, hdr.pallet_status  " 
 				+ "from pallet_hdr hdr, pallet_det det, item i where hdr.tran_id = det.tran_id and det.tran_id = ? and i.item_code = det.item_code ";
 			pstmt = conn1.prepareStatement(sql);
 			pstmt.setString(1, tranId);
@@ -580,7 +581,7 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
 				if(pstmt1 != null){ pstmt1.close(); pstmt1 = null; }
                 if(rs1 != null){ rs1.close(); rs1 = null; }
 				
-				//Pallet Status
+				/*//Pallet Status
 				if(interfaceQtyRem == 0)
 				{
 					palletStatus = "F";
@@ -589,8 +590,8 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
 				{
 					palletStatus = "P";
 				}
-				System.out.println("palletStatus ::::::::::::: " + palletStatus);	
-				
+				System.out.println("palletStatus ::::::::::::: " + palletStatus);	*/
+				/*
 				// QC Type
 				sql = "select qc_reqd from siteitem where item_code = ? and site_code = ?  ";
 				pstmt1 = conn1.prepareStatement(sql);
@@ -626,7 +627,7 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
                 System.out.println("qcReqd ::::::::::::: " + qcReqd);
                 System.out.println("procMth ::::::::::::: " + procMth);
                 System.out.println("qcType  ::::::::::::: " + qcType);
-                
+                */
                /* lineNoInterface = "   " + rs.getString("line_no");
                 lineNoInterface = lineNoInterface.substring( lineNoInterface.length()-3 );*/
                 lineNoInterface = checkNullAndTrim(rs.getString("line_no"));
@@ -659,12 +660,12 @@ public class PalletizationConf extends ValidatorEJB implements PalletizationConf
 				hm.put("EXP_DATE", checkNullAndTrim(expDate)); 
 				hm.put("MFG_DATE", checkNullAndTrim(mfgDate)); 
 				hm.put("PALLET_NO", checkNullAndTrim(rs.getString("pallet_no")));
-				hm.put("PALLET_STATUS", checkNullAndTrim(palletStatus));
+				hm.put("PALLET_STATUS", checkNullAndTrim(rs.getString("pallet_status")));
 				hm.put("MSG_STAT", "N");
 				hm.put("LOCK_STAT", checkNullAndTrim(invStat));
 				hm.put("ERR_COD", "");
 				hm.put("ERR_DESC", "");
-				hm.put("QC_TYPE", checkNullAndTrim(qcType));  
+				hm.put("QC_TYPE", checkNullAndTrim(rs.getString("qc_sample_type")));
 				hm.put("TRANS_DT_ACK", "");
 				//hm.put("STRO_PREF", "");
 				hm.put("STRO_PREF", stroPref);