Skip to content

B
business-java
Commit 1195e458 authored by sankara.rao's avatar sankara.rao
Browse files
Options

changed by sankara on 16/10/13 for update shipmentIC and shipmentPrs and... 

changed by sankara on 16/10/13 for update shipmentIC and shipmentPrs and CommonsWmsUtil source for clubbing multiple ptcn and Wavegenerationic for duedate


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93777 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9758600a
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 14 deletions
webitm-wms/ibase/webitm/ejb/wms/ShipmentIC.java
View file @ 1195e458
......@@ -14,7 +14,8 @@ import ibase.webitm.ejb.ValidatorEJB;
import ibase.webitm.utility.GenericUtility;
import ibase.webitm.utility.ITMException;
import ibase.webitm.utility.TransIDGenerator;
//changed by sankara on 15/10/13 for clubing multiple ptcn
import ibase.webitm.utility.wms.CommonWmsUtil;
import java.rmi.RemoteException;
import java.sql.Connection;
import java.sql.Date;
......@@ -48,6 +49,8 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
String errString = null;
GenericUtility genericUtility = GenericUtility.getInstance();
System.out.println("WFVALDATA 111111");
//changed by sankara on 15/10/13 for clubing multiple ptcn
ibase.webitm.utility.wms.CommonWmsUtil.ALL_PTCN_EX_COUNT = 0;
try
{
System.out.println("xmlString [" + xmlString + "]");
......@@ -123,7 +126,8 @@ public class ShipmentIC extends ValidatorEJB implements ShipmentICRemote,Shipmen
long pronoToAmt = 0;
long pronoLastAmt = 0;
ConnDriver connDriver = null;
//changed by sankara on 15/10/13 for clubing multiple ptcn
ibase.webitm.utility.wms.CommonWmsUtil.ALL_PTCN_EX_COUNT = 0;
try
{
connDriver = new ConnDriver();
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrs.java
View file @ 1195e458
......@@ -19,7 +19,8 @@ import java.util.Set;
import org.w3c.dom.*;
import javax.ejb.*;
//changed by sankara on 15/10/13 for clubing multiple ptcn
import ibase.webitm.utility.wms.*;
@javax.ejb.Stateless
public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, ShipmentPrsRemote
{
......@@ -169,8 +170,20 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
System.out.println("key ["+key+"] and value ["+val+"]");
if( newPtcnAndNewConsingnee.containsValue(val))
{
//changed by sankara on 15/10/13 for clubing multiple ptcn start.
/*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
{
System.out.println("all ptcns in one wave");
errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString;
}
if(errString != null && errString.indexOf("W") != -1)
{
System.out.println("all ptcns in one wave1");
CommonWmsUtil.ALL_PTCN_EX_COUNT++;
}
//changed by sankara on 15/10/13 for clubing multiple ptcn end.
}
}
//}
......@@ -195,18 +208,46 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
System.out.println("key ["+key+"] and value ["+val+"]");
if( newPtcnAndNewConsingnee.containsValue(val))
{
//changed by sankara on 15/10/13 for clubing multiple ptcn start.
/*errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
{
System.out.println("all ptcns in diff wave");
errString = itmDBAccessEJB.getErrorString("","ALLPTCNNTA","","",conn);
return errString;
}
if(errString != null && errString.indexOf("W") != -1)
{
System.out.println("all ptcns in diff wave1");
CommonWmsUtil.ALL_PTCN_EX_COUNT++;
}
//changed by sankara on 15/10/13 for clubing multiple ptcn end.
}
}
}
}
//changed by sankara on 15/10/13 for clubing multiple ptcn start.
System.out.println("***************Calling Commanwms*************");
System.out.println("com.allPtcnCount:"+CommonWmsUtil.ALL_PTCN_EX_COUNT );
//changed by sankara on 15/10/13 for clubing multiple ptcn end.
if( tranCodeSet != null && tranCodeSet.size() > 1 && refSer.contains("S-DSP") && refSer.size() == 1)
{
//changed by sankara on 15/10/13 for clubing multiple ptcn start.
/* errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn);
System.out.println(" errString -->["+errString+"]");
return errString; */
if(CommonWmsUtil.ALL_PTCN_EX_COUNT == 0)
{
System.out.println("inside checking");
errString = itmDBAccessEJB.getErrorString("","VTDIFFTRAN","","",conn);
}
if(errString != null && errString.indexOf("W") != -1)
{
CommonWmsUtil.ALL_PTCN_EX_COUNT++;
}
System.out.println("allptcnscount:"+CommonWmsUtil.ALL_PTCN_EX_COUNT);
System.out.println(" errString -->["+errString+"]");
return errString;
//changed by sankara on 15/10/13 for clubing multiple ptcn end.
}
}
......@@ -614,8 +655,9 @@ public class ShipmentPrs extends ValidatorEJB implements ShipmentPrsLocal, Shipm
serviceCode = checkNull(rs.getString("SERVICE_CODE"));
shipmentType = checkNull(rs.getString("SHIPMENT_TYPE"));
System.out.println(" serviceCode "+serviceCode+"]["+shipmentType+"]");
if(serviceCode.trim().length() == 0 && shipmentType.trim().length() == 0)
//changed by sankara on 15/10/13 for clubing multiple ptcn
//if(serviceCode.trim().length() == 0 && shipmentType.trim().length() == 0)
if(serviceCode.trim().length() == 0 )
{
pstmt1.setString(1, stPTCN);
rs1 = pstmt1.executeQuery();
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 1195e458
......@@ -696,7 +696,9 @@ etc
GenericUtility genericUtility = GenericUtility.getInstance();
try
{
sql = " SELECT MIN(DUE_DATE),MAX(DUE_DATE) FROM SORDER WHERE SALE_ORDER BETWEEN ? AND ? ";
//changed by sankara on 16/10/13 for getting due date as confirmed sale order only
//sql = " SELECT MIN(DUE_DATE),MAX(DUE_DATE) FROM SORDER WHERE SALE_ORDER BETWEEN ? AND ? ";
sql = " SELECT MIN(DUE_DATE),MAX(DUE_DATE) FROM SORDER WHERE SALE_ORDER BETWEEN ? AND ? AND CONFIRMED = 'Y' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrderFrom);
pstmt.setString(2, saleOrderTo);
......
webitm-wms/ibase/webitm/utility/wms/CommonWmsUtil.java 0 → 100755
View file @ 1195e458
package ibase.webitm.utility.wms;
public class CommonWmsUtil {
public static int ALL_PTCN_EX_COUNT;
}
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