Commit a7c50a3b authored by pshinde's avatar pshinde

changes done regarding rel_date if autoCloseQC is equals to Y


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98670 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5728770b
......@@ -217,7 +217,7 @@ QCTransferConfLocal, QCTransferConfRemote
String ledgPostConf ="";
String strToWrite="";
boolean isQcFlag=false;
double remainingQcOrderQty=0.0, QcTransferQty=0.0;
double remainingQcOrderQty=0.0, QcTransferQty=0.0,qcQtyPassed=0.0;
try
{
StockUpdate stockUpdate = new StockUpdate();
......@@ -978,14 +978,14 @@ QCTransferConfLocal, QCTransferConfRemote
//testing
sql="select qty_transfered from qc_order where qorder_no=?";
sql="select qty_transfered , qty_passed from qc_order where qorder_no=?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,qorderNo);
rs = pstmt.executeQuery();
if(rs.next())
{
qcQtyTran = rs.getDouble("qty_transfered");
qcQtyPassed = rs.getDouble("qty_passed");
}
rs.close();
rs = null;
......@@ -1035,13 +1035,35 @@ QCTransferConfLocal, QCTransferConfRemote
}
else
{
pstmt.setDouble(1, qty);
if( qcQtyPassed > 0 )
{
pstmt.setDouble(1, qty);
}
else
{
pstmt.setDouble(1, 0);
}
}
pstmt.setString(2, qorderNo);
updCnt1 = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
//End added by chandrashekar on 13-Jan-2015
//Start added by cpatil on 07/10/15
if( "Y".equalsIgnoreCase(autoCloseQC) && (remainingQcOrderQty==QcTransferQty) )
{
sql = " update qc_order set rel_date = ? where qorder_no = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1, sysDate);
pstmt.setString(2, qorderNo);
int updCnt9 = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
}
//End added by cpatil on 07/10/15
// if( updCnt == 0 )
// {
// errCode = "QCTRFUPDT"; //'Unable to confirm QC Transfer ' + sqlca.sqlerrtext
......@@ -1171,7 +1193,7 @@ QCTransferConfLocal, QCTransferConfRemote
pstmt = null;
System.out.println("hiold_qty updated in to location "+updCnt);
}*/
/*
sql = " Select quantity__o,quantity from qc_transfer Where tran_id = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -1186,8 +1208,8 @@ QCTransferConfLocal, QCTransferConfRemote
rs = null;
pstmt.close();
pstmt = null;
System.out.println("@@@cpatil23/09/15 remainingQcOrderQty["+remainingQcOrderQty+"]QcTransferQty["+QcTransferQty+"]");
*/
System.out.println("@@@cpatil 07/10/15 remainingQcOrderQty["+remainingQcOrderQty+"]QcTransferQty["+QcTransferQty+"]autoCloseQC["+autoCloseQC+"]");
if("Y".equalsIgnoreCase(autoCloseQC) && (remainingQcOrderQty==QcTransferQty))
......@@ -1200,14 +1222,31 @@ QCTransferConfLocal, QCTransferConfRemote
//if(errCode==null || errCode.trim().length()==0)
//{
//if( "Y".equalsIgnoreCase(autoCloseQC) && (remainingQcOrderQty==QcTransferQty) )
//{
sql = " update qc_order set test_stat = 'P' where qorder_no = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, qorderNo);
int updCnt9 = pstmt.executeUpdate();
pstmt.close();
pstmt = null;
//}
System.out.println("Going to commit transaction============");
conn.commit();
//To pass Qc Order
System.out.println("Quantioty transferred test before QC order passed====="+qcQtyTran);
retString1=autoQC("qcorder_new", qorderNo, xtraParams, forcedFlag,"pre_pass", conn);
// retString1=autoQC("qcorder_new", qorderNo, xtraParams, forcedFlag,"pre_pass", conn);
System.out.println("Quantioty transferred after QC order passed======="+qcQtyTran);
System.out.println("retString1 from QC Passed===="+retString1);
if((retString1 != null ) && (retString1.indexOf("VTSUCC1") > -1))
// if((retString1 != null ) && (retString1.indexOf("VTSUCC1") > -1))
{
System.out.println(">>>>>>>>>retString.indexOf(VTSUCC1) :"+retString1.indexOf("VTSUCC1"));
......@@ -1237,6 +1276,7 @@ QCTransferConfLocal, QCTransferConfRemote
}//commet till this
}
/*
else
{
strToWrite = " ["+tranId+"] return ["+retString1+"]";
......@@ -1245,7 +1285,7 @@ QCTransferConfLocal, QCTransferConfRemote
//return "VTQTSUCC";
}
*/
//Qc Order confirmation
/*retString=autoConfirmQC("qcorder_new",qorderNo,xtraParams,forcedFlag,conn);
System.out.println("retString from autoConfirmQC========="+retString);
......@@ -1277,6 +1317,10 @@ QCTransferConfLocal, QCTransferConfRemote
//}
}
else
{
System.out.println("@@@@@ 07/10/15 cpatil condition failed....");
}
}
// ADDED BY RITESH ON 23/SEP/2014 END
} //end if
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment