Skip to content

B
business-java
Commit 3dd13a38 authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 09/03/16 for DDUK. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100336 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 985c2952
Hide whitespace changes
Inline Side-by-side
Showing with 198 additions and 181 deletions
webitm-wms/ibase/webitm/ejb/wms/DockTranPos.java
View file @ 3dd13a38
...@@ -66,7 +66,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -66,7 +66,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
String pickType = ""; String pickType = "";
String palletNo = ""; String palletNo = "";
String itemCode = "",siteCode = "",locCode = "",lotNo = "",lotSl = "",locCodeSys = "", String itemCode = "",siteCode = "",locCode = "",lotNo = "",lotSl = "",locCodeSys = "",
saleOrder = "",lineNoSord = "",ptcn=""; saleOrder = "",lineNoSord = "",ptcn="";
double quantity = 0.0,noArt = 0.0; double quantity = 0.0,noArt = 0.0;
int lineNo = 0,lineNumber = 0,despCnt = 0; int lineNo = 0,lineNumber = 0,despCnt = 0;
int updCnt = 0; int updCnt = 0;
...@@ -76,7 +76,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -76,7 +76,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() ); java.sql.Timestamp currDate = new java.sql.Timestamp( System.currentTimeMillis() );
StockUpdate stkUpdate = null; StockUpdate stkUpdate = null;
String suppCodeMfg = "",dimension = "",locCodeTo = "", chguser = "",chgdate = "",chgterm = "", String suppCodeMfg = "",dimension = "",locCodeTo = "", chguser = "",chgdate = "",chgterm = "",
employeeCode = "",conmfirmed = "",waveId = "",tranIdissue = "",docktranID = ""; employeeCode = "",conmfirmed = "",waveId = "",tranIdissue = "",docktranID = "";
String updateSql = ""; String updateSql = "";
String chgTerm =""; String chgTerm ="";
boolean isError = false,isCommit = false,isReceiptGen = false; boolean isError = false,isCommit = false,isReceiptGen = false;
...@@ -163,21 +163,21 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -163,21 +163,21 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
System.out.println("generatetranID:"+docktranID); System.out.println("generatetranID:"+docktranID);
sql = " SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, " + sql = " SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, " +
" R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, " + " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, " +
" R.NO_ART NO_ART, R.LOC_CODE__TO LOC_CODE__TO, R.LOC_CODE__SYS LOC_CODE__SYS, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, "+ " R.NO_ART NO_ART, R.LOC_CODE__TO LOC_CODE__TO, R.LOC_CODE__SYS LOC_CODE__SYS, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, "+
" O.PICK_ORDER, H.PICK_TYPE, S.CONFIRMED, S.CONF_DATE, S.PALLET_NO, S.TRAN_ID, "+ " O.PICK_ORDER, H.PICK_TYPE, S.CONFIRMED, S.CONF_DATE, S.PALLET_NO, S.TRAN_ID, "+
" S.EMP_CODE__APRV, WT.PTCN, WT.WAVE_ID, S.CHG_USER, S.CHG_DATE, S.CHG_TERM "+ " S.EMP_CODE__APRV, WT.PTCN, WT.WAVE_ID, S.CHG_USER, S.CHG_DATE, S.CHG_TERM "+
" FROM PICK_ISS_DET R, PICK_ORD_DET O, PICK_ORD_HDR H, PICK_ISS_HDR S, WAVE_TASK_DET WT, WAVE_TASK W "+ " FROM PICK_ISS_DET R, PICK_ORD_DET O, PICK_ORD_HDR H, PICK_ISS_HDR S, WAVE_TASK_DET WT, WAVE_TASK W "+
" WHERE R.TRAN_ID = ? "+ " WHERE R.TRAN_ID = ? "+
" AND R.PICK_ORDER = O.PICK_ORDER "+ " AND R.PICK_ORDER = O.PICK_ORDER "+
" AND H.PICK_ORDER = O.PICK_ORDER "+ " AND H.PICK_ORDER = O.PICK_ORDER "+
" AND O.LINE_NO = R.LINE_NO__ORD "+ " AND O.LINE_NO = R.LINE_NO__ORD "+
" AND W.WAVE_ID = WT.WAVE_ID " + " AND W.WAVE_ID = WT.WAVE_ID " +
" AND S.PICK_ORDER = R.PICK_ORDER " + " AND S.PICK_ORDER = R.PICK_ORDER " +
" AND S.TRAN_ID = R.TRAN_ID " + " AND S.TRAN_ID = R.TRAN_ID " +
" AND S.PICK_ORDER = WT.REF_ID "+ " AND S.PICK_ORDER = WT.REF_ID "+
" AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+ " AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+
" AND R.LOC_CODE <> R.LOC_CODE__TO "; " AND R.LOC_CODE <> R.LOC_CODE__TO ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId); pstmt.setString(1, tranId);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -215,7 +215,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -215,7 +215,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
if(isRecordexist == false) if(isRecordexist == false)
{ {
updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " + updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " +
" PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) "; " PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) ";
pstmtUpd = conn.prepareStatement(updateSql); pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, docktranID); pstmtUpd.setString(1, docktranID);
...@@ -239,7 +239,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -239,7 +239,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," + updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," +
" LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) "; " LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
pstmtUpd = conn.prepareStatement(updateSql); pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, docktranID); pstmtUpd.setString(1, docktranID);
...@@ -311,7 +311,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -311,7 +311,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
//Changes by Dadaso pawar on [24/02/15] (Confirmed dispatch) [Start] //Changes by Dadaso pawar on [24/02/15] (Confirmed dispatch) [Start]
sql = "SELECT DT.SALE_ORDER FROM DOCK_TRAN D, DOCK_TRAN_DET DT " sql = "SELECT DT.SALE_ORDER FROM DOCK_TRAN D, DOCK_TRAN_DET DT "
+ "WHERE D.TRAN_ID = DT.TRAN_ID AND DT.TRAN_ID = ?"; + "WHERE D.TRAN_ID = DT.TRAN_ID AND DT.TRAN_ID = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, docktranID); pstmt.setString(1, docktranID);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
...@@ -630,66 +630,83 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -630,66 +630,83 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
//Changed by samadhan on 01/06/2015 for status tracking update in magento system.end //Changed by samadhan on 01/06/2015 for status tracking update in magento system.end
conn.commit(); conn.commit();
//Changed By Manish To check the desp conf flag 08/03/16.start //Changed By Manish To check the desp conf flag 08/03/16.start
isDespConfEnable = distCommonObj.getDisparams("999999", "IS_DESP_CONF_REQD", conn); isDespConfEnable = distCommonObj.getDisparams("999999", "IS_DESP_CONF_REQD", conn);
if("Y".equalsIgnoreCase(isDespConfEnable)) if("Y".equalsIgnoreCase(isDespConfEnable))
{ {
for (int callCount = 0; callCount <= 2; callCount++)
System.out.println("------Commited all transaction before despatch confirmed.......");
errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
System.out.println("errString After Despatch Confirmed------>>["+errString+"]");
if(errString != null && errString.indexOf("VTSUCC1") > 0)
{ {
System.out.println("----------"+despId+" Despatch confirmed successfully.................");
System.out.println("------Commited all transaction before despatch confirmed...callCount....[" + callCount + "]");
updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? "; try
pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1, despId);
updCnt = pstmt.executeUpdate();
if( updCnt > 0 )
{
System.out.println( updCnt + " rows updated successfully " );
}
pstmt.close();pstmt = null;
//Changed by Manish on [12/05/15] start
String printer = "";
printer = genericUtility.getColumnValue( "printer_name", dom );
System.out.println("Printer Name="+printer);
errString = "";
// Changed by Sneha on 08/03/2016 [Start]
//generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
invoicePrint = distCommonObj.getDisparams("999999", "IS_PRINT_INVOICE_ON", conn);
if("Y".equalsIgnoreCase(invoicePrint))
{ {
generateInvoiceReport(ptcn, despId, printer, conn, xtraParams); errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
} }
catch (Exception e) {
// Changed by Sneha on 08/03/2016 [End] // Throwable rootCause = e.getRootCause();
if (e instanceof org.apache.axis.AxisFault) {
//Changed by Manish on [12/05/15] END continue;
} //AxisFault axFault = (AxisFault)rootCause;
else // now extract information, e.g.
{ //axFault.getFaultDetails();
return errString; }
//throw new Exception(errString); }
System.out.println("------Commited all transaction before despatch confirmed.......");
errString = confirmDespatch("despatch", despId, xtraParams, "", conn);
System.out.println("errString After Despatch Confirmed------>>["+errString+"]");
if(errString != null && errString.indexOf("VTSUCC1") > 0)
{
System.out.println("----------"+despId+" Despatch confirmed successfully.................");
updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? ";
pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1, despId);
updCnt = pstmt.executeUpdate();
if( updCnt > 0 )
{
System.out.println( updCnt + " rows updated successfully " );
}
pstmt.close();pstmt = null;
//Changed by Manish on [12/05/15] start
String printer = "";
printer = genericUtility.getColumnValue( "printer_name", dom );
System.out.println("Printer Name="+printer);
errString = "";
// Changed by Sneha on 08/03/2016 [Start]
//generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
invoicePrint = distCommonObj.getDisparams("999999", "IS_PRINT_INVOICE_ON", conn);
if("Y".equalsIgnoreCase(invoicePrint))
{
generateInvoiceReport(ptcn, despId, printer, conn, xtraParams);
}
// Changed by Sneha on 08/03/2016 [End]
//Changed by Manish on [12/05/15] END
}
else
{
return errString;
//throw new Exception(errString);
}
} }
} }
else else
{ {
System.out.println("------Only Task confirmed......."); System.out.println("------Only Task confirmed.......");
updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? "; updateSql = "UPDATE WAVE_TASK_DET SET STATUS = 'Y', WAVE_STATUS = 'V' WHERE REF_ID = ? ";
pstmt = conn.prepareStatement(updateSql); pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1, despId); pstmt.setString(1, despId);
updCnt = pstmt.executeUpdate(); updCnt = pstmt.executeUpdate();
if( updCnt > 0 ) if( updCnt > 0 )
{ {
System.out.println( updCnt + " rows updated successfully " ); System.out.println( updCnt + " rows updated successfully " );
...@@ -719,8 +736,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -719,8 +736,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
else //(for TARO WMS) else //(for TARO WMS)
{ {
sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE " sql = "SELECT HDR1.TRAN_ID TRAN_ID,HDR.PICK_TYPE,HDR1.PICK_ORDER FROM PICK_ORD_HDR HDR,PICK_ISS_HDR HDR1 WHERE "
+ " HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND HDR.PICK_TYPE IN ('A','M')" + " HDR.PICK_ORDER = HDR1.PICK_ORDER AND HDR1.PALLET_NO = ? AND HDR.PICK_TYPE IN ('A','M')"
+ " AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR + " AND (CASE WHEN HDR1.TRF_STATUS IS NULL THEN 'N' ELSE HDR1.TRF_STATUS END) = ?"; //PICK_ISS_HDR
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString( 1, palletNo); pstmt.setString( 1, palletNo);
...@@ -778,22 +795,22 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -778,22 +795,22 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
+" AND R.LOC_CODE <> R.LOC_CODE__TO ";*/ +" AND R.LOC_CODE <> R.LOC_CODE__TO ";*/
sql = " SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, " + sql = " SELECT R.LINE_NO LINE_NO, R.ITEM_CODE ITEM_CODE, R.SITE_CODE SITE_CODE, R.LOC_CODE LOC_CODE, " +
" R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, " + " R.LOT_NO LOT_NO, R.LOT_SL LOT_SL, ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) AS QUANTITY, " +
" R.NO_ART NO_ART, R.LOC_CODE__TO LOC_CODE__TO, R.LOC_CODE__SYS LOC_CODE__SYS, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, "+ " R.NO_ART NO_ART, R.LOC_CODE__TO LOC_CODE__TO, R.LOC_CODE__SYS LOC_CODE__SYS, O.SALE_ORDER SALE_ORDER, O.LINE_NO__SORD LINE_NO__SORD, "+
" O.PICK_ORDER, H.PICK_TYPE, S.CONFIRMED, S.CONF_DATE, S.PALLET_NO, S.TRAN_ID, "+ " O.PICK_ORDER, H.PICK_TYPE, S.CONFIRMED, S.CONF_DATE, S.PALLET_NO, S.TRAN_ID, "+
" S.EMP_CODE__APRV, WT.PTCN, WT.WAVE_ID, S.CHG_USER, S.CHG_DATE, S.CHG_TERM "+ " S.EMP_CODE__APRV, WT.PTCN, WT.WAVE_ID, S.CHG_USER, S.CHG_DATE, S.CHG_TERM "+
" FROM PICK_ISS_DET R, PICK_ORD_DET O, PICK_ORD_HDR H, PICK_ISS_HDR S, WAVE_TASK_DET WT, WAVE_TASK W "+ " FROM PICK_ISS_DET R, PICK_ORD_DET O, PICK_ORD_HDR H, PICK_ISS_HDR S, WAVE_TASK_DET WT, WAVE_TASK W "+
" WHERE R.TRAN_ID = ? "+ " WHERE R.TRAN_ID = ? "+
" AND R.PICK_ORDER = O.PICK_ORDER "+ " AND R.PICK_ORDER = O.PICK_ORDER "+
" AND H.PICK_ORDER = O.PICK_ORDER "+ " AND H.PICK_ORDER = O.PICK_ORDER "+
" AND O.LINE_NO = R.LINE_NO__ORD "+ " AND O.LINE_NO = R.LINE_NO__ORD "+
" AND W.WAVE_ID = WT.WAVE_ID " + " AND W.WAVE_ID = WT.WAVE_ID " +
" AND S.PICK_ORDER = R.PICK_ORDER " + " AND S.PICK_ORDER = R.PICK_ORDER " +
//changed by sankara on 18/09/14 added join for one pick multiple pallet. //changed by sankara on 18/09/14 added join for one pick multiple pallet.
" AND S.TRAN_ID = R.TRAN_ID " + " AND S.TRAN_ID = R.TRAN_ID " +
" AND S.PICK_ORDER = WT.REF_ID "+ " AND S.PICK_ORDER = WT.REF_ID "+
" AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+ " AND ( R.QUANTITY - CASE WHEN R.DEALLOC_QTY IS NULL THEN 0 ELSE R.DEALLOC_QTY END) > 0 "+
" AND R.LOC_CODE <> R.LOC_CODE__TO "; " AND R.LOC_CODE <> R.LOC_CODE__TO ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
//pstmt.setString(1, tranId); //pstmt.setString(1, tranId);
...@@ -856,7 +873,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -856,7 +873,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
{ {
updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " + updateSql = " INSERT INTO DOCK_TRAN (TRAN_ID, SITE_CODE, PALLET_NO, TRAN_ID__ISS, EMP_CODE , " +
" PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) "; " PTCN, WAVE_ID,PICK_TYPE,CHG_DATE, CHG_USER, CHG_TERM) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ) ";
pstmtUpd = conn.prepareStatement(updateSql); pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, docktranID); pstmtUpd.setString(1, docktranID);
...@@ -880,7 +897,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -880,7 +897,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
} }
updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," + updateSql = " INSERT INTO DOCK_TRAN_DET ( TRAN_ID, LINE_NO,LINE_NO__ISS,PICK_ORDER,LINE_NO__PICK,ITEM_CODE,LOC_CODE,LOT_NO,LOT_SL,NO_ART,QUANTITY," +
" LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) "; " LOC_CODE__TO,LOC_CODE__SYS,SALE_ORDER,LINE_NO__SORD) VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,? ) ";
pstmtUpd = conn.prepareStatement(updateSql); pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, docktranID); pstmtUpd.setString(1, docktranID);
...@@ -1047,11 +1064,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -1047,11 +1064,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
try { try {
sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT," sql = "SELECT I.LENGTH ITEM_LEN,I.WIDTH ITEM_WID,I.HEIGHT ITEM_HEIGHT,I.GROSS_WEIGHT ITEM_WEIGHT,"
+" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM" +" L.LENGTH LITEM_LEN,L.WIDTH LITEM_WID,L.HEIGHT LITEM_HEIGHT,L.SHIPPER_SIZE SHIPSIZE,L.GROSS_WEIGHT LOT_WEIGHT FROM"
+" ITEM I,ITEM_LOT_PACKSIZE L" +" ITEM I,ITEM_LOT_PACKSIZE L"
+" WHERE I.ITEM_CODE = L.ITEM_CODE" +" WHERE I.ITEM_CODE = L.ITEM_CODE"
+" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?" +" AND L.LOT_NO__FROM <= ? AND L.LOT_NO__TO >= ?"
+" AND I.ITEM_CODE = ?"; +" AND I.ITEM_CODE = ?";
pstmt = con.prepareStatement(sql); pstmt = con.prepareStatement(sql);
...@@ -1181,15 +1198,15 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -1181,15 +1198,15 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
try try
{ {
sql = "INSERT INTO RECEIPT ( TRAN_ID,TRAN_DATE,CUST_CODE,RCP_MODE,BANK_CODE,REF_NO,REF_DATE," sql = "INSERT INTO RECEIPT ( TRAN_ID,TRAN_DATE,CUST_CODE,RCP_MODE,BANK_CODE,REF_NO,REF_DATE,"
+ "EFF_DATE,SITE_CODE,CHG_DATE,CHG_USER,CHG_TERM,ACCT_CODE__AR,CCTR_CODE__AR,"//14 + "EFF_DATE,SITE_CODE,CHG_DATE,CHG_USER,CHG_TERM,ACCT_CODE__AR,CCTR_CODE__AR,"//14
+ "CURR_CODE,ACCT_CODE__ADV,CCTR_CODE__ADV,CUST_BANK_REF,EXCH_RATE,EXCH_RATE_SPOT," + "CURR_CODE,ACCT_CODE__ADV,CCTR_CODE__ADV,CUST_BANK_REF,EXCH_RATE,EXCH_RATE_SPOT,"
+ "FIN_ENTITY,ACCT_CODE__BAL,CCTR_CODE__BAL,ACCT_CODE__CF,CCTR_CODE__CF,REMARKS,CHQ_AMT, "//27 + "FIN_ENTITY,ACCT_CODE__BAL,CCTR_CODE__BAL,ACCT_CODE__CF,CCTR_CODE__CF,REMARKS,CHQ_AMT, "//27
+ "CONFIRMED, OTH_AMT,ADV_AMT,ADVADJ_AMT,NET_AMT,NET_AMT__BC,TRAN_TYPE,AUTO_RECD,ITEM_SER," + "CONFIRMED, OTH_AMT,ADV_AMT,ADVADJ_AMT,NET_AMT,NET_AMT__BC,TRAN_TYPE,AUTO_RECD,ITEM_SER,"
+ "SALE_ORDER ) " + "SALE_ORDER ) "
+ "VALUES ( ?,?,?,?,?,?,?,?,?,?," + "VALUES ( ?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,?,?,?,?,?,?,?,?," + "?,?,?,?,?,?,?,?,?,?,"
+ "?,?,? ,?,?,?,?)"; + "?,?,? ,?,?,?,?)";
System.out.println("Insert SQL ::- "+sql); System.out.println("Insert SQL ::- "+sql);
...@@ -1372,9 +1389,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -1372,9 +1389,9 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
PreparedStatement pstmt =null; PreparedStatement pstmt =null;
System.out.println("insertReceiptDtl insertMap--------->>"+insertMap); System.out.println("insertReceiptDtl insertMap--------->>"+insertMap);
String sql = "INSERT INTO RCPDET ( TRAN_ID,REF_SER,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE__RCV," String sql = "INSERT INTO RCPDET ( TRAN_ID,REF_SER,REF_NO,REF_DATE,CURR_CODE,EXCH_RATE__RCV,"
+ "DISC_AMT,TAX_AMT,EXCH_RATE,NET_AMT,RCP_AMT,DIFF_AMT__EXCH,CUST_CODE,DUE_DATE," + "DISC_AMT,TAX_AMT,EXCH_RATE,NET_AMT,RCP_AMT,DIFF_AMT__EXCH,CUST_CODE,DUE_DATE,"
+ "ACCT_CODE__AR,CCTR_CODE__AR,BAD_DEBT_AMT,BILL_DISC,LINE_NO__REF,LINE_NO) " + "ACCT_CODE__AR,CCTR_CODE__AR,BAD_DEBT_AMT,BILL_DISC,LINE_NO__REF,LINE_NO) "
+ "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? )"; + "VALUES ( ?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,? )";
try try
...@@ -1864,7 +1881,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -1864,7 +1881,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
// + " WHERE S.SALE_ORDER = SD.SALE_ORDER AND SD.SALE_ORDER = ? AND SD.LINE_NO = ? "; // + " WHERE S.SALE_ORDER = SD.SALE_ORDER AND SD.SALE_ORDER = ? AND SD.LINE_NO = ? ";
sql = "SELECT SD.ITEM_CODE,SD.QUANTITY,SD.TAX_AMT,SD.RATE,S.USER_REMARKS,UDF__NUM1,CURR_CODE,REMARKS3 FROM SORDDET SD,SORDER S " sql = "SELECT SD.ITEM_CODE,SD.QUANTITY,SD.TAX_AMT,SD.RATE,S.USER_REMARKS,UDF__NUM1,CURR_CODE,REMARKS3 FROM SORDDET SD,SORDER S "
+ " WHERE S.SALE_ORDER = SD.SALE_ORDER AND SD.SALE_ORDER = ? AND SD.LINE_NO = ? "; + " WHERE S.SALE_ORDER = SD.SALE_ORDER AND SD.SALE_ORDER = ? AND SD.LINE_NO = ? ";
//Changed by Samadhan on 08/07/2015 D15CKAT015 End //Changed by Samadhan on 08/07/2015 D15CKAT015 End
...@@ -2037,71 +2054,71 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2037,71 +2054,71 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
ibase.webitm.reports.utility.JasperReportGenerator jrGenerator = new ibase.webitm.reports.utility.JasperReportGenerator(); ibase.webitm.reports.utility.JasperReportGenerator jrGenerator = new ibase.webitm.reports.utility.JasperReportGenerator();
String xsdString ="<Arguments>" + String xsdString ="<Arguments>" +
"<Argument id=\"arg1\" name=\"as_site_code\">" + "<Argument id=\"arg1\" name=\"as_site_code\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>"+loginSite+"</value>" + "<value>"+loginSite+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_cust_code_fr\">" + "<Argument id=\"arg1\" name=\"as_cust_code_fr\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>"+custCodeFr+"</value>" + "<value>"+custCodeFr+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_cust_code_to\">" + "<Argument id=\"arg1\" name=\"as_cust_code_to\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>"+custCodeTo+"</value>" + "<value>"+custCodeTo+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_invoice_id_fr\">" + "<Argument id=\"arg1\" name=\"as_invoice_id_fr\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>"+invoiceIdFr+"</value>" + "<value>"+invoiceIdFr+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_invoice_id_to\">" + "<Argument id=\"arg1\" name=\"as_invoice_id_to\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>"+invoiceIdFr+"</value>" + "<value>"+invoiceIdFr+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_date_fr\">" + "<Argument id=\"arg1\" name=\"as_date_fr\">" +
"<argType>java.util.Date</argType>" + "<argType>java.util.Date</argType>" +
"<value>"+currDateStr+"</value>" + "<value>"+currDateStr+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg1\" name=\"as_date_to\">" + "<Argument id=\"arg1\" name=\"as_date_to\">" +
"<argType>java.util.Date</argType>" + "<argType>java.util.Date</argType>" +
"<value>"+currDateStr+"</value>" + "<value>"+currDateStr+"</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg8\" name=\"x_path\">" + "<Argument id=\"arg8\" name=\"x_path\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>/DocumentRoot/d_invoice_rev</value>" + "<value>/DocumentRoot/d_invoice_rev</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg9\" name=\"design_source\">" + "<Argument id=\"arg9\" name=\"design_source\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>d_invoice_rev.jrxml</value>" + "<value>d_invoice_rev.jrxml</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg9\" name=\"data_source\">" + "<Argument id=\"arg9\" name=\"data_source\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>SQL</value>" + "<value>SQL</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg9\" name=\"bind_type\">" + "<Argument id=\"arg9\" name=\"bind_type\">" +
"<argType>java.lang.Integer</argType>" + "<argType>java.lang.Integer</argType>" +
"<value>0</value>" + "<value>0</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg9\" name=\"report_type\">" + "<Argument id=\"arg9\" name=\"report_type\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>JASPER</value>" + "<value>JASPER</value>" +
"</Argument>" + "</Argument>" +
"<Argument id=\"arg7\" name=\"report_save_type\">" + "<Argument id=\"arg7\" name=\"report_save_type\">" +
"<argType>java.lang.String</argType>" + "<argType>java.lang.String</argType>" +
"<value>NATIVE</value>" + "<value>NATIVE</value>" +
"</Argument>" + "</Argument>" +
"</Arguments>"; "</Arguments>";
System.out.println("XSD parser **->["+xsdString+"]"); System.out.println("XSD parser **->["+xsdString+"]");
siteCode = loginSite; siteCode = loginSite;
...@@ -2167,11 +2184,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2167,11 +2184,11 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
try try
{ {
sql = "SELECT REF_DATE, CURR_CODE, EXCH_RATE, ACCT_CODE,CCTR_CODE," sql = "SELECT REF_DATE, CURR_CODE, EXCH_RATE, ACCT_CODE,CCTR_CODE,"
+ "DUE_DATE, CUST_CODE, DISCOUNT, TAX_AMT, TOT_AMT, ADJ_AMT," + "DUE_DATE, CUST_CODE, DISCOUNT, TAX_AMT, TOT_AMT, ADJ_AMT,"
+ "CASE WHEN BAD_DEBT_AMT IS NULL THEN 0 ELSE BAD_DEBT_AMT END,LINE_NO__REF " + "CASE WHEN BAD_DEBT_AMT IS NULL THEN 0 ELSE BAD_DEBT_AMT END,LINE_NO__REF "
+ "FROM RECEIVABLES " + "FROM RECEIVABLES "
+ "WHERE TRAN_SER = ? " + "WHERE TRAN_SER = ? "
+ "AND REF_NO = ? "; + "AND REF_NO = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranSer); pstmt.setString(1, tranSer);
pstmt.setString(2, invoiceId); pstmt.setString(2, invoiceId);
...@@ -2277,10 +2294,10 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2277,10 +2294,10 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
{ {
sql = "SELECT EXPORT_FUND.EXCH_RATE FROM EXPORT_FUND, EXPORT_FUNDET " sql = "SELECT EXPORT_FUND.EXCH_RATE FROM EXPORT_FUND, EXPORT_FUNDET "
+ "WHERE ( EXPORT_FUND.TRAN_ID = EXPORT_FUNDET.TRAN_ID ) AND " + "WHERE ( EXPORT_FUND.TRAN_ID = EXPORT_FUNDET.TRAN_ID ) AND "
+ "( EXPORT_FUND.CONFIRMED = ? ) AND " + "( EXPORT_FUND.CONFIRMED = ? ) AND "
+ "( ( EXPORT_FUNDET.REF_SER = ? ) AND " + "( ( EXPORT_FUNDET.REF_SER = ? ) AND "
+ "( EXPORT_FUNDET.REF_NO = ? ) ) "; + "( EXPORT_FUNDET.REF_NO = ? ) ) ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, "Y"); pstmt.setString(1, "Y");
...@@ -2357,7 +2374,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2357,7 +2374,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
try try
{ {
sql = "SELECT C.STD_EXRT,S.FIN_ENTITY FROM CURRENCY C,SITE S " sql = "SELECT C.STD_EXRT,S.FIN_ENTITY FROM CURRENCY C,SITE S "
+ "WHERE C.CURR_CODE = ? AND S.SITE_CODE = ?" ; + "WHERE C.CURR_CODE = ? AND S.SITE_CODE = ?" ;
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, currCode); pstmt.setString(1, currCode);
...@@ -2394,7 +2411,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2394,7 +2411,7 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
if(custCode != null && custCode.length() > 0) if(custCode != null && custCode.length() > 0)
{ {
sql = "SELECT CUST_NAME,ACCT_CODE__AR,CCTR_CODE__AR,CURR_CODE,RCP_MODE,ACCT_CODE__ADV," sql = "SELECT CUST_NAME,ACCT_CODE__AR,CCTR_CODE__AR,CURR_CODE,RCP_MODE,ACCT_CODE__ADV,"
+ "CCTR_CODE__ADV,BANK_NAME FROM CUSTOMER WHERE CUST_CODE = ?"; + "CCTR_CODE__ADV,BANK_NAME FROM CUSTOMER WHERE CUST_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
...@@ -2427,8 +2444,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT ...@@ -2427,8 +2444,8 @@ public class DockTranPos extends ValidatorEJB implements DockTranPosLocal, DockT
if(bankCode != null && bankCode.length() > 0) if(bankCode != null && bankCode.length() > 0)
{ {
sql = "SELECT BANK_NAME, ACCT_CODE__BAL, CCTR_CODE__BAL, ACCT_CODE__CF," sql = "SELECT BANK_NAME, ACCT_CODE__BAL, CCTR_CODE__BAL, ACCT_CODE__CF,"
+ "CCTR_CODE__CF,ACCT_CODE__CF_AR, CCTR_CODE__CF_AR,CURR_CODE " + "CCTR_CODE__CF,ACCT_CODE__CF_AR, CCTR_CODE__CF_AR,CURR_CODE "
+ "FROM BANK WHERE BANK_CODE = ?"; + "FROM BANK WHERE BANK_CODE = ?";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, bankCode); pstmt.setString(1, bankCode);
......
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