Commit c84c3a1e authored by caluka's avatar caluka

employee code and position code fields added for cust_stock table


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@99843 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 43571419
...@@ -119,8 +119,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -119,8 +119,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
String custType="",custType1=""; String custType="",custType1="";
String fromDateStr ="",toDateStr="",custTypeDom=""; String fromDateStr ="",toDateStr="",custTypeDom="";
String loginSiteCode="",periodStatus="",editSatus=""; String loginSiteCode="",periodStatus="",editSatus="";
String salePer="",countryCode1=""; String salePer="",countryCode1="",empCode="";
int pohelpCnt=0; int pohelpCnt=0,empCnt=0;
int ctr = 0,currentFormNo=0,cnt=0,countCustRef=0,refSerCnt=0,childNodeListLength=0,invCnt=0,clStockInteger=0; int ctr = 0,currentFormNo=0,cnt=0,countCustRef=0,refSerCnt=0,childNodeListLength=0,invCnt=0,clStockInteger=0;
int custstockCnt=0,custstockCnt1=0; int custstockCnt=0,custstockCnt1=0;
double clStock=0.0,opStockDom=0.0,purRcpDom=0.0; double clStock=0.0,opStockDom=0.0,purRcpDom=0.0;
...@@ -534,6 +534,39 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -534,6 +534,39 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("currentDate :"+currentDate); System.out.println("currentDate :"+currentDate);
} }
if(childNodeName.equalsIgnoreCase("emp_code"))
{
empCode = this.genericUtility.getColumnValue("emp_code",dom);
if(empCode == null || empCode.trim().length()==0)
{
errCode = "VTEMPCDNUL";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
else
{
sql = "select count(*) from employee where emp_code=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,empCode);
rs = pstmt.executeQuery();
if (rs.next())
{
empCnt = rs.getInt(1);
}
if (empCnt == 0)
{
errCode = "VTEMPCD";
errList.add(errCode);
errFields.add(childNodeName.toLowerCase());
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
}
}
} }
break; break;
...@@ -1086,7 +1119,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1086,7 +1119,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
String currentTranId="",periodStatus="",loginSiteCode="",stmtDateStr=""; String currentTranId="",periodStatus="",loginSiteCode="",stmtDateStr="";
String toDateStr="",fromDateStr="",sretunTranId="",tranIdItem="",invoiceIdStr=""; String toDateStr="",fromDateStr="",sretunTranId="",tranIdItem="",invoiceIdStr="";
String startForm="", netAmtFinal="",netAmtStr="",countryIemSer="",priceList=""; String startForm="", netAmtFinal="",netAmtStr="",countryIemSer="",priceList="";
String confirmed="",status="",errString=""; String confirmed="",status="",errString="",empCode="",positionCode="",empName="";
double opStockLast=0.0,sales=0.0,transitQty=0.0,salesLast=0.0,receiptLast=0.0,clStockLast=0.0,returnLast=0.0,rateLast=0.0,salesQty=0.0,clStock=0.0; double opStockLast=0.0,sales=0.0,transitQty=0.0,salesLast=0.0,receiptLast=0.0,clStockLast=0.0,returnLast=0.0,rateLast=0.0,salesQty=0.0,clStock=0.0;
double netAmt=0.0,opStkItem=0.0,retQty = 0.0,rcpQty=0.0,rate=0.0,adjQty=0.0,adhocQty=0.0,totRcpQtyAll=0.0; double netAmt=0.0,opStkItem=0.0,retQty = 0.0,rcpQty=0.0,rate=0.0,adjQty=0.0,adhocQty=0.0,totRcpQtyAll=0.0;
double sretQty = 0.0,replQty=0.0,rcpQtyBon=0.0,primarySales=0.0,transitQtyAll=0.0; double sretQty = 0.0,replQty=0.0,rcpQtyBon=0.0,primarySales=0.0,transitQtyAll=0.0;
...@@ -1210,7 +1243,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1210,7 +1243,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
System.out.println("countryCode@@@@@>>>"+countryCode); System.out.println("countryCode@@@@@>>>"+countryCode);
// Added By Chandrashekar - Suggested by Prajyot - Start // Added By Chandrashekar - Suggested by Prajyot - Start
String sqlFirstDefData = " SELECT CS.CUST_CODE CUST_CODE, C.CUST_NAME CUST_NAME, C.CUST_TYPE CUST_TYPE, C.ORDER_TYPE ORDER_TYPE, CS.SITE_CODE SITE_CODE," + String sqlFirstDefData = " SELECT CS.EMP_CODE,CS.CUST_CODE CUST_CODE, C.CUST_NAME CUST_NAME, C.CUST_TYPE CUST_TYPE, C.ORDER_TYPE ORDER_TYPE, CS.SITE_CODE SITE_CODE," +
" CS.FROM_DATE FROM_DATE, CS.TO_DATE TO_DATE, CS.ITEM_SER ITEM_SER, CS.STMT_DATE STMT_DATE, CS.PRD_CODE PRD_CODE,CS.TRAN_DATE TRAN_DATE,CS.TRAN_ID__LAST TRAN_ID__LAST,C.STAN_CODE STAN_CODE " + " CS.FROM_DATE FROM_DATE, CS.TO_DATE TO_DATE, CS.ITEM_SER ITEM_SER, CS.STMT_DATE STMT_DATE, CS.PRD_CODE PRD_CODE,CS.TRAN_DATE TRAN_DATE,CS.TRAN_ID__LAST TRAN_ID__LAST,C.STAN_CODE STAN_CODE " +
" FROM CUST_STOCK CS , CUSTOMER C " + " FROM CUST_STOCK CS , CUSTOMER C " +
" WHERE CS.CUST_CODE = C.CUST_CODE AND CS.TRAN_ID = ? " ; " WHERE CS.CUST_CODE = C.CUST_CODE AND CS.TRAN_ID = ? " ;
...@@ -1338,6 +1371,25 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1338,6 +1371,25 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
custNameStation=rs.getString("CUST_NAME")+"-"+stanDescr; custNameStation=rs.getString("CUST_NAME")+"-"+stanDescr;
empCode=rs.getString("EMP_CODE");
if(empCode != null && empCode.trim().length()>0)
{
//sql = "select emp_fname||emp_mname||emp_lname as name from employee where emp_code=? ";
sql = "select emp_fname||' '||emp_mname||' '||emp_lname as name from employee where emp_code=? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, empCode);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
empName = checkNull(rs1.getString("name"));
System.out.println("empName edit :" + empName);
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
/* /*
valueXmlString.append("<cust_code>").append("<![CDATA["+ rs.getString("CUST_CODE") +"]]>").append("</cust_code>"); valueXmlString.append("<cust_code>").append("<![CDATA["+ rs.getString("CUST_CODE") +"]]>").append("</cust_code>");
valueXmlString.append("<cust_name>").append("<![CDATA["+ rs.getString("CUST_NAME") +"]]>").append("</cust_name>"); valueXmlString.append("<cust_name>").append("<![CDATA["+ rs.getString("CUST_NAME") +"]]>").append("</cust_name>");
...@@ -1386,6 +1438,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1386,6 +1438,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>"); valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>");
valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>"); valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>");
valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>"); valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>");
valueXmlString.append("<emp_code protect='1'>").append("<![CDATA["+empCode+"]]>").append("</emp_code>");
valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
//country_code //country_code
} }
...@@ -1513,6 +1567,19 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1513,6 +1567,19 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt = null; pstmt = null;
} }
sql = "select emp_fname||' '||emp_mname||' '||emp_lname as name from employee where emp_code=? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, spCode);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
empName = checkNull(rs1.getString("name"));
System.out.println("empName edit :" + empName);
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
/*valueXmlString.append("<Detail1 domID='1' objContext='1'>"); /*valueXmlString.append("<Detail1 domID='1' objContext='1'>");
valueXmlString.append("<sale_per>").append("<![CDATA["+spCode+"]]>").append("</sale_per>"); valueXmlString.append("<sale_per>").append("<![CDATA["+spCode+"]]>").append("</sale_per>");
valueXmlString.append("<tran_date>").append("<![CDATA[]]>").append("</tran_date>"); valueXmlString.append("<tran_date>").append("<![CDATA[]]>").append("</tran_date>");
...@@ -1577,6 +1644,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1577,6 +1644,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>"); valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>");
valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>"); valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>");
valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>"); valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>");
valueXmlString.append("<emp_code >").append("<![CDATA["+spCode+"]]>").append("</emp_code>");
valueXmlString.append("<pos_code>").append("<![CDATA["+positionCode+"]]>").append("</pos_code>");
valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
valueXmlString.append("</Detail1>\r\n"); valueXmlString.append("</Detail1>\r\n");
} }
...@@ -1592,6 +1662,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1592,6 +1662,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
stmtDateStr= genericUtility.getColumnValue("stmt_date", dom); stmtDateStr= genericUtility.getColumnValue("stmt_date", dom);
System.out.println("stmtDateStr :"+stmtDateStr); System.out.println("stmtDateStr :"+stmtDateStr);
empCode = checkNull(genericUtility.getColumnValue("emp_code",dom));
spCode=empCode;
sql= " select cust_name,cust_type,order_type,STAN_CODE from customer where cust_code=? "; sql= " select cust_name,cust_type,order_type,STAN_CODE from customer where cust_code=? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode); pstmt.setString(1, custCode);
...@@ -1721,6 +1793,21 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1721,6 +1793,21 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt = null; pstmt = null;
System.out.println("tranIdLast (case 1):" + tranIdLast); System.out.println("tranIdLast (case 1):" + tranIdLast);
//Change by chandra shekar on 26-10-2015 //Change by chandra shekar on 26-10-2015
//Start added by chandra shekar on 07-jan-2016
sql= "select pos_code from org_structure_cust where cust_code=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if(rs.next())
{
positionCode=checkNull(rs.getString("pos_code"));
System.out.println("positionCode :"+positionCode);
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//End added by chandra shekar on 07-jan-2016
valueXmlString.append("<Detail1 domID='1' objContext='1'>"); valueXmlString.append("<Detail1 domID='1' objContext='1'>");
valueXmlString.append("<item_ser protect='1'>").append("<![CDATA["+itemSer+"]]>").append("</item_ser>"); valueXmlString.append("<item_ser protect='1'>").append("<![CDATA["+itemSer+"]]>").append("</item_ser>");
...@@ -1734,6 +1821,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1734,6 +1821,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<cust_type__descr protect='1'>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>"); valueXmlString.append("<cust_type__descr protect='1'>").append("<![CDATA["+custTypeDescr+"]]>").append("</cust_type__descr>");
valueXmlString.append("<stmt_date>").append("<![CDATA["+stmtDateStr+"]]>").append("</stmt_date>"); valueXmlString.append("<stmt_date>").append("<![CDATA["+stmtDateStr+"]]>").append("</stmt_date>");
valueXmlString.append("<tran_id__last>").append("<![CDATA[" + tranIdLast + "]]>").append("</tran_id__last>"); valueXmlString.append("<tran_id__last>").append("<![CDATA[" + tranIdLast + "]]>").append("</tran_id__last>");
valueXmlString.append("<sale_per>").append("<![CDATA["+empCode+"]]>").append("</sale_per>");
valueXmlString.append("<pos_code>").append("<![CDATA["+positionCode+"]]>").append("</pos_code>");
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
} }
if(currentColumn.trim().equals("prd_code")) if(currentColumn.trim().equals("prd_code"))
...@@ -1804,6 +1893,36 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1804,6 +1893,36 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<pophelp_todt>").append("<![CDATA["+toDateStr+"]]>").append("</pophelp_todt>"); valueXmlString.append("<pophelp_todt>").append("<![CDATA["+toDateStr+"]]>").append("</pophelp_todt>");
valueXmlString.append("</Detail1>"); valueXmlString.append("</Detail1>");
} }
//Start added by chandrashekar on 07-jan-2016
if(currentColumn.trim().equals("emp_code"))
{
empCode = checkNull(genericUtility.getColumnValue("emp_code",dom));
System.out.println("Employee code itemchange value"+empCode);
if(empCode != null && empCode.trim().length()>0)
{
sql = "select emp_fname||' '||emp_mname||' '||emp_lname as name from employee where emp_code=? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, empCode);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
empName = checkNull(rs1.getString("name"));
System.out.println("empName item change :" + empName);
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
valueXmlString.append("<Detail1 domID='1' objContext='1'>");
valueXmlString.append("<emp_code >").append("<![CDATA["+empCode+"]]>").append("</emp_code>");
valueXmlString.append("<sale_per protect='1'>").append("<![CDATA["+empCode+"]]>").append("</sale_per>");
valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
valueXmlString.append("</Detail1>");
}
System.out.println("valueXmlString from case 1 :"+valueXmlString); System.out.println("valueXmlString from case 1 :"+valueXmlString);
break; break;
......
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