Commit f6604381 authored by pjain's avatar pjain

changed by sankara on 23/04/14 for wms live generatelabelsprc


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94993 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 29231617
...@@ -123,6 +123,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -123,6 +123,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
String adsiShippingURL = "",imagePath = ""; String adsiShippingURL = "",imagePath = "";
String masterCarton = "",itemCode = "",trackingNo = "",parcelCartonNo = "", String masterCarton = "",itemCode = "",trackingNo = "",parcelCartonNo = "",
cartonStatus = "",chgStatus = ""; cartonStatus = "",chgStatus = "";
String tempItemCode = ""; String tempItemCode = "";
String value = "",outerCartonNo = "",trackNo = "",pckgId = ""; String value = "",outerCartonNo = "",trackNo = "",pckgId = "";
long msnNo = 0; long msnNo = 0;
...@@ -357,7 +358,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -357,7 +358,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
int itemCount = 0; int itemCount = 0;
//LinkedList liklist = new LinkedList(); //LinkedList liklist = new LinkedList();
if( !"NO".equalsIgnoreCase(serviceCode) ) /*if( !"NO".equalsIgnoreCase(serviceCode) )
{ {
sql = " SELECT CM.ITEM_CODE,WOD.WEIGHT FROM CARTON_MASTER CM, WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " + sql = " SELECT CM.ITEM_CODE,WOD.WEIGHT FROM CARTON_MASTER CM, WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " +
" AND CM.CARTON_NO = WOD.CARTON_NO AND CM.MASTER_CARTON = ? AND CM.CARTON_TYPE = ? AND CM.STATUS <> ? " + " AND CM.CARTON_NO = WOD.CARTON_NO AND CM.MASTER_CARTON = ? AND CM.CARTON_TYPE = ? AND CM.STATUS <> ? " +
...@@ -377,7 +378,15 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -377,7 +378,15 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
pstmt1.setString(2, "C"); pstmt1.setString(2, "C");
pstmt1.setString(3, "R"); pstmt1.setString(3, "R");
pstmt1.setString(4, "Y"); pstmt1.setString(4, "Y");
} }*/
sql = " SELECT CM.ITEM_CODE,WOD.WEIGHT FROM CARTON_MASTER CM, WAVE_STATUS_ORG_DET WOD WHERE CM.PTCN = WOD.PTCN " +
" AND CM.CARTON_NO = WOD.CARTON_NO AND CM.MASTER_CARTON = ? AND CM.CARTON_TYPE = ? AND CM.STATUS <> ? " +
" ORDER BY CM.ITEM_CODE";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, masterCarton);
pstmt1.setString(2, "C");
pstmt1.setString(3, "R");
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
...@@ -402,31 +411,95 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -402,31 +411,95 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
rs1.close(); rs1 = null; rs1.close(); rs1 = null;
pstmt1.close(); pstmt1 = null; pstmt1.close(); pstmt1 = null;
if(!isExist) if("R".equalsIgnoreCase(cartonStatus))
{ {
packages2[count] = null; packages2[count] = null;
count++;
if("Y".equalsIgnoreCase(chgStatus)) System.out.println("CHANGES NOT EXIST[" +count+"]Master Carton ["+masterCarton+"]chgStatus["+chgStatus+"]");
if("Y".equalsIgnoreCase(chgStatus))
{
StringReturn testReturn = soap.voidPackage(oldCarrierSymbol,oldMsnNo);
response = testReturn.getResponse();
System.out.println("response Master Carton void----["+response+"] for master carton["+masterCarton+"]");
}
/*//Changed By Pragyan.start
else
{ {
StringReturn testReturn = soap.voidPackage(oldCarrierSymbol,oldMsnNo); arryOuterCartonNo.add(masterCarton);
response = testReturn.getResponse(); Package2[] oldPkg = shipment2.getPackages2();
System.out.println("response Master Carton void----["+response+"] for master carton["+masterCarton+"]"); String key1,val1 = "";
} boolean elmentFound = false;
for(int cPtr = 0 ;cPtr <oldPkg.length;cPtr++)
{
Package2 PKG = oldPkg[cPtr];
for(int Cadd=0;Cadd<PKG.getAdditionalFields().length;Cadd++)
{
key1 = PKG.getAdditionalFields()[Cadd].getName();
val1 = PKG.getAdditionalFields()[Cadd].getValue();
System.out.println("key1"+key1);
System.out.println("val1"+val1);
if(masterCarton.equalsIgnoreCase(val1))
{
elmentFound = true;
break;
}
}
if(elmentFound)
{
packages2[count] = PKG;
}
}
System.out.println("IF PACKAGE EXIST["+oldPkg[count].getAdditionalFields().toString());
}*/
count++;
//Changed By Pragyan.end
continue; continue;
} }
else else
{ {
arryOuterCartonNo.add(masterCarton);
CommodityInfo[] comInfo = new CommodityInfo[linkedMap.size()]; if( weight > 0.0)
comInfo = setCommodityInfos(linkedMap, masterCarton, saleOrder, soap,refType, conn); {
System.out.println("old weight ["+packages2[count].getWeight()+"]"); arryOuterCartonNo.add(masterCarton);
System.out.println("new weight ["+weight+"]"); CommodityInfo[] comInfo = new CommodityInfo[linkedMap.size()];
packages2[count].setWeight(weight); comInfo = setCommodityInfos(linkedMap, masterCarton, saleOrder, soap,refType, conn);
System.out.println("old comodity info length ["+packages2[count].getCommodityInfos().length+"]"); System.out.println("old weight ["+packages2[count].getWeight()+"]");
System.out.println("new comodity info length ["+comInfo.length+"]"); System.out.println("new weight ["+weight+"]");
packages2[count].setCommodityInfos(comInfo); packages2[count].setWeight(weight);
System.out.println("old comodity info length ["+packages2[count].getCommodityInfos().length+"]");
System.out.println("new comodity info length ["+comInfo.length+"]");
packages2[count].setCommodityInfos(comInfo);
}
else
{
System.out.println("In case of weight zero ["+weight+"]");
packages2[count] = null;
System.out.println("ON ELSE BLOCK CHANGES NOT EXIST[" +count+"]Master Carton ["+masterCarton+"]chgStatus["+chgStatus+"]");
if("Y".equalsIgnoreCase(chgStatus))
{
StringReturn testReturn = soap.voidPackage(oldCarrierSymbol,oldMsnNo);
response = testReturn.getResponse();
System.out.println("on else response Master Carton void----["+response+"] for master carton["+masterCarton+"]");
}
}
count++; count++;
} }
weight = 0; weight = 0;
...@@ -523,7 +596,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo ...@@ -523,7 +596,7 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
} }
} }//while(rsMaster.next())
pstmtMaster.clearParameters(); pstmtMaster.clearParameters();
if( rsMaster != null) if( rsMaster != null)
{ {
......
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