update xml File for QC Approval Wizard(M14HFRA002)

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

webitm-mfg/ibase/webitm/ejb/mfg/QCApprovalWizPos.java

@@ -49,7 +49,7 @@ public class QCApprovalWizPos extends ValidatorEJB implements QCApprovalWizPosLo
 		PreparedStatement pstmt = null,pstmt1=null;
         ResultSet rs = null,rs1=null;
         GenericUtility genericUtility = GenericUtility.getInstance();
-        String siteCode="",locCode="",itemCode="",lotNo="",lotSl="";
+        String siteCode="",locCode="",itemCode="",lotNo="",lotSl="",testStat="";
         String chgTerm="",userId="";
         String forcedFlag = "";
 		String  retString="";
@@ -118,10 +118,10 @@ public class QCApprovalWizPos extends ValidatorEJB implements QCApprovalWizPosLo
 			System.out.println(">>>>>>>totalRejectQty:"+totalRejectQty);
 			//totalRejSampQty= totalRejectQty + totalSampleQty;
 			//System.out.println(">>>>>>>>>>totalRejSampQty:"+totalRejSampQty);
-			totalPassedQty= totalPassedQty - totalRejectQty; 
-			System.out.println(">>>>>>>>>>Final totalPassedQty:"+totalPassedQty);
+			//totalPassedQty= totalPassedQty - totalRejectQty; 
+			//System.out.println(">>>>>>>>>>Final totalPassedQty:"+totalPassedQty);
 			
-			sql = "update qc_order set qty_passed= ? , qty_rejected= ? where qorder_no = ? ";
+			/*sql = "update qc_order set qty_passed= ? , qty_rejected= ? where qorder_no = ? ";
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setDouble(1, totalPassedQty);
 			pstmt.setDouble(2, totalRejectQty);
@@ -141,8 +141,10 @@ public class QCApprovalWizPos extends ValidatorEJB implements QCApprovalWizPosLo
 				System.out.println(">>>>>after update qc_order conn rollback success:");
 			}
 			System.out.println(">>>>>>>>>>>update qc_order updCnt:"+updCnt);
-			if(updCnt > 0)
-			{
+			*/
+			conn.commit();
+			//if(updCnt > 0)
+			//{
 				sql = " SELECT stock.item_ser,stock.item_code,stock.unit,stock.loc_code,stock.lot_no, stock.lot_sl,   "
 						+ " stock.site_code, stock.quantity  - case "
 						+" when stock.alloc_qty is null then 0 else stock.alloc_qty end as quantity "
@@ -197,35 +199,53 @@ public class QCApprovalWizPos extends ValidatorEJB implements QCApprovalWizPosLo
 				if(totalScan)
 				{
 					forcedFlag="N";
-					System.out.println(">>>>>>Automatic Call QC Order Passed:"+tranId);
-					retString= qcPassed("qcorder_new",tranId,xtraParams,forcedFlag,conn);
-					System.out.println(">>>>>>>>>>qcPassed retString:"+retString);
-					if((retString != null ) && (retString.indexOf("VTSUCC1") > -1))
+					sql = "select test_stat from qc_order where qorder_no= ? ";
+					pstmt1 = conn.prepareStatement(sql);
+					pstmt1.setString(1, tranId);
+					rs1 = pstmt1.executeQuery();
+					if (rs1.next())
 					{
-						System.out.println(">>>>QC Order Passed Successfully:"+tranId);
-						//isError=false;
-						System.out.println(">>>>>>Automatic Call QC Order Confirmation:"+tranId);
-						retString= qcConfirm("qcorder_new",tranId,xtraParams,forcedFlag,conn);
-						System.out.println(">>>>>>>>>>qcConfirm retString:"+retString);
+						testStat = rs1.getString("test_stat");
+						System.out.println(">>>>>>>testStat:"+testStat);
+					}
+					rs1.close();
+					rs1 = null;
+					pstmt1.close();
+					pstmt1 = null;
+					if(!"P".equals(testStat))
+					{
+						System.out.println(">>>>>>Automatic Call QC Order Passed:"+tranId);
+						retString= qcPassed("qcorder_new",tranId,xtraParams,forcedFlag,conn);
+						System.out.println(">>>>>>>>>>qcPassed retString:"+retString);
 						if((retString != null ) && (retString.indexOf("VTSUCC1") > -1))
 						{
-							System.out.println(">>>>QC Order Confirmed Successfully:"+tranId);
-							isError=false;
+							System.out.println(">>>>QC Order Passed Successfully:"+tranId);
+							//isError=false;
+							System.out.println(">>>>>>Automatic Call QC Order Confirmation:"+tranId);
+							retString= qcConfirm("qcorder_new",tranId,xtraParams,forcedFlag,conn);
+							System.out.println(">>>>>>>>>>qcConfirm retString:"+retString);
+							if((retString != null ) && (retString.indexOf("VTSUCC1") > -1))
+							{
+								System.out.println(">>>>QC Order Confirmed Successfully:"+tranId);
+								isError=false;
+							}
+							else 
+							{
+								isError=true;
+								System.out.println(">>>>QC Order Not Confirmed:"+tranId);
+							}
 						}
 						else 
 						{
 							isError=true;
 							System.out.println(">>>>QC Order Not Confirmed:"+tranId);
 						}
+						
 					}
-					else 
-					{
-						isError=true;
-						System.out.println(">>>>QC Order Not Confirmed:"+tranId);
-					}
+					
 				}
 				
-			}
+			//}
 			
 		}
 		catch(Exception e)