Skip to content

B
business-java
Commit c9bb04b9 authored by ppatro's avatar ppatro
Browse files
Options

changes commited 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93431 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7fe5de79
Show whitespace changes
Inline Side-by-side
Showing with 972 additions and 878 deletions
webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsPrc.java
View file @ c9bb04b9
......@@ -157,6 +157,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
ADSIShippingSoap soap = null;
List arryOuterCartonNo = new ArrayList();
LinkedHashMap linkedMap = new LinkedHashMap();
ArrayList ptcnList = new ArrayList();
try
{
......@@ -181,7 +182,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
pstmtPrintStatus = conn.prepareStatement(sqlPrintStatus);
//sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS,CHANGE_STATUS,MSN_NO,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
sqlMaster = "SELECT MASTER_CARTON,TRACKING_NO,CARTON_NO,STATUS,CHANGE_STATUS,MSN_NO,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME,CARTON_TYPE FROM CARTON_MASTER WHERE PTCN = ? AND CARTON_TYPE <> ? ORDER BY CARTON_NO,MASTER_CARTON";
pstmtMaster = conn.prepareStatement(sqlMaster);
sqlCrtnChg = "UPDATE CARTON_MASTER SET CHANGE_STATUS = ? WHERE PTCN = ?";
......@@ -263,6 +264,14 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
pstmt.close(); pstmt = null; */
//This check is not required for testing.end
if(ptcnList.contains(ptcn))
{
continue;
}
else
{
ptcnList.add(ptcn);
}
pstmtPrintStatus.setString(1, ptcn);
......@@ -333,6 +342,8 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
chgStatus = rsMaster.getString("CHANGE_STATUS");
oldMsnNo = rsMaster.getLong("MSN_NO");
oldCarrierSymbol = rsMaster.getString("CARRIER_SYMBOL");
refType = rsMaster.getString("CARTON_TYPE");
System.out.println("parcelCartonNo ["+parcelCartonNo+"]CARRIER_SYMBOL["+oldCarrierSymbol+"]["+oldMsnNo+"]Change Status["+chgStatus+"]");
if("M".equalsIgnoreCase(refType))
......@@ -973,6 +984,21 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
sql = "SELECT S.TRAN_CODE,T.SERVICE_CODE FROM SHIPMENT S , SHIP_DOCS SD, TRANSPORTER T WHERE SD.PTCN = ? " +
" AND S.SHIPMENT_ID = SD.SHIPMENT_ID AND S.TRAN_CODE = T.TRAN_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn);
rs = pstmt.executeQuery();
if(rs.next())
{
shipTranCode = rs.getString("TRAN_CODE");
serviceCode = rs.getString("SERVICE_CODE");
}
else
{
sql = "SELECT T.TRAN_CODE,T.SERVICE_CODE FROM DESPATCH D,WAVE_TASK_DET W,TRANSPORTER T "
+" WHERE D.DESP_ID = W.REF_ID AND W.REF_SER='S-DSP'"
+" AND T.TRAN_CODE = D.TRAN_CODE AND W.PTCN = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, ptcn);
rs = pstmt.executeQuery();
......@@ -985,6 +1011,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
{
return "NO";
}
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentConf.java
View file @ c9bb04b9
......@@ -173,8 +173,8 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
CommodityInfo[] infoCom1 = null;
PreparedStatement pstmt2 = null;
PreparedStatement pstmt3 = null;
ResultSet rs2 = null;
PreparedStatement pstmt3 = null,pstmtTransetUp = null;
ResultSet rs2 = null,rsSet = null;
ResultSet rs3 = null;
//Changed by Rohan on 03-june define variables for manual shipment print lable.start
......@@ -347,7 +347,8 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
sSQLUpdatSord = "UPDATE SORDER SET SHIP_STATUS = ? WHERE SALE_ORDER IN (SELECT SORD_NO FROM DESPATCH WHERE DESP_ID = ?)";
pstmtSord = conn.prepareStatement(sSQLUpdatSord);
sql = " SELECT TRAN_WINDOW FROM TRANSETUP WHERE REF_SER = ? ";
pstmtTransetUp = conn.prepareStatement(sql);
//Changed by sumit on 05/10/12 added condition where ref_ser = S-DSP
//sql = "SELECT REF_ID FROM SHIP_DOCS WHERE SHIPMENT_ID = ?";
sql = "SELECT REF_ID, REF_SER FROM SHIP_DOCS WHERE SHIPMENT_ID = ? AND DESP_CONFIRMED = 'N'";
......@@ -450,25 +451,55 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
//changed by sankara on 12-07-13 for confirmation of consumption issue start....
else
{
sql = " SELECT TRAN_WINDOW FROM TRANSETUP WHERE REF_SER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refSer.trim());
rs = pstmt.executeQuery();
if( rs.next() )
pstmtTransetUp.setString(1, refSer.trim());
rsSet = pstmtTransetUp.executeQuery();
if( rsSet.next() )
{
winName = rs.getString("TRAN_WINDOW");
winName = rsSet.getString("TRAN_WINDOW");
}
objName = winName.substring(2);
System.out.println("OBJNAME=="+objName);
errString = confirmShipment( objName, refId.trim(), xtraParam, forcedFlag, conn);
System.out.println(" errString ---------------- > ["+errString);
//or id="VTSUCC1" type="P" column_name="">
/*<message><![CDATA[Prompt : Transaction confirmed!]]></message>
<description><![CDATA[Transaction Confirmed Sucessfully.]]></description>
<trace><![CDATA[]]></trace>
<redirect>1</redirect>
</error>
</Errors>
</Root>]*/
//if(errString != "" && errString.)error string should not check as it will call for multiple times.
}
//changed by sankara on 12-07-13 for confirmation of consumption issue end....
}
rs.close();
rs = null;
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmtTransetUp != null)
{
pstmtTransetUp.close();
pstmtTransetUp = null;
}
if(rsSet != null)
{
rsSet.close();
rsSet = null;
}
//Changed by sumit on 05/10/12 adding condition to check whether all despatch are confirmed or not
if( isCountSame(tranId, conn) || !("S-DSP".equalsIgnoreCase(refSer.trim())))
{
......@@ -477,6 +508,36 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
if("D-ISS".equalsIgnoreCase(refSer.trim()) || "C-ISS".equalsIgnoreCase(refSer.trim()) || "P-RET".equalsIgnoreCase(refSer.trim()) || "".equalsIgnoreCase(refSer.trim()))
{
sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T WHERE T.TRAN_CODE = S.TRAN_CODE AND"
+" S.SHIPMENT_ID = ? ";
PreparedStatement pstmtTrans = conn.prepareStatement(sql);
pstmtTrans.setString(1, tranId);
ResultSet rsTrans = pstmtTrans.executeQuery();
if(rsTrans.next())
{
serviceCode = checkNull(rsTrans.getString("SERVICE_CODE"));
dimensionDouble = rsTrans.getDouble("PACK_SIZE");
}
if(pstmtTrans != null)
{
pstmtTrans.close();
pstmtTrans = null;
}
if(rsTrans != null)
{
rsTrans.close();
rsTrans = null;
}
if(serviceCode != null && serviceCode.trim().length() > 0)
{
System.out.println("Enetr in manual Shipment whit shipment ID"+tranId);
adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
defPh = discommon.getDisparams("999999","SHIPPER_DEFAULT_PH",conn);
......@@ -560,7 +621,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
recipient.setAddress3(shipAdd3);//Customer Adress3
recipient.setCity(shipCity);//Customer Adress City
sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T WHERE T.TRAN_CODE = S.TRAN_CODE AND"
/*sql = "SELECT T.SERVICE_CODE,S.PACK_SIZE FROM SHIPMENT S,TRANSPORTER T WHERE T.TRAN_CODE = S.TRAN_CODE AND"
+" S.SHIPMENT_ID = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
......@@ -575,7 +636,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt = null;
rs.close();
rs = null;
*/
recipient.setState(stateCodeDlv);//Customer Adress State
Country country = soap.getCountry("ISO3", shipCountry).getResponseCountry();
......@@ -1109,7 +1170,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
if(!objReturn2.isSuccess())
{
//errString = getError(saleOrder + "[" + objReturn2.getMessage() +"]", "ADSISRVERR", conn);
errString = itmDBAccessLocal.getErrorString("","ADSISRVERR","");
errString = getError(saleOrder + "[" + objReturn2.getMessage() +"]", "ADSISRVERR", conn);
return errString;
}
else
......@@ -1304,6 +1365,7 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
}
//Changed by Rohna on 22-07-13 for generating UPS/FEDEX lable in case of manual shipment.end
}
sql = "UPDATE SHIPMENT SET CONFIRMED = ? , CONF_DATE = ? WHERE SHIPMENT_ID = ?";
pstmt = conn.prepareStatement(sql);
......@@ -1315,70 +1377,6 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmt = null;
conn.commit();
//For Adsi start
/*comment for further use manual shipment.start
DistCommon discommon = new DistCommon();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
String adsiShippingURL = "",imagePath = "";
ADSIShippingLocator locator = null;
ADSIShippingSoap soap = null;
String PTCN = "";
String carrierFriendlyName = "";
java.util.Date date = new Date();
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
SimpleDateFormat format = new SimpleDateFormat("M/d/yyyy");
String strSmple = format.format(calendar.getTime());
adsiShippingURL = discommon.getDisparams("999999","WMS_ADSI_SOAP_URL",conn);
long timeBefore = System.currentTimeMillis();
locator = new ADSIShippingLocator();
System.out.println(" Connecting ADSI server ................");
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
long timeAfter = System.currentTimeMillis();
System.out.println(" is server active ["+soap.testADSIServer()+"]");
if(!soap.testADSIServer())
{
errString = itmDBAccessEJB.getErrorString("","ADSISRVERR","","",conn);
return errString;
}
sql = " SELECT DISTINCT S.PTCN,G.CARRIER_FRIENDLYNAME FROM SHIP_DOCS S,WAVE_STATUS_ORG G WHERE S.SHIPMENT_ID = ? AND G.PTCN = S.PTCN";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
while( rs.next())
{
PTCN = rs.getString("PTCN");
carrierFriendlyName = rs.getString("CARRIER_FRIENDLYNAME");
System.out.println("PTCN["+PTCN+"]Carrier FriendlyName["+carrierFriendlyName+"]");
StringDictionaryReturn testStr = soap.closeOutEOD("Taro Commercial", carrierFriendlyName,strSmple, false, "");
System.out.println("Message for Close Out["+testStr.getMessage()+"]");
System.out.println("isSuccess["+testStr.isSuccess()+"]");
if(testStr.isSuccess())
{
}
else
{
errString =getError(testStr.getMessage(),"ADSCLOSEOD", conn);
return errString;
}
}
rs.close();rs = null;
pstmt.close();pstmt = null;
//For Adsi end
* /*comment for further use manual shipment.end
*/
//Changed by sumit on 28/09/12 commented and written above.
//ITMDBAccessLocal itmDBAccessLocal = new ITMDBAccessEJB();
errString = itmDBAccessLocal.getErrorString("","VTCONFIRM","");
}
}
......@@ -1412,6 +1410,27 @@ public class ShipmentConf extends ActionHandlerEJB implements ShipmentConfLocal,
pstmtSord.close();
pstmtSord = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmtTransetUp != null)
{
pstmtTransetUp.close();
pstmtTransetUp = null;
}
if(rsSet != null)
{
rsSet.close();
rsSet = null;
}
conn.close();
conn = null;
......
webitm-wms/ibase/webitm/ejb/wms/WaveCancelEJB.java
View file @ c9bb04b9
......@@ -2635,14 +2635,19 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
private boolean isManualAllocStock(String saleOrder,String lineNoSord,Connection conn) throws ITMException
{
String sql = "";
String sql = "",updateSql = "";
String sqlShipStanCode = "";
ResultSet rs = null;
PreparedStatement pstmt = null;
PreparedStatement pstmt = null,pstmtUpd = null;
boolean isManAlloc = false;
try
{
updateSql = "UPDATE SORDALLOC SET WAVE_FLAG = 'N' WHERE SALE_ORDER = ? AND LINE_NO = ? AND ALLOC_MODE ='M' ";
pstmtUpd = conn.prepareStatement(updateSql);
pstmtUpd.setString(1, saleOrder);
pstmtUpd.setString(2, lineNoSord);
sql = " SELECT * FROM SORDALLOC WHERE SALE_ORDER = ? AND LINE_NO = ? AND ALLOC_MODE ='M' ";
pstmt = conn.prepareStatement(sql);
......@@ -2653,11 +2658,43 @@ public class WaveCancelEJB extends ActionHandlerEJB implements WaveCancelEJBLoca
if (rs.next())
{
isManAlloc = true;
}
if(isManAlloc)
{
int count = pstmtUpd.executeUpdate();
if(count > 0)
{
System.out.println("Update count["+count+"]");
}
}
if(rs != null)
{
rs.close();
rs = null;
}
if(pstmtUpd != null)
{
pstmtUpd.close();
pstmtUpd = null;
}
if(pstmt != null)
{
pstmt.close();
pstmt = null;
}
}
catch(Exception e)
{
System.out.println("Exception in == >"+e);
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ c9bb04b9
......@@ -10441,6 +10441,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
//Change by rekha on 21-05-13 end
if(packgeList != null && packgeList.length > 0)
{
System.out.println("Setting Packages To Shipment In Master/Parcel["+packgeList.length+"]");
shipment2.setPackages2(packgeList);
}
}
......@@ -11771,7 +11776,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 24/11/12 to spilt active pick depending upon cartons.end
}
if(actCartonWeightMap.size() > 0 && "Y".equalsIgnoreCase(pPickAllow))
if(actCartonWeightMap.size() > 0 && ("Y".equalsIgnoreCase(pPickAllow) || "Y".equalsIgnoreCase(mPackAllow)))
{
CommodityInfo[] infoCom = null;
String nafFlag = discommon.getDisparams("999999","NAFTA_FLAG_COUNT",conn);
......@@ -11984,15 +11989,21 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
if(packgeList != null && packgeList.length > 0)
{
System.out.println("Setting Packages To Shipment In actives["+packgeList.length +"]");
shipment2.setPackages2(packgeList);
}
}
//change by rekha on 23-05-13 start
//if(packgeList.length != 0 || packgeList.length > 0)
//if("P".equalsIgnoreCase(waveMode) && packgeList != null && packgeList.length > 0)
if(packgeList != null && packgeList.length > 0)
{
System.out.println("Setting Packages To Shipment ["+packgeList.toString()+"]");
shipment2.setPackages2(packgeList);
//if(packgeList != null && packgeList.length > 0)
//{
/*System.out.println("Setting Packages To Shipment Finally["+packgeList.toString()+"]["+packgeList.length+"]");
shipment2.setPackages2(packgeList);*/
/*BASE64Decoder decoder = new BASE64Decoder();
Timestamp currDate = new Timestamp(System.currentTimeMillis());
......@@ -12318,7 +12329,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}*/
}
//}
//change by rekha on 23-05-13 end
......
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