Commit acd4d3be authored by caluka's avatar caluka

branch changes incorporated to head version


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102790 ce508802-f39f-4f6c-b175-0d175dae99d5
parent fffab3bb
......@@ -57,7 +57,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
java.sql.Timestamp prdtoDateTstmp =null;
static java.sql.Timestamp prdtoDateTmstmp =null,prdFromoDateTmstmp=null;
static String custCodeStatic="";
static String countryCode="";
static String countryCode="",loginPositionCode="";
static String selectedInvList ="";
static String itemSerHeaderSplit="";
static String orderTypeHeader="";
......@@ -443,13 +443,14 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
//sql = "select count(*) from period_tbl where prd_code=? ";
sql = "select count(*) from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
//"and a.site_code=? " +
" AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(2,period.trim());
pstmt.setString(3,countryCode+"_"+itemSer.trim());
//pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(1,period.trim());
pstmt.setString(2,countryCode+"_"+itemSer.trim());
rs = pstmt.executeQuery();
if (rs.next())
{
......@@ -474,13 +475,14 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
",b.entry_end_dt as entry_end_dt" +
" from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
//"and a.site_code=? " +
" AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(2,period.trim());
pstmt.setString(3,countryCode+"_"+itemSer.trim());
//pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(1,period.trim());
pstmt.setString(2,countryCode+"_"+itemSer.trim());
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -498,15 +500,16 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
sql = "select count(*) from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
//"and a.site_code=? " +
"AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' " +
" and ? between entry_start_dt and entry_end_dt";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(2,period.trim());
pstmt.setString(3,countryCode+"_"+itemSer.trim());
pstmt.setTimestamp(4, dbSysDate);
//pstmt.setString(1,loginSiteCode.trim());
pstmt.setString(1,period.trim());
pstmt.setString(2,countryCode+"_"+itemSer.trim());
pstmt.setTimestamp(3, dbSysDate);
rs = pstmt.executeQuery();
if (rs.next())
{
......@@ -583,7 +586,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
//"and custser.item_ser=org.table_no " +
" AND orgcust.pos_code =? " +
"AND org.table_no =? " +
"and org.version_id in (select max(version_id) from org_structure ) " +
"and org.version_id = (select FN_GET_VERSION_ID from dual) " +
" AND (cust.SH_NAME LIKE upper(?) or cust.cust_code LIKE upper(?) " +
"OR cust.cust_name LIKE upper(?)) " +
"and state.count_code=? " +
......@@ -710,7 +713,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
if(childNodeName.equalsIgnoreCase("pos_code"))
{
//positionCode = this.genericUtility.getColumnValue("pos_code",dom);
loginEmpCode = this.genericUtility.getColumnValue("emp_code",dom);
/*loginEmpCode = this.genericUtility.getColumnValue("emp_code",dom);
sql = "select pos_code from employee where emp_code=? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginEmpCode);
......@@ -722,25 +725,30 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
rs.close();
rs = null;
pstmt.close();
pstmt = null;
pstmt = null;*/
System.out.println("loginPositionCode before>>>"+loginPositionCode);
loginPositionCode = this.genericUtility.getColumnValue("login_poscode",dom);
System.out.println("loginPositionCode after>>>"+loginPositionCode);
positionCode = this.genericUtility.getColumnValue("pos_code",dom);
sql ="SELECT trim(A.POS_CODE) as pos_code FROM ORG_STRUCTURE A ,EMPLOYEE C" +
" WHERE A.VERSION_ID IN(SELECT MAX(VERSION_ID) FROM ORG_STRUCTURE D) " +
"AND A.EMP_CODE(+)=C.EMP_CODE " +
" WHERE A.VERSION_ID =(select FN_GET_VERSION_ID from dual) " +
//"AND A.EMP_CODE(+)=C.EMP_CODE " +
"AND A.EMP_CODE = C.EMP_CODE(+) " +//vaccant employee display
"AND A.POS_CODE IN(SELECT C.POS_CODE FROM ORG_STRUCTURE C START WITH C.POS_CODE=? " +
" CONNECT BY PRIOR C.POS_CODE=C.POS_CODE__REPTO " +
"AND C.VERSION_ID =(SELECT MAX(VERSION_ID) " +
"FROM ORG_STRUCTURE E) ) ORDER BY LEVEL_NO";
"AND C.VERSION_ID =(select FN_GET_VERSION_ID from dual) " +
" ) ORDER BY LEVEL_NO";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginPosCode);
pstmt.setString(1,loginPositionCode);
rs = pstmt.executeQuery();
while (rs.next())
{
positionCodeStr = checkNull(rs.getString("pos_code")).trim();
positionList.add(positionCodeStr);
}
System.out.println("loginPosCode@@@@@@@@["+loginPosCode+"]");
System.out.println("positionCode@@@@@@@@["+positionCode+"]");
System.out.println("positionList>>>>>>"+positionList);
if(!positionList.contains(loginPosCode))
if(!positionList.contains(positionCode.trim()))
{
System.out.println("position code is not exist in ORG_STRUCTURE");
errCode = "VTPOSCODE";
......@@ -1415,7 +1423,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
Date tranDateEdit=null;
Timestamp dbRelativeDate=null;
Timestamp dbNextMonthDate=null;
Timestamp dbSysDate= null;
Timestamp dbSysDate= null,addDate=null;
java.sql.Timestamp ToDate = null,FromDate=null,compDate=null,prdFrom=null,prdTo=null,tranDate=null,prvToDt=null;
Timestamp tranDtTstmp = null,frmDateTstmp=null,toDateTstmp=null,orderDtTstmp=null;
Timestamp fromDatetmstmp=null,previousDay=null,frmDate1=null;
......@@ -1501,9 +1509,20 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
pstmt1.close();
pstmt1 = null;
System.out.println("countryCode@@@@@>>>"+countryCode);
sql = "select pos_code from employee where emp_code=? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, spCode);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
loginPositionCode = checkNull(rs1.getString("pos_code")).trim();
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
// Added By Chandrashekar - Suggested by Prajyot - Start
String sqlFirstDefData = " SELECT CS.POS_CODE,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," +
String sqlFirstDefData = " SELECT CS.ADD_USER,CS.ADD_TERM,CS.ADD_DATE,CS.POS_CODE,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 " +
" FROM CUST_STOCK CS , CUSTOMER C " +
" WHERE CS.CUST_CODE = C.CUST_CODE AND CS.TRAN_ID = ? " ;
......@@ -1549,6 +1568,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<Detail1 domID='1' objContext='1'>");
if (rs.next())
{
addDate = rs.getTimestamp("ADD_DATE");
fromDate1 = rs.getDate("FROM_DATE");
toDate1 = rs.getDate("TO_DATE");
tranDateEdit = rs.getDate("TRAN_DATE");
......@@ -1580,13 +1600,14 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
// ",b.entry_end_dt as entry_end_dt" +
" from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
//"and a.site_code=?" +
" AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,loginSiteCode);
pstmt1.setString(2,rs.getString("PRD_CODE"));
pstmt1.setString(3, countryCode.trim()+"_"+rs.getString("ITEM_SER").trim());
//pstmt1.setString(1,loginSiteCode);
pstmt1.setString(1,rs.getString("PRD_CODE"));
pstmt1.setString(2, countryCode.trim()+"_"+rs.getString("ITEM_SER").trim());
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
......@@ -1735,11 +1756,21 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag +"]]>").append("</edit_status>");
valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>");
valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>");
valueXmlString.append("<login_poscode>").append("<![CDATA["+loginPositionCode +"]]>").append("</login_poscode>");
valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>");
valueXmlString.append("<emp_code protect='1'>").append("<![CDATA["+empCode+"]]>").append("</emp_code>");
valueXmlString.append("<pos_code protect='1'>").append("<![CDATA["+rs.getString("POS_CODE")+"]]>").append("</pos_code>");
valueXmlString.append("<emp_name>").append("<![CDATA["+empName+"]]>").append("</emp_name>");
valueXmlString.append("<position_descr>").append("<![CDATA["+positionDescr+"]]>").append("</position_descr>");
valueXmlString.append("<add_user>").append("<![CDATA[" + rs.getString("ADD_USER") + "]]>").append("</add_user>");
valueXmlString.append("<add_term>").append("<![CDATA[" + rs.getString("ADD_TERM") + "]]>").append("</add_term>");
if(addDate !=null)
{
valueXmlString.append("<add_date>").append("<![CDATA[" + sdf.format(addDate) + "]]>").append("</add_date>");
}else
{
valueXmlString.append("<add_date protect='1'>").append("<![CDATA[]]>").append("</add_date>");
}
/*if(entryStartDt !=null)
{
valueXmlString.append("<entry_start_dt protect='1'>").append("<![CDATA["+sdf.format(entryStartDt).toString()+"]]>").append("</entry_start_dt>");
......@@ -1777,17 +1808,19 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
empName = checkNull(rs1.getString("name"));
positionCode = checkNull(rs1.getString("pos_code")).trim();
System.out.println("empName edit :" + empName);
loginPositionCode=positionCode;
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
sql = "select table_no from org_structure where pos_code=? and emp_code=?" +
" and version_id in (select max(version_id) from org_structure ) ";
sql = "select table_no from org_structure where pos_code=? " +
//"and emp_code=?" +
" and version_id = (select FN_GET_VERSION_ID from dual) ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, positionCode);
pstmt1.setString(2, spCode);
//pstmt1.setString(2, spCode);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
......@@ -1850,15 +1883,15 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
//Start added by chandrashekar on 18-jan-2016
sql = "select b.FR_DATE as fr_date,b.TO_DATE as to_date,prd_code from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? " +
//"and a.site_code=? " +
//" AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' "+
"and CASE WHEN b.prd_closed IS NULL THEN 'N' ELSE b.prd_closed END='N' " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode);
//pstmt.setString(1,loginSiteCode);
//pstmt.setString(2,period.trim());
pstmt.setString(2,countryIemSer);
pstmt.setString(1,countryIemSer);
/*sql = "SELECT fr_date,prd_code,to_date FROM period_tbl WHERE prd_tblno" +
" IN(SELECT PRD_TBLNO FROM PERIOD_APPL WHERE SITE_CODE=? AND REF_CODE=? AND PRD_TBLNO =? ) " +
......@@ -1900,14 +1933,15 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
// ",b.entry_end_dt as entry_end_dt" +
" from period_appl a,period_tbl b " +
"where a.ref_code=a.prd_tblno and a.prd_tblno=b.prd_tblno " +
"and a.site_code=? AND b.prd_code = ? " +
//"and a.site_code=?" +
" AND b.prd_code = ? " +
"and b.prd_tblno=? " +
"AND case when a.type is null then 'X' else a.type end='S' "+
"and CASE WHEN b.prd_closed IS NULL THEN 'N' ELSE b.prd_closed END='N' " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,loginSiteCode);
pstmt.setString(2,period.trim());
pstmt.setString(3,countryIemSer);
//pstmt.setString(1,loginSiteCode);
pstmt.setString(1,period.trim());
pstmt.setString(2,countryIemSer);
/*pstmt = conn.prepareStatement(sql);
pstmt.setString(1, period);
......@@ -2057,6 +2091,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<chg_user>").append("<![CDATA[" + chgUser + "]]>").append("</chg_user>");
valueXmlString.append("<chg_term>").append("<![CDATA[" + chgTerm + "]]>").append("</chg_term>");
valueXmlString.append("<chg_date>").append("<![CDATA[" + sdf.format(currentDate) + "]]>").append("</chg_date>");
valueXmlString.append("<add_user>").append("<![CDATA[" + chgUser + "]]>").append("</add_user>");
valueXmlString.append("<add_term>").append("<![CDATA[" + chgTerm + "]]>").append("</add_term>");
valueXmlString.append("<add_date>").append("<![CDATA[" + sdf.format(currentDate) + "]]>").append("</add_date>");
valueXmlString.append("<missing_inserted>").append("<![CDATA[Y]]>").append("</missing_inserted>");
valueXmlString.append("<cust_type protect='1'>").append("<![CDATA[" + custType + "]]>").append("</cust_type>");
valueXmlString.append("<cust_type__descr protect='1'>").append("<![CDATA[" + custTypeDescr + "]]>").append("</cust_type__descr>");
......@@ -2069,6 +2106,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<edit_status>").append("<![CDATA["+editFlag +"]]>").append("</edit_status>");
valueXmlString.append("<prv_tran_id>").append("<![CDATA["+tranId +"]]>").append("</prv_tran_id>");
valueXmlString.append("<startForm>").append("<![CDATA["+startForm +"]]>").append("</startForm>");
valueXmlString.append("<login_poscode>").append("<![CDATA["+loginPositionCode +"]]>").append("</login_poscode>");
valueXmlString.append("<country_code>").append("<![CDATA["+countryCode +"]]>").append("</country_code>");
valueXmlString.append("<emp_code protect='1' >").append("<![CDATA["+spCode+"]]>").append("</emp_code>");
valueXmlString.append("<pos_code>").append("<![CDATA["+positionCode+"]]>").append("</pos_code>");
......@@ -2468,10 +2506,17 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
System.out.println("@@@@position code item change called@@@@");
positionCode = checkNull(genericUtility.getColumnValue("pos_code",dom));
loginPositionCode = checkNull(genericUtility.getColumnValue("login_poscode",dom));
System.out.println("positionCode code itemchange value"+positionCode);
System.out.println("loginPositionCode dom itemchange value"+loginPositionCode);
if(positionCode == null || positionCode.trim().length()==0)
{
positionCode=loginPositionCode;
}
sql= " select table_no,emp_code from org_structure where pos_code=? " +
" and version_id in (select max(version_id) from org_structure )";
" and version_id = (select FN_GET_VERSION_ID from dual)";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, positionCode);
rs = pstmt.executeQuery();
......@@ -2532,6 +2577,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<item_ser protect='1'>").append("<![CDATA["+itemSer+"]]>").append("</item_ser>");
valueXmlString.append("<itemser_descr protect='1'>").append("<![CDATA["+itemSerName+"]]>").append("</itemser_descr>");
valueXmlString.append("<position_descr>").append("<![CDATA["+positionDescr+"]]>").append("</position_descr>");
valueXmlString.append("<login_poscode>").append("<![CDATA["+loginPositionCode +"]]>").append("</login_poscode>");
valueXmlString.append("</Detail1>");
}
......@@ -2882,7 +2928,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
valueXmlString.append("<dlv_flg>").append("<![CDATA["+dlvFlag+"]]>").append("</dlv_flg>");
}
valueXmlString.append("<net_amt>").append("<![CDATA["+netAmtFinal+"]]>").append("</net_amt>");
//valueXmlString.append("<net_amt>").append("<![CDATA["+netAmtFinal+"]]>").append("</net_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(netAmt)+"]]>").append("</net_amt>");
valueXmlString.append("<lr_no>").append("<![CDATA["+lrNo+"]]>").append("</lr_no>");
if(lrDate != null)
......@@ -3162,9 +3209,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
invMap.put("lrDate@"+domID3,"");
}
//invMap.put("netAmt@"+domID3, String.valueOf(netAmt));
invMap.put("netAmt@"+domID3, netAmtFinal);
invMap.put("netAmt@"+domID3, String.valueOf(netAmt));
//invMap.put("netAmt@"+domID3, netAmtFinal);
dlvFlagStock=GetDlvFlag(invoiceId,conn);
System.out.println("dlvFlagStock :"+dlvFlagStock);
invMap.put("dlvFlag@"+domID3,dlvFlagStock);
......@@ -3224,7 +3270,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{
valueXmlString.append("<dlv_flg>").append("<![CDATA[Y]]>").append("</dlv_flg>");
}
valueXmlString.append("<net_amt>").append("<![CDATA["+invMap.get("netAmt@"+invDomid).toString() +"]]>").append("</net_amt>");
valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(Double.parseDouble(invMap.get("netAmt@"+invDomid).toString())) +"]]>").append("</net_amt>");
//valueXmlString.append("<net_amt>").append("<![CDATA["+invMap.get("netAmt@"+invDomid).toString() +"]]>").append("</net_amt>");
valueXmlString.append("<lr_no>").append("<![CDATA["+invMap.get("lrNo@"+invDomid)+"]]>").append("</lr_no>");
valueXmlString.append("<tran_code>").append("<![CDATA["+invMap.get("tranCode@"+invDomid)+"]]>").append("</tran_code>");
valueXmlString.append("<tran_name>").append("<![CDATA["+invMap.get("tranName@"+invDomid)+"]]>").append("</tran_name>");
......@@ -4717,6 +4764,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
lineNoStrDom = " " + lineNo;
lineNoStrDom = lineNoStrDom.substring(lineNoStrDom.length() - 3);
System.out.println("lineNoStrDom for add new record" + lineNoStrDom);
Node detail1Node1 = dom2.getElementsByTagName("Detail1").item(0);
itemSer = checkNull(genericUtility.getColumnValueFromNode("item_ser", detail1Node1));
System.out.println("itemSer add new record>>>"+itemSer);
//itmDetCnt++;
//System.out.println("itmDetCnt>>After>>>"+itmDetCnt);
valueXmlString.append("<Detail3 domID='" + lineNo + "' objContext=\"3\" selected=\"Y\">\r\n");
......@@ -4724,7 +4775,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<tran_id><![CDATA["+ tranIdNew+"]]></tran_id>");
valueXmlString.append("<line_no>").append("<![CDATA["+lineNoStrDom+"]]>").append("</line_no>");
valueXmlString.append("<item_code protect='0'>").append("<![CDATA[]]>").append("</item_code>");
valueXmlString.append("<item_ser>").append("<![CDATA[]]>").append("</item_ser>");
valueXmlString.append("<item_ser>").append("<![CDATA["+itemSer+"]]>").append("</item_ser>");
valueXmlString.append("<descr>").append("<![CDATA[]]>").append("</descr>");
valueXmlString.append("<unit>").append("<![CDATA[]]>").append("</unit>");
valueXmlString.append("<loc_type>").append("<![CDATA[]]>").append("</loc_type>");
......
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