Skip to content

B
business-java
Commit ef681616 authored by jshinde's avatar jshinde
Browse files
Options

Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label. 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@100988 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c760d99c
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 72 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ ef681616
...@@ -547,7 +547,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -547,7 +547,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//chnaged by pragyan on 15/10/14 for cold chain //chnaged by pragyan on 15/10/14 for cold chain
//+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME " //+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME "
+" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT " ; +" , SORDER.CUST_CODE__DLV, C.CUST_NAME AS CUST_DLV_NAME ,ITEM.LOC_TYPE__PARENT " ;
//Changed By Manish on 04/11/15 //Changed By Manish on 04/11/15
projectName = distCommon.getDisparams("999999","PROJECT",conn); projectName = distCommon.getDisparams("999999","PROJECT",conn);
if("DDUK".equals(projectName.trim())) if("DDUK".equals(projectName.trim()))
...@@ -835,7 +835,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -835,7 +835,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
System.out.println(" first mbaseUnit ["+mbaseUnit+"] unit ["+unit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"]"); System.out.println(" first mbaseUnit ["+mbaseUnit+"] unit ["+unit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"]");
//chnaged by pragyan on 15/10/14 for cold chain //chnaged by pragyan on 15/10/14 for cold chain
locTypeParent = rs.getString("LOC_TYPE__PARENT"); locTypeParent = rs.getString("LOC_TYPE__PARENT");
if("DDUK".equals(projectName.trim())) if("DDUK".equals(projectName.trim()))
{ {
//Changed by Dadaso pawar on 04/06/15 [Start] //Changed by Dadaso pawar on 04/06/15 [Start]
...@@ -3860,7 +3860,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3860,7 +3860,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtSord = null; pstmtSord = null;
} }
//Changed by Rohan to set resons detail null in sorder item.end //Changed by Rohan to set resons detail null in sorder item.end
//Changed by Samadhan on 24/02/2016 for update blank resason to sorder start //Changed by Samadhan on 24/02/2016 for update blank resason to sorder start
if("DDUK".equalsIgnoreCase(projectName)) if("DDUK".equalsIgnoreCase(projectName))
{ {
...@@ -3876,7 +3876,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -3876,7 +3876,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
} }
//Changed by Samadhan on 24/02/2016 for update blank resason to sorder end //Changed by Samadhan on 24/02/2016 for update blank resason to sorder end
if(saleOrderWiseNotAllowList.contains(saleOrder)) if(saleOrderWiseNotAllowList.contains(saleOrder))
{ {
System.out.println("Enter with saleOrder"+saleOrder+"lineNo"+"1"); System.out.println("Enter with saleOrder"+saleOrder+"lineNo"+"1");
...@@ -5181,7 +5181,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -5181,7 +5181,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
} }
//Changed by Samadhan on 26/02/2016 for Hold Sale Order Start //Changed by Samadhan on 26/02/2016 for Hold Sale Order Start
return errString; return errString;
} }
...@@ -7071,13 +7071,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7071,13 +7071,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom); saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom);
custCodeFrom = genericUtility.getColumnValue("cust_code__from",headerDom); custCodeFrom = genericUtility.getColumnValue("cust_code__from",headerDom);
custCodeTo = genericUtility.getColumnValue("cust_code__to",headerDom);*/ custCodeTo = genericUtility.getColumnValue("cust_code__to",headerDom);*/
saleOrderFrom = checkNull(genericUtility.getColumnValue("sale_order__from",headerDom)).trim(); saleOrderFrom = checkNull(genericUtility.getColumnValue("sale_order__from",headerDom)).trim();
saleOrderTo = checkNull(genericUtility.getColumnValue("sale_order__to",headerDom)).trim(); saleOrderTo = checkNull(genericUtility.getColumnValue("sale_order__to",headerDom)).trim();
custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from",headerDom)).trim(); custCodeFrom = checkNull(genericUtility.getColumnValue("cust_code__from",headerDom)).trim();
custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to",headerDom)).trim(); custCodeTo = checkNull(genericUtility.getColumnValue("cust_code__to",headerDom)).trim();
//Changed by samadhan on 04/12/2015 for check null and trim End //Changed by samadhan on 04/12/2015 for check null and trim End
dueDateFrom = genericUtility.getColumnValue("due_date__from",headerDom); dueDateFrom = genericUtility.getColumnValue("due_date__from",headerDom);
dueDateTo = genericUtility.getColumnValue("due_date__to",headerDom); dueDateTo = genericUtility.getColumnValue("due_date__to",headerDom);
dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat()); dueDateFrom = genericUtility.getValidDateString(dueDateFrom, genericUtility.getApplDateFormat(), genericUtility.getDBDateFormat());
...@@ -7139,7 +7139,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -7139,7 +7139,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " ; "CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE,REMARKS,TRAN_CODE,LOC_TYPE__PARENT,BATCH_ID " ;
// Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing. // Changed by Megha on 22/01/2015 :D14JSUN007 batch_id for back order processing.
//Changes by Dadaso pawar on 17/03/15 [Start] //Changes by Dadaso pawar on 17/03/15 [Start]
if("DDUK".equalsIgnoreCase(projectName)) if("DDUK".equalsIgnoreCase(projectName))
{ {
insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? )"; insertSql = insertSql + ") VALUES (?,?,?,?,?,?,?,?,?,?, ?,?,?,?,?,?,?,? )";
...@@ -10083,8 +10083,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10083,8 +10083,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
shipAdd3 = checkNull((String)transportInfoMap.get("ADDR3")).trim(); shipAdd3 = checkNull((String)transportInfoMap.get("ADDR3")).trim();
//Changed by Rohan on 22-08-13 for checking null address.end //Changed by Rohan on 22-08-13 for checking null address.end
shipCity = (String)transportInfoMap.get("CITY"); shipCity = (String)transportInfoMap.get("CITY");
stateCodeDlv = (String)transportInfoMap.get("STATE_DLV"); stateCodeDlv = (String)transportInfoMap.get("STATE_DLV");
shipCountry = (String)transportInfoMap.get("COUNT_CODE"); shipCountry = (String)transportInfoMap.get("COUNT_CODE");
...@@ -10096,7 +10096,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10096,7 +10096,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//pin = (String)transportInfoMap.get("PIN"); //pin = (String)transportInfoMap.get("PIN");
pin = (String)transportInfoMap.get("DLV_PIN"); pin = (String)transportInfoMap.get("DLV_PIN");
shipmentType = (String)transportInfoMap.get("SHIPMENT_TYPE"); shipmentType = (String)transportInfoMap.get("SHIPMENT_TYPE");
//Changed by Samadhan on 25/02/2016 for address mearge start //Changed by Samadhan on 25/02/2016 for address mearge start
shipAdd4 = checkNull((String)transportInfoMap.get("ADDR4")).trim(); shipAdd4 = checkNull((String)transportInfoMap.get("ADDR4")).trim();
shipAdd5 = checkNull((String)transportInfoMap.get("ADDR5")).trim(); shipAdd5 = checkNull((String)transportInfoMap.get("ADDR5")).trim();
...@@ -10110,7 +10110,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -10110,7 +10110,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
stateCodeDlv = shipAdd6; stateCodeDlv = shipAdd6;
} }
//Changed by Samadhan on 25/02/2016 for address mearge end //Changed by Samadhan on 25/02/2016 for address mearge end
//Setting Shipment ID //Setting Shipment ID
shipment2.setID(waveId); shipment2.setID(waveId);
recipient.setID(custCodeDlv);//Customer Code recipient.setID(custCodeDlv);//Customer Code
...@@ -16264,8 +16264,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16264,8 +16264,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String serviceSymbol = ""; String serviceSymbol = "";
String carrierSymbol = ""; String carrierSymbol = "";
String carrierFriendlyName = ""; String carrierFriendlyName = "";
//Added by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
String shipArchive = "";
String archivePath = "";
String new_shipLabelArchive = "";
//Added by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
String value = ""; String value = "";
String pckgId = ""; String pckgId = "";
String trackNo=""; String trackNo="";
...@@ -16313,27 +16316,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16313,27 +16316,40 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData.addBatch(); pstmtInsertData.addBatch();
pstmtInsertData.executeBatch(); pstmtInsertData.executeBatch();
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start]
sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?"; sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?";
pstmtDesp = conn.prepareStatement(sSQL); pstmtDesp = conn.prepareStatement(sSQL);
sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? , MSN_NO =?,CARRIER_SYMBOL = ? , CARRIER_FRIENDLYNAME = ?" //Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
+ " WHERE CARTON_NO = ?"; /*sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? , MSN_NO =?,CARRIER_SYMBOL = ? , CARRIER_FRIENDLYNAME = ?"
+ " WHERE CARTON_NO = ?";*/
sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? ,SHIP_LABEL_ARCHIVE= ?, MSN_NO =?,CARRIER_SYMBOL = ? , CARRIER_FRIENDLYNAME = ?"
+ " WHERE CARTON_NO = ?";
pstmtCart = conn.prepareStatement(sql); pstmtCart = conn.prepareStatement(sql);
sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE";
sqlInsertData1 = "INSERT INTO WAVE_STATUS_ORG_DET (TRAN_ID, LINE_NO,PTCN,CARTON_NO," + //sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE";
sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL ,SHIP_LABEL_ARCHIVE FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE";
/*sqlInsertData1 = "INSERT INTO WAVE_STATUS_ORG_DET (TRAN_ID, LINE_NO,PTCN,CARTON_NO," +
" PICK_ORDER, LINE_NO__PICK ,REF_SER, REF_ID, " + " PICK_ORDER, LINE_NO__PICK ,REF_SER, REF_ID, " +
" CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE, " + " CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE, " +
"WEIGHT,TRACKING_NO, SHIP_LABEL )"+ "WEIGHT,TRACKING_NO, SHIP_LABEL )"+
" VALUES (?,?, ?,?, ?,?, ?,?, ?,?, ?,? , ?,?, ?)"; " VALUES (?,?, ?,?, ?,?, ?,?, ?,?, ?,? , ?,?, ?)";*/
sqlInsertData1 = "INSERT INTO WAVE_STATUS_ORG_DET (TRAN_ID, LINE_NO,PTCN,CARTON_NO," +
" PICK_ORDER, LINE_NO__PICK ,REF_SER, REF_ID, " +
" CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE, " +
"WEIGHT,TRACKING_NO, SHIP_LABEL ,SHIP_LABEL_ARCHIVE)"+
" VALUES (?,?, ?,?, ?,?, ?,?, ?,?, ?,? , ?,?, ?,?)";
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
pstmtInsertData1 = conn.prepareStatement(sqlInsertData1); pstmtInsertData1 = conn.prepareStatement(sqlInsertData1);
pstmtDt = conn.prepareStatement(sqlInsertDt); pstmtDt = conn.prepareStatement(sqlInsertDt);
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end]
//"Y".equalsIgnoreCase(isADSIConnReq) //"Y".equalsIgnoreCase(isADSIConnReq)
if("P".equalsIgnoreCase(waveMode)) if("P".equalsIgnoreCase(waveMode))
{ {
...@@ -16365,11 +16381,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16365,11 +16381,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
/*sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?"; /*sSQL = "UPDATE DESPATCH SET FREIGHT_AMT_ADD = ? WHERE PTCN = ?";
pstmtDesp = conn.prepareStatement(sSQL);*/ pstmtDesp = conn.prepareStatement(sSQL);*/
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end]
pstmtDesp.setDouble(1, totalFrtAmt); pstmtDesp.setDouble(1, totalFrtAmt);
pstmtDesp.setString(2, ptcn); pstmtDesp.setString(2, ptcn);
int pUpd = pstmtDesp.executeUpdate(); int pUpd = pstmtDesp.executeUpdate();
if(pstmtDesp != null) if(pstmtDesp != null)
{ {
pstmtDesp.close(); pstmtDesp.close();
...@@ -16424,7 +16440,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16424,7 +16440,28 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
cnumber = addValue; cnumber = addValue;
} }
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
else if(addName.equalsIgnoreCase("Base64ArchiveDoc"))
{
shipArchive = addValue;
byte[] imgBytes = decoder.decodeBuffer(addValue);
System.out.println("IMAGE Byte Length for Base64ArchiveDoc ["+imgBytes.length+"]");
BufferedImage bufImg = ImageIO.read(new ByteArrayInputStream(imgBytes));
File imgOutFile = new File(imagePath+ File.separator+"Ship_Label"+File.separator+ ptcn + File.separator + ptcn+"_"+cnumber +"_Archive" +".png");
archivePath = imgOutFile.getPath();
System.out.println("Get Path for Base64ArchiveDoc["+archivePath+"]");
File createFolder = new File(archivePath);
if(!createFolder.exists())
{
createFolder.mkdirs();
}
imgOutFile.createNewFile();
ImageIO.write(bufImg, "png", imgOutFile);
System.out.println("Write File Complete for Base64ArchiveDoc----");
}
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
} }
...@@ -16450,19 +16487,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16450,19 +16487,22 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{ {
createFolder.mkdirs(); createFolder.mkdirs();
} }
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start]
/*sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? , MSN_NO =?,CARRIER_SYMBOL = ? , CARRIER_FRIENDLYNAME = ?" /*sql = "UPDATE CARTON_MASTER SET TRACKING_NO = ? , SHIP_LABEL= ? , MSN_NO =?,CARRIER_SYMBOL = ? , CARRIER_FRIENDLYNAME = ?"
+ " WHERE CARTON_NO = ?"; + " WHERE CARTON_NO = ?";
pstmtCart = conn.prepareStatement(sql);*/ pstmtCart = conn.prepareStatement(sql);*/
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end]
pstmtCart.setString(1, trackNo); pstmtCart.setString(1, trackNo);
pstmtCart.setString(2, path ); pstmtCart.setString(2, path );
pstmtCart.setDouble(3, msnNo); //Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[start]
pstmtCart.setString(4, carrierSymbol); pstmtCart.setString(3, archivePath);
pstmtCart.setString(5, carrierFriendlyName); //Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
pstmtCart.setString(6, cnumber); pstmtCart.setDouble(4, msnNo);
pstmtCart.setString(5, carrierSymbol);
pstmtCart.setString(6, carrierFriendlyName);
pstmtCart.setString(7, cnumber);
System.out.println("carton number in for loop: "+cnumber); System.out.println("carton number in for loop: "+cnumber);
System.out.println("msn no for pkg result is :" +msnNo); System.out.println("msn no for pkg result is :" +msnNo);
int test = pstmtCart.executeUpdate(); int test = pstmtCart.executeUpdate();
...@@ -16489,7 +16529,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16489,7 +16529,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtCart = null; pstmtCart = null;
} }
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start]
if( pstmt != null ) if( pstmt != null )
{ {
pstmt.close(); pstmt.close();
...@@ -16530,8 +16570,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16530,8 +16570,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData.addBatch(); */ pstmtInsertData.addBatch(); */
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start]
/*sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE"; /*sqlInsertDt = "SELECT CARTON_NO,PICK_ORDER,LINE_NO__PICK,CARTON_TYPE,PACK_CODE,MASTER_CARTON,ITEM_CODE,TRACKING_NO,SHIP_LABEL FROM CARTON_MASTER WHERE PTCN = ? ORDER BY ITEM_CODE";
...@@ -16544,7 +16584,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16544,7 +16584,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtDt = conn.prepareStatement(sqlInsertDt);*/ pstmtDt = conn.prepareStatement(sqlInsertDt);*/
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[end]
pstmtDt.setString(1, ptcn); pstmtDt.setString(1, ptcn);
rsD = pstmtDt.executeQuery(); rsD = pstmtDt.executeQuery();
ArrayList test = new ArrayList(); ArrayList test = new ArrayList();
...@@ -16571,6 +16611,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16571,6 +16611,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
new_shipLabel = rsD.getString("SHIP_LABEL"); new_shipLabel = rsD.getString("SHIP_LABEL");
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
new_shipLabelArchive = rsD.getString("SHIP_LABEL_ARCHIVE");
System.out.println("ship_label_archive in while loop :" +new_shipLabelArchive);
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
System.out.println("carton no in while loop :" +cartonNo); System.out.println("carton no in while loop :" +cartonNo);
System.out.println("tracking no in while loop :"+new_trackingNo); System.out.println("tracking no in while loop :"+new_trackingNo);
System.out.println("ship_label in while loop :"+new_shipLabel); System.out.println("ship_label in while loop :"+new_shipLabel);
...@@ -16592,12 +16636,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16592,12 +16636,18 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData1.setDouble(13,caseWeight); pstmtInsertData1.setDouble(13,caseWeight);
pstmtInsertData1.setString(14,""); pstmtInsertData1.setString(14,"");
pstmtInsertData1.setString(15,""); pstmtInsertData1.setString(15,"");
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
pstmtInsertData1.setString(16,"");
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
} }
else else
{ {
pstmtInsertData1.setDouble(13,0.0); pstmtInsertData1.setDouble(13,0.0);
pstmtInsertData1.setString(14,new_trackingNo); pstmtInsertData1.setString(14,new_trackingNo);
pstmtInsertData1.setString(15,new_shipLabel); pstmtInsertData1.setString(15,new_shipLabel);
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[Start]
pstmtInsertData1.setString(16,new_shipLabelArchive);
//Changed by Jagruti Shinde Request ID:[W15LKAT002] for Implementing and printing DHL Archive label.[End]
} }
pstmtInsertData1.addBatch(); pstmtInsertData1.addBatch();
...@@ -16623,7 +16673,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16623,7 +16673,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData1.close(); pstmtInsertData1.close();
pstmtInsertData1 = null; pstmtInsertData1 = null;
} }
//Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start] //Changed by Manish on 15/03/16 for max cursor issue for DDUK.[start]
if( rsD != null) if( rsD != null)
{ {
...@@ -16681,7 +16731,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -16681,7 +16731,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtCart.close(); pstmtCart.close();
pstmtCart = null; pstmtCart = null;
} }
} }
catch(Exception e) catch(Exception e)
{ {
...@@ -18499,31 +18549,31 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -18499,31 +18549,31 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOC_CODE__TO = ?"; //orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET WHERE LOC_CODE__TO = ?";
//Changed by Rohan on 19-02-13 free location form cancle Repanishment //Changed by Rohan on 19-02-13 free location form cancle Repanishment
//orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12 //orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? AND NOT EXISTS (SELECT 1 FROM REPL_ISS_HDR I WHERE I.REPL_ORDER = O.REPL_ORDER AND I.CONFIRMED = 'Y') "; //changes done by Ashish Sonawane on 10-jul-12
System.out.println("PickType----->>["+pickType+"]");
sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? ";
System.out.println("PickType----->>["+pickType+"]");
sql = "SELECT A.SINGLE_LOT_SL,A.LOC_CODE, A.LOC_ZONE, A.LOC_TYPE FROM LOCATION A ,INVSTAT B ,SITE S "
+ "WHERE A.INV_STAT = B.INV_STAT AND B.AVAILABLE = 'Y' AND A.LOC_TYPE = 'N' AND S.SITE_CODE = ? ";
//Changed by Manish on 05/10/2015 for mssql for adding isnull in place of nvl [start]
if("mssql".equalsIgnoreCase(DB))
{
sql = sql + "AND (S.FACILITY_CODE = A.FACILITY_CODE or isnull(s.facility_code ,'N') = 'N') "
+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = ? AND stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0 "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0 "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE ITEM_CODE <> ? and SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 1),0) = 0 ";
}
else
{
sql = sql + "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') "
+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = ? AND stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0 "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0 "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE ITEM_CODE <> ? and SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 1),0) = 0 ";
}
//Changed by Manish on 05/10/2015 for mssql.[end]
//Changed by Manish on 05/10/2015 for mssql for adding isnull in place of nvl [start]
if("mssql".equalsIgnoreCase(DB))
{
sql = sql + "AND (S.FACILITY_CODE = A.FACILITY_CODE or isnull(s.facility_code ,'N') = 'N') "
+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = ? AND stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0 "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0 "
+ "and isnull((SELECT sum(quantity) FROM STOCK WHERE ITEM_CODE <> ? and SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 1),0) = 0 ";
}
else
{
sql = sql + "AND (S.FACILITY_CODE = A.FACILITY_CODE or nvl(s.facility_code ,'N') = 'N') "
+ "AND A.INV_STAT IN (?) AND (CASE WHEN B.STAT_TYPE IS NULL THEN ' ' ELSE B.STAT_TYPE END) <> 'S' "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE SITE_CODE = ? AND stock.loc_code = a.loc_code and a.SINGLE_LOT_SL ='Y'),0) = 0 "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE (ITEM_CODE <> ? OR LOT_NO <> ?) and a.SINGLE_LOT_SL ='N' and SITE_CODE = ? AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 0),0) = 0 "
+ "and nvl((SELECT sum(quantity) FROM STOCK WHERE ITEM_CODE <> ? and SITE_CODE = ? and a.SINGLE_LOT_SL ='N' AND stock.loc_code = a.loc_code and a.ITEM_LOT_OPT = 1),0) = 0 ";
}
//Changed by Manish on 05/10/2015 for mssql.[end]
////Uncomment for Replenishments having same case pick location. ////Uncomment for Replenishments having same case pick location.
orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? " orderSql = "SELECT COUNT(*) AS COUNT FROM REPL_ORD_DET O WHERE O.LOC_CODE__TO = ? "
+" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' " +" AND CASE WHEN CANCEL_MODE IS NULL THEN 'N' ELSE CANCEL_MODE END <> 'Y' "
...@@ -18550,7 +18600,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -18550,7 +18600,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
+ " AND A.INV_STAT = ? AND A.LOC_TYPE = ? AND A.LOC_GROUP = (SELECT DROP_GROUP FROM LOCATION WHERE LOC_CODE = ? )" + " AND A.INV_STAT = ? AND A.LOC_TYPE = ? AND A.LOC_GROUP = (SELECT DROP_GROUP FROM LOCATION WHERE LOC_CODE = ? )"
+ " ORDER BY ABS( A.LOC_ZONE - ?) ,A.LOC_CODE ";@@*/ + " ORDER BY ABS( A.LOC_ZONE - ?) ,A.LOC_CODE ";@@*/
/* //Changed by Manish on 04/11/15 for ddwms merging /* //Changed by Manish on 04/11/15 for ddwms merging
if("DDUK".equalsIgnoreCase(projectName)) if("DDUK".equalsIgnoreCase(projectName))
{ {
sql = "SELECT A.LOC_CODE AS LOC_CODE,A.SINGLE_LOT_SL AS SINGLE_LOT_SL,A.ITEM_LOT_OPT AS ITEM_LOT_OPT" sql = "SELECT A.LOC_CODE AS LOC_CODE,A.SINGLE_LOT_SL AS SINGLE_LOT_SL,A.ITEM_LOT_OPT AS ITEM_LOT_OPT"
...@@ -18564,8 +18614,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -18564,8 +18614,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
else else
{*/ {*/
sql = sql + "AND A.LOC_GROUP = (SELECT DROP_GROUP FROM LOCATION WHERE LOC_CODE = ? ) "; sql = sql + "AND A.LOC_GROUP = (SELECT DROP_GROUP FROM LOCATION WHERE LOC_CODE = ? ) ";
System.out.println(" pnd sql -> ["+sql+"]"); System.out.println(" pnd sql -> ["+sql+"]");
//Changed by sumit on 06/08/12 getting pnd location of loc_code from location end. //Changed by sumit on 06/08/12 getting pnd location of loc_code from location end.
} }
...@@ -21310,7 +21360,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -21310,7 +21360,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmt = null; pstmt = null;
} }
//Changed by Samadhan on 19/02/2016 for handle maximum cursor open error end //Changed by Samadhan on 19/02/2016 for handle maximum cursor open error end
sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A " sql = "SELECT A.LOC_CODE__DOCK AS DOC_LOC FROM TRANSPORTER A "
+ " WHERE A.TRAN_CODE = ? "; + " WHERE A.TRAN_CODE = ? ";
...@@ -26443,7 +26493,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -26443,7 +26493,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
return mainStr; return mainStr;
} }
//Changed by samadhan on 04/12/2015 for handling special characters End //Changed by samadhan on 04/12/2015 for handling special characters End
//Changed by samadhan on 23/02/2016 for hold sale order start //Changed by samadhan on 23/02/2016 for hold sale order start
private String holdSaleOrder(String reasonErr) throws ITMException, Exception private String holdSaleOrder(String reasonErr) throws ITMException, Exception
{ {
...@@ -26456,33 +26506,33 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -26456,33 +26506,33 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String saleOrder =""; String saleOrder ="";
Document dom = null; Document dom = null;
String descr = ""; String descr = "";
try try
{ {
dom = genericUtility.parseString(reasonErr); dom = genericUtility.parseString(reasonErr);
descr = genericUtility.getColumnValue("description", dom); descr = genericUtility.getColumnValue("description", dom);
if(descr != null && descr.indexOf("[") != -1 && descr.indexOf("]") != -1) if(descr != null && descr.indexOf("[") != -1 && descr.indexOf("]") != -1)
{ {
saleOrder = descr.substring(descr.indexOf("[")+1 ,descr.indexOf("]")); saleOrder = descr.substring(descr.indexOf("[")+1 ,descr.indexOf("]"));
reason = descr.substring(descr.indexOf("]")+1, descr.length()); reason = descr.substring(descr.indexOf("]")+1, descr.length());
} }
System.out.println("Sale Order: ["+saleOrder+"]"); System.out.println("Sale Order: ["+saleOrder+"]");
System.out.println("Reason: ["+reason+"]"); System.out.println("Reason: ["+reason+"]");
ConnDriver connDriver = new ConnDriver(); ConnDriver connDriver = new ConnDriver();
conn = connDriver.getConnectDB("DriverITM"); conn = connDriver.getConnectDB("DriverITM");
conn.setAutoCommit(false); conn.setAutoCommit(false);
sorderHoldSql = "UPDATE SORDER SET STATUS = ? ,SPEC_REASON = ? WHERE SALE_ORDER = ?"; sorderHoldSql = "UPDATE SORDER SET STATUS = ? ,SPEC_REASON = ? WHERE SALE_ORDER = ?";
pstmt = conn.prepareStatement(sorderHoldSql); pstmt = conn.prepareStatement(sorderHoldSql);
pstmt.setString(1, "H"); pstmt.setString(1, "H");
pstmt.setString(2, reason); pstmt.setString(2, reason);
pstmt.setString(3, saleOrder); pstmt.setString(3, saleOrder);
updatedRows = pstmt.executeUpdate(); updatedRows = pstmt.executeUpdate();
if(updatedRows > 0) if(updatedRows > 0)
{ {
System.out.println(updatedRows+" Rows Updated for Sale Order: "+saleOrder); System.out.println(updatedRows+" Rows Updated for Sale Order: "+saleOrder);
......
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