Skip to content

B
business-java
Commit 743c7acb authored by mjadhav's avatar mjadhav
Browse files
Options

make received as 'Y' in display purpose 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@98795 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 231e873f
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 58 deletions
webitm-dis/ibase/webitm/ejb/dis/CustStockGWTIC.java
View file @ 743c7acb
...@@ -1694,8 +1694,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1694,8 +1694,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<invoice_id>").append("<![CDATA["+invoiceId+"]]>").append("</invoice_id>"); valueXmlString.append("<invoice_id>").append("<![CDATA["+invoiceId+"]]>").append("</invoice_id>");
valueXmlString.append("<invoice_date>").append("<![CDATA["+sdf.format(invDate)+"]]>").append("</invoice_date>"); valueXmlString.append("<invoice_date>").append("<![CDATA["+sdf.format(invDate)+"]]>").append("</invoice_date>");
//valueXmlString.append("<lr_date>").append("<![CDATA["+invsiteCodeMap.get("lrDate@"+invDomid)+"]]>").append("</lr_date>"); //valueXmlString.append("<lr_date>").append("<![CDATA["+invsiteCodeMap.get("lrDate@"+invDomid)+"]]>").append("</lr_date>");
//valueXmlString.append("<dlv_flg>").append("<![CDATA[Y]]>").append("</dlv_flg>"); valueXmlString.append("<dlv_flg>").append("<![CDATA[Y]]>").append("</dlv_flg>");
valueXmlString.append("<dlv_flg>").append("<![CDATA["+invMap.get(invoiceId)+"]]>").append("</dlv_flg>"); //valueXmlString.append("<dlv_flg>").append("<![CDATA["+invMap.get(invoiceId)+"]]>").append("</dlv_flg>");
valueXmlString.append("<net_amt>").append("<![CDATA["+netAmt+"]]>").append("</net_amt>"); valueXmlString.append("<net_amt>").append("<![CDATA["+netAmt+"]]>").append("</net_amt>");
valueXmlString.append("<lr_no>").append("<![CDATA["+lrNo+"]]>").append("</lr_no>"); valueXmlString.append("<lr_no>").append("<![CDATA["+lrNo+"]]>").append("</lr_no>");
...@@ -1957,15 +1957,17 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -1957,15 +1957,17 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
{ {
invCnt++; invCnt++;
valueXmlString.append("<Detail3 dbID='' domID='"+invCnt+"' objName=\"cust_stock_gwt\" objContext=\"3\">"); valueXmlString.append("<Detail3 dbID='' domID='"+invCnt+"' objName=\"cust_stock_gwt\" objContext=\"3\">");
valueXmlString.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />"); // valueXmlString.append("<attribute pkNames=\"\" selected=\"N\" updateFlag=\"A\" status=\"N\" />");
//
valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"A\" status=\"N\" />");
//valueXmlString.append("<dlv_flg>").append("<![CDATA[N]]>").append("</dlv_flg>"); //valueXmlString.append("<dlv_flg>").append("<![CDATA[N]]>").append("</dlv_flg>");
valueXmlString.append("<tran_id>").append("<![CDATA["+tranIdNew+"]]>").append("</tran_id>"); valueXmlString.append("<tran_id>").append("<![CDATA["+tranIdNew+"]]>").append("</tran_id>");
valueXmlString.append("<invoice_id>").append("<![CDATA["+invMap.get("invoiceId@"+invDomid)+"]]>").append("</invoice_id>"); valueXmlString.append("<invoice_id>").append("<![CDATA["+invMap.get("invoiceId@"+invDomid)+"]]>").append("</invoice_id>");
valueXmlString.append("<invoice_date>").append("<![CDATA["+invMap.get("invDate@"+invDomid)+"]]>").append("</invoice_date>"); valueXmlString.append("<invoice_date>").append("<![CDATA["+invMap.get("invDate@"+invDomid)+"]]>").append("</invoice_date>");
valueXmlString.append("<lr_date>").append("<![CDATA["+invMap.get("lrDate@"+invDomid)+"]]>").append("</lr_date>"); valueXmlString.append("<lr_date>").append("<![CDATA["+invMap.get("lrDate@"+invDomid)+"]]>").append("</lr_date>");
//valueXmlString.append("<dlv_flg>").append("<![CDATA[Y]]>").append("</dlv_flg>"); valueXmlString.append("<dlv_flg>").append("<![CDATA[Y]]>").append("</dlv_flg>");
valueXmlString.append("<dlv_flg>").append("<![CDATA["+invMap.get("dlvFlag@"+invDomid)+"]]>").append("</dlv_flg>"); //valueXmlString.append("<dlv_flg>").append("<![CDATA["+invMap.get("dlvFlag@"+invDomid)+"]]>").append("</dlv_flg>");
valueXmlString.append("<net_amt>").append("<![CDATA["+invMap.get("netAmt@"+invDomid)+"]]>").append("</net_amt>"); valueXmlString.append("<net_amt>").append("<![CDATA["+invMap.get("netAmt@"+invDomid)+"]]>").append("</net_amt>");
valueXmlString.append("<lr_no>").append("<![CDATA["+invMap.get("lrNo@"+invDomid)+"]]>").append("</lr_no>"); valueXmlString.append("<lr_no>").append("<![CDATA["+invMap.get("lrNo@"+invDomid)+"]]>").append("</lr_no>");
...@@ -2168,7 +2170,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2168,7 +2170,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
* tranIdNew : Transaction Id of current month. * tranIdNew : Transaction Id of current month.
* *
*/ */
System.out.println("Retrive Item Details data from previous month or current month which is exist in CUST_STOK_DET !!!!"); System.out.println("Retrive Item Details data from previous month or current month which is exist in CUST_STOK_DET !!!!!!!!!!!!!");
sql= "select item_code,unit,op_stock ,sales,purc_rcp,cl_stock,purc_ret,rate,line_no,transit_qty,item_ser ,purc_rcp__repl ,purc_rcp__free,purc_ret__repl,purc_ret__free,transit_qty__repl,transit_qty__free ,loc_type " + sql= "select item_code,unit,op_stock ,sales,purc_rcp,cl_stock,purc_ret,rate,line_no,transit_qty,item_ser ,purc_rcp__repl ,purc_rcp__free,purc_ret__repl,purc_ret__free,transit_qty__repl,transit_qty__free ,loc_type " +
" from cust_stock_det where tran_id=? "; " from cust_stock_det where tran_id=? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
...@@ -2454,58 +2456,67 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2454,58 +2456,67 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
} }
System.out.println("primarySales cal for avaible transcation id :"+primarySales); System.out.println("primarySales cal for avaible transcation id :"+primarySales);
if(receiptLast > 0)
valueXmlString.append( "<Detail4 dbID='' domID='"+itmDetCnt+"' objContext='"+currentFormNo+"' selected='N'>\r\n" );
if(tranIdNew.length() > 0)
{ {
valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"E\" status=\"O\" />");
valueXmlString.append( "<Detail4 dbID='' domID='"+itmDetCnt+"' objContext='"+currentFormNo+"' selected='N'>\r\n" );
valueXmlString.append("<tran_id><![CDATA["+ tranIdNew+"]]></tran_id>"); if(tranIdNew.length() > 0)
{
valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"E\" status=\"O\" />");
} valueXmlString.append("<tran_id><![CDATA["+ tranIdNew+"]]></tran_id>");
else
{ }
valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"A\" status=\"N\" />"); else
{
valueXmlString.append("<attribute pkNames=\"\" selected=\"Y\" updateFlag=\"A\" status=\"N\" />");
valueXmlString.append("<tran_id><![CDATA["+ tranIdNew+"]]></tran_id>");
}
lineNoStr = " " + lineNoCustSt;
lineNoStr = lineNoStr.substring(lineNoStr.length() - 3);
System.out.println("lineNoStr " + lineNoStr);
valueXmlString.append("<line_no>").append("<![CDATA["+lineNoStr+"]]>").append("</line_no>");
valueXmlString.append("<item_code sSrvCallOnChg='1'>").append("<![CDATA["+itemCodeLast+"]]>").append("</item_code>");
valueXmlString.append("<item_ser>").append("<![CDATA["+itemSerLast+"]]>").append("</item_ser>");
valueXmlString.append("<descr>").append("<![CDATA["+descrLast+"]]>").append("</descr>");
//valueXmlString.append("<primary_sales>").append("<![CDATA[0]]>").append("</primary_sales>");
valueXmlString.append("<tran_id><![CDATA["+ tranIdNew+"]]></tran_id>"); valueXmlString.append("<unit>").append("<![CDATA["+unitLast+"]]>").append("</unit>");
valueXmlString.append("<loc_type>").append("<![CDATA["+locTypeLast+"]]>").append("</loc_type>");
valueXmlString.append("<rate>").append("<![CDATA["+rateLast+"]]>").append("</rate>");
valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+opStockLast+"]]>").append("</op_stock>");
} valueXmlString.append("<purc_rcp>").append("<![CDATA["+rcpChargableLast+"]]>").append("</purc_rcp>");
lineNoStr = " " + lineNoCustSt; valueXmlString.append("<purc_rcp__repl>").append("<![CDATA["+rcpFreesLast+"]]>").append("</purc_rcp__repl>");
lineNoStr = lineNoStr.substring(lineNoStr.length() - 3); valueXmlString.append("<purc_rcp__free>").append("<![CDATA[0.0]]>").append("</purc_rcp__free>");
System.out.println("lineNoStr " + lineNoStr);
valueXmlString.append("<line_no>").append("<![CDATA["+lineNoStr+"]]>").append("</line_no>"); valueXmlString.append("<purc_ret>").append("<![CDATA["+returnLast+"]]>").append("</purc_ret>");
valueXmlString.append("<item_code sSrvCallOnChg='1'>").append("<![CDATA["+itemCodeLast+"]]>").append("</item_code>"); valueXmlString.append("<purc_ret__repl>").append("<![CDATA["+retFreeQty+"]]>").append("</purc_ret__repl>");
valueXmlString.append("<item_ser>").append("<![CDATA["+itemSerLast+"]]>").append("</item_ser>"); valueXmlString.append("<purc_ret__free>").append("<![CDATA[0.0]]>").append("</purc_ret__free>");
valueXmlString.append("<descr>").append("<![CDATA["+descrLast+"]]>").append("</descr>"); valueXmlString.append("<sales>").append("<![CDATA["+salesLast+"]]>").append("</sales>");
//valueXmlString.append("<primary_sales>").append("<![CDATA[0]]>").append("</primary_sales>"); if(tranIdNew.length() > 0)
{
valueXmlString.append("<unit>").append("<![CDATA["+unitLast+"]]>").append("</unit>"); valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA["+clStockNew+"]]>").append("</cl_stock>");
valueXmlString.append("<loc_type>").append("<![CDATA["+locTypeLast+"]]>").append("</loc_type>"); }
valueXmlString.append("<rate>").append("<![CDATA["+rateLast+"]]>").append("</rate>"); else
valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+opStockLast+"]]>").append("</op_stock>"); {
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA[0.0]]>").append("</cl_stock>");
valueXmlString.append("<purc_rcp>").append("<![CDATA["+rcpChargableLast+"]]>").append("</purc_rcp>"); }
valueXmlString.append("<purc_rcp__repl>").append("<![CDATA["+rcpFreesLast+"]]>").append("</purc_rcp__repl>"); //valueXmlString.append("<purc_rcp>").append("<![CDATA["+receiptLast+"]]>").append("</purc_rcp>");
valueXmlString.append("<purc_rcp__free>").append("<![CDATA[0.0]]>").append("</purc_rcp__free>"); //valueXmlString.append("<purc_ret>").append("<![CDATA["+returnLast+"]]>").append("</purc_ret>");
valueXmlString.append("<purc_ret>").append("<![CDATA["+returnLast+"]]>").append("</purc_ret>"); valueXmlString.append("<transit_qty>").append("<![CDATA["+transitCharQty+"]]>").append("</transit_qty>");
valueXmlString.append("<purc_ret__repl>").append("<![CDATA["+retFreeQty+"]]>").append("</purc_ret__repl>"); valueXmlString.append("<transit_qty__repl>").append("<![CDATA["+transitQtyFreesLast+"]]>").append("</transit_qty__repl>");
valueXmlString.append("<purc_ret__free>").append("<![CDATA[0.0]]>").append("</purc_ret__free>"); valueXmlString.append("<transit_qty__free>").append("<![CDATA[0.0]]>").append("</transit_qty__free>");
valueXmlString.append("<sales>").append("<![CDATA["+salesLast+"]]>").append("</sales>"); valueXmlString.append("<primary_sales>").append("<![CDATA["+primarySales+"]]>").append("</primary_sales>");
valueXmlString.append("<chg_user>").append("<![CDATA["+chgUser+"]]>").append("</chg_user>");
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA["+clStockNew+"]]>").append("</cl_stock>"); valueXmlString.append("<chg_term>").append("<![CDATA["+chgTerm+"]]>").append("</chg_term>");
//valueXmlString.append("<purc_rcp>").append("<![CDATA["+receiptLast+"]]>").append("</purc_rcp>"); valueXmlString.append("<chg_date>").append("<![CDATA["+sdf.format(currentDate)+"]]>").append("</chg_date>");
//valueXmlString.append("<purc_ret>").append("<![CDATA["+returnLast+"]]>").append("</purc_ret>"); valueXmlString.append("</Detail4>");
valueXmlString.append("<transit_qty>").append("<![CDATA["+transitCharQty+"]]>").append("</transit_qty>"); }
valueXmlString.append("<transit_qty__repl>").append("<![CDATA["+transitQtyFreesLast+"]]>").append("</transit_qty__repl>");
valueXmlString.append("<transit_qty__free>").append("<![CDATA[0.0]]>").append("</transit_qty__free>");
valueXmlString.append("<primary_sales>").append("<![CDATA["+primarySales+"]]>").append("</primary_sales>");
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("</Detail4>");
System.out.println("Detail4 cal for avaible transcation id :"+valueXmlString); System.out.println("Detail4 cal for avaible transcation id :"+valueXmlString);
...@@ -2838,7 +2849,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2838,7 +2849,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
for(int itemDomId = 1 ; itemDomId <= lineNoItmCnt ; itemDomId++) for(int itemDomId = 1 ; itemDomId <= lineNoItmCnt ; itemDomId++)
{ {
System.out.println("itemListLast :"+itemListLast); System.out.println("itemListLast!!! :"+itemListLast);
System.out.println("itemCode : "+itemMap.get("itemCode@"+itemDomId)); System.out.println("itemCode : "+itemMap.get("itemCode@"+itemDomId));
//valueXmlString.append( "<Detail4 dbID='' domID='"+itemDomId+"' objContext='"+currentFormNo+"' selected='N'>\r\n" ); //valueXmlString.append( "<Detail4 dbID='' domID='"+itemDomId+"' objContext='"+currentFormNo+"' selected='N'>\r\n" );
if(itemListLast.contains(itemMap.get("itemCode@"+itemDomId))) if(itemListLast.contains(itemMap.get("itemCode@"+itemDomId)))
...@@ -2848,8 +2859,16 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2848,8 +2859,16 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
} }
else else
{ {
itmDetCnt++;
lineNoCustSt = lineNoCustSt + 1; double rcpQuantity=0.0;
rcpQuantity = Double.parseDouble(itemMap.get("mquantRcp@"+itemDomId));
if(rcpQuantity > 0)
{
itmDetCnt++;
lineNoCustSt = lineNoCustSt + 1;
valueXmlString.append( "<Detail4 dbID='' domID='"+itmDetCnt+"' objContext='"+currentFormNo+"' selected='N'>\r\n" ); valueXmlString.append( "<Detail4 dbID='' domID='"+itmDetCnt+"' objContext='"+currentFormNo+"' selected='N'>\r\n" );
/* if(tranIdLast.trim().length() == 0 && tranIdNew.trim().length() > 0 ) /* if(tranIdLast.trim().length() == 0 && tranIdNew.trim().length() > 0 )
...@@ -2877,7 +2896,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2877,7 +2896,9 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<loc_type>").append("<![CDATA["+itemMap.get("mlType@"+itemDomId)+"]]>").append("</loc_type>"); valueXmlString.append("<loc_type>").append("<![CDATA["+itemMap.get("mlType@"+itemDomId)+"]]>").append("</loc_type>");
valueXmlString.append("<rate>").append("<![CDATA["+itemMap.get("rate@"+itemDomId)+"]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA["+itemMap.get("rate@"+itemDomId)+"]]>").append("</rate>");
valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</op_stock>"); valueXmlString.append("<op_stock protect='1'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</op_stock>");
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA["+itemMap.get("mopStk@"+itemDomId)+"]]>").append("</cl_stock>");
valueXmlString.append("<cl_stock protect='0'>").append("<![CDATA[0.0]]>").append("</cl_stock>");
valueXmlString.append("<purc_rcp>").append("<![CDATA["+itemMap.get("mquantRcp@"+itemDomId)+"]]>").append("</purc_rcp>"); valueXmlString.append("<purc_rcp>").append("<![CDATA["+itemMap.get("mquantRcp@"+itemDomId)+"]]>").append("</purc_rcp>");
valueXmlString.append("<purc_rcp__repl>").append("<![CDATA["+itemMap.get("rcpFreesAll@"+itemDomId)+"]]>").append("</purc_rcp__repl>"); valueXmlString.append("<purc_rcp__repl>").append("<![CDATA["+itemMap.get("rcpFreesAll@"+itemDomId)+"]]>").append("</purc_rcp__repl>");
...@@ -2898,6 +2919,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal, ...@@ -2898,6 +2919,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
valueXmlString.append("<primary_sales>").append("<![CDATA["+itemMap.get("primarySales@"+itemDomId)+"]]>").append("</primary_sales>"); valueXmlString.append("<primary_sales>").append("<![CDATA["+itemMap.get("primarySales@"+itemDomId)+"]]>").append("</primary_sales>");
valueXmlString.append("</Detail4>"); valueXmlString.append("</Detail4>");
}
} }
System.out.println("valueXmlString add flag >>> "+valueXmlString); System.out.println("valueXmlString add flag >>> "+valueXmlString);
......
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