Commit 701d1703 authored by manohar's avatar manohar

Bug fix - channel partner to checked for cust_code__dlv not cust_code


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97278 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 7d3c1629
...@@ -134,7 +134,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -134,7 +134,7 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
String sql = "",locCode ="",invstat="",aval="",avalyn="",status="",errorType="",despId = ""; String sql = "",locCode ="",invstat="",aval="",avalyn="",status="",errorType="",despId = "";
double qtyConf=0,qtyShip=0,totQty=0,detquantity=0,stkquantity=0,quantity=0,totquantity=0; double qtyConf=0,qtyShip=0,totQty=0,detquantity=0,stkquantity=0,quantity=0,totquantity=0;
String squantity="",distOrder = "",itemCode="",confirmed="",tranId="",siteCode="",lotSl="",addUser="",tranCode=""; String squantity="",distOrder = "",itemCode="",confirmed="",tranId="",siteCode="",lotSl="",addUser="",tranCode="";
String itemCodeL="",SiteCodeL="",CustCodeL="",ChanPart="",sorderNo=""; String itemCodeL="",SiteCodeL="",CustCodeL="",ChanPart="",sorderNo="", custCodeDlv = "";
ArrayList<String> lockList=new ArrayList<String>(); ArrayList<String> lockList=new ArrayList<String>();
HashMap<String,String>invHoldMap=new HashMap<String,String>(); HashMap<String,String>invHoldMap=new HashMap<String,String>();
String lotNo="",locCodeL="",qcLockValue=""; String lotNo="",locCodeL="",qcLockValue="";
...@@ -235,13 +235,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -235,13 +235,14 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
break; break;
}else if("N".equalsIgnoreCase(avalyn)){ }else if("N".equalsIgnoreCase(avalyn)){
sql="select site_code,cust_code from sorder where sale_order = ?"; sql="select site_code,cust_code, cust_code__dlv from sorder where sale_order = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,sorderNo); pstmt.setString(1,sorderNo);
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()){ if(rs.next()){
SiteCodeL=checkNull(rs.getString(1)); SiteCodeL=checkNull(rs.getString(1));
CustCodeL=checkNull(rs.getString(2)); CustCodeL=checkNull(rs.getString(2));
custCodeDlv=checkNull(rs.getString(3));
} }
rs.close(); rs.close();
pstmt.close(); pstmt.close();
...@@ -251,7 +252,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -251,7 +252,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
+ "cust_code = ? and available_yn = ?"; + "cust_code = ? and available_yn = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,SiteCodeL); pstmt.setString(1,SiteCodeL);
pstmt.setString(2,CustCodeL); //pstmt.setString(2,CustCodeL); // 12/02/15 manoharan commented and cust_code__dlv considered
pstmt.setString(2,custCodeDlv);
pstmt.setString(3,"N"); pstmt.setString(3,"N");
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()){ if(rs.next()){
...@@ -271,7 +273,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa ...@@ -271,7 +273,8 @@ public class DespatchWiz extends ValidatorEJB implements DespatchWizLocal, Despa
if(ChanPart.length() == 0){ if(ChanPart.length() == 0){
sql="select channel_partner from customer where cust_code = ? and available_yn = ? "; sql="select channel_partner from customer where cust_code = ? and available_yn = ? ";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,CustCodeL); //pstmt.setString(1,CustCodeL); // 12/02/15 manoharan commented and cust_code__dlv considered
pstmt.setString(1,custCodeDlv);
pstmt.setString(2,"N"); pstmt.setString(2,"N");
rs=pstmt.executeQuery(); rs=pstmt.executeQuery();
if(rs.next()){ if(rs.next()){
......
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