Skip to content

B
business-java
Commit 09110289 authored by steurwadkar's avatar steurwadkar
Browse files
Options

Sales return changes to set docKey and set rate from pricelist if invoice id... 

Sales return changes to set docKey and set rate from pricelist if invoice id not found in min_rate_history


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@43819 ce508802-f39f-4f6c-b175-0d175dae99d5
parent cc84d300
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 10 deletions
webitm-dis/ibase/webitm/ejb/dis/SalesReturn.java
View file @ 09110289
...@@ -3273,10 +3273,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3273,10 +3273,12 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
curRecordItemLotHMap.put("lot_no", checkNull(rs.getString("LOT_NO"))); curRecordItemLotHMap.put("lot_no", checkNull(rs.getString("LOT_NO")));
curRecordItemLotHMap.put("site_code", checkNull(rs.getString("SITE_CODE"))); curRecordItemLotHMap.put("site_code", checkNull(rs.getString("SITE_CODE")));
curRecordItemLotHMap.put("quantity", invoiceQty); curRecordItemLotHMap.put("quantity", invoiceQty);
minRateDocKey = generateDocKey(dom1, dom, invoiceId, conn);
if(lineNo > 1) if(lineNo > 1)
{ {
invoiceId = getAvailableInvId(dom2, curFormItemLotHMap, curRecordItemLotHMap, invoiceId, adjQty); //Changed by Santosh on 16/05/2017 as invoiceId is not set on itemchange
//invoiceId = getAvailableInvId(dom2, curFormItemLotHMap, curRecordItemLotHMap, invoiceId, adjQty);
invoiceId = getAvailableInvId(dom2, curFormItemLotHMap, curRecordItemLotHMap, invoiceId, minRateDocKey, adjQty);
} }
if( invoiceId != null && invoiceId.trim().length() > 0) if( invoiceId != null && invoiceId.trim().length() > 0)
{ {
...@@ -3331,7 +3333,6 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -3331,7 +3333,6 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
rs = null; rs = null;
}*/ }*/
isMinHisRateSet = true; isMinHisRateSet = true;
minRateDocKey = generateDocKey(dom1, dom, invoiceId, conn);
valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>"); valueXmlString.append("<rate>").append("<![CDATA[" + rate + "]]>").append("</rate>");
valueXmlString.append("<doc_key>").append("<![CDATA[" + minRateDocKey + "]]>").append("</doc_key>"); valueXmlString.append("<doc_key>").append("<![CDATA[" + minRateDocKey + "]]>").append("</doc_key>");
invoiceId = null; invoiceId = null;
...@@ -7754,7 +7755,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -7754,7 +7755,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
curDomDataHMap.put("item_code", itemCode); curDomDataHMap.put("item_code", itemCode);
curDomDataHMap.put("lot_no", lsLotNo); curDomDataHMap.put("lot_no", lsLotNo);
curDomDataHMap.put("site_code", siteCode); curDomDataHMap.put("site_code", siteCode);
curDomDataHMap.put("invoice_id", lsInvoiceId); //Commented and changed by Santosh on 16/05/2017
//curDomDataHMap.put("invoice_id", lsInvoiceId);
curDomDataHMap.put("doc_key", docKey);
if( nLineNo > 1 ) if( nLineNo > 1 )
{ {
...@@ -9599,7 +9602,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9599,7 +9602,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
} }
//Added by Santosh on 06/12/2016 to format error string [End] //Added by Santosh on 06/12/2016 to format error string [End]
//Added by Santosh on 27/04/2017 to get next available invoide id [Start] //Added by Santosh on 27/04/2017 to get next available invoide id [Start]
private String getAvailableInvId(Document allDom, HashMap<String, String> curFormItemLotHMap, HashMap<String, String> curRecordItemLotHMap, String invoiceId, String adjQty) //Changed by Santosh on 16/05/2017
//private String getAvailableInvId(Document allDom, HashMap<String, String> curFormItemLotHMap, HashMap<String, String> curRecordItemLotHMap, String invoiceId, String minRateDocKey, String adjQty)
private String getAvailableInvId(Document allDom, HashMap<String, String> curFormItemLotHMap, HashMap<String, String> curRecordItemLotHMap, String invoiceId, String minRateDocKey, String adjQty)
{ {
String retInvoiceId = ""; String retInvoiceId = "";
NodeList detail1NList = null; NodeList detail1NList = null;
...@@ -9610,6 +9615,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9610,6 +9615,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String curRecCustCode = "", curRecItemCode = "", curRecLotNo = "", curRecSiteCode = "", curRecInvQuantity = "", curRecInvoiceId = ""; String curRecCustCode = "", curRecItemCode = "", curRecLotNo = "", curRecSiteCode = "", curRecInvQuantity = "", curRecInvoiceId = "";
double dQtyAdj = 0.0, dCurRecInvQty = 0.0, dDomQty = 0.0, dTotalDomQty = 0.0; double dQtyAdj = 0.0, dCurRecInvQty = 0.0, dDomQty = 0.0, dTotalDomQty = 0.0;
boolean isCurFormDataInDom = false; boolean isCurFormDataInDom = false;
//Added by Santosh on 16/05/2017
String domDocKey = "";
try try
{ {
...@@ -9645,7 +9652,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9645,7 +9652,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
domLotNo = genericUtility.getColumnValueFromNode("lot_no", eachDetail2Node).trim(); domLotNo = genericUtility.getColumnValueFromNode("lot_no", eachDetail2Node).trim();
domSiteCode = genericUtility.getColumnValueFromNode("site_code", detail1Node).trim(); domSiteCode = genericUtility.getColumnValueFromNode("site_code", detail1Node).trim();
domQuantity = genericUtility.getColumnValueFromNode("quantity", eachDetail2Node).trim(); domQuantity = genericUtility.getColumnValueFromNode("quantity", eachDetail2Node).trim();
domInvoiceId = genericUtility.getColumnValueFromNode("invoice_id", eachDetail2Node).trim(); //Commented and changed by Santosh on 16/05/2017
//domInvoiceId = genericUtility.getColumnValueFromNode("invoice_id", eachDetail2Node).trim();
domDocKey = checkNull(genericUtility.getColumnValueFromNode("doc_key", eachDetail2Node)).trim();
dDomQty = Double.parseDouble(domQuantity); dDomQty = Double.parseDouble(domQuantity);
...@@ -9656,7 +9665,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9656,7 +9665,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
{ {
isCurFormDataInDom = true; isCurFormDataInDom = true;
System.out.println("Record is matching need to check availability"); System.out.println("Record is matching need to check availability");
if( invoiceId.equalsIgnoreCase(domInvoiceId) && //Changed by Santosh on 16/05/2017
//if( invoiceId.equalsIgnoreCase(domInvoiceId) &&
if( domDocKey.indexOf(invoiceId) != -1 &&
curRecCustCode.equalsIgnoreCase(domCustCode) && curRecCustCode.equalsIgnoreCase(domCustCode) &&
curRecItemCode.equalsIgnoreCase(domItemCode) && curRecItemCode.equalsIgnoreCase(domItemCode) &&
curRecLotNo.equalsIgnoreCase(domLotNo) && curRecLotNo.equalsIgnoreCase(domLotNo) &&
...@@ -9702,6 +9713,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9702,6 +9713,8 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
String domCustCode = "", domItemCode = "", domLotNo = "", domSiteCode = "", domQuantity = "", domInvoiceId = ""; String domCustCode = "", domItemCode = "", domLotNo = "", domSiteCode = "", domQuantity = "", domInvoiceId = "";
NodeList detail1NList = null, detail2NList = null; NodeList detail1NList = null, detail2NList = null;
Node detail1Node = null; Node detail1Node = null;
//Added by Santosh on 16/05/2017
String curDomDocKey = "", domDocKey = "";
try try
{ {
...@@ -9709,7 +9722,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9709,7 +9722,9 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
curDomItemCode = curDomDataHMap.get("item_code").trim(); curDomItemCode = curDomDataHMap.get("item_code").trim();
curDomLotNo = curDomDataHMap.get("lot_no").trim(); curDomLotNo = curDomDataHMap.get("lot_no").trim();
curDomSiteCode = curDomDataHMap.get("site_code").trim(); curDomSiteCode = curDomDataHMap.get("site_code").trim();
curDomInvoiceId = curDomDataHMap.get("invoice_id").trim(); //Commented and changed by Santosh on 16/05/2017
//curDomInvoiceId = curDomDataHMap.get("invoice_id").trim();
curDomDocKey = curDomDataHMap.get("doc_key").trim();
detail1NList = allDom.getElementsByTagName("Detail1"); detail1NList = allDom.getElementsByTagName("Detail1");
detail1Node = detail1NList.item(0); detail1Node = detail1NList.item(0);
...@@ -9722,11 +9737,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales ...@@ -9722,11 +9737,15 @@ public class SalesReturn extends ValidatorEJB implements SalesReturnLocal, Sales
domLotNo = genericUtility.getColumnValueFromNode("lot_no", eachDetail2Node).trim(); domLotNo = genericUtility.getColumnValueFromNode("lot_no", eachDetail2Node).trim();
domSiteCode = genericUtility.getColumnValueFromNode("site_code", detail1Node).trim(); domSiteCode = genericUtility.getColumnValueFromNode("site_code", detail1Node).trim();
domQuantity = genericUtility.getColumnValueFromNode("quantity", eachDetail2Node).trim(); domQuantity = genericUtility.getColumnValueFromNode("quantity", eachDetail2Node).trim();
domInvoiceId = genericUtility.getColumnValueFromNode("invoice_id", eachDetail2Node).trim(); //Commented and changed by Santosh on 16/05/2017
//domInvoiceId = genericUtility.getColumnValueFromNode("invoice_id", eachDetail2Node).trim();
domDocKey = genericUtility.getColumnValueFromNode("doc_key", eachDetail2Node).trim();
dDomQty = Double.parseDouble(domQuantity); dDomQty = Double.parseDouble(domQuantity);
if( curDomInvoiceId.equalsIgnoreCase(domInvoiceId) && //Commented and changed by Santosh on 16/05/2017
//if( curDomInvoiceId.equalsIgnoreCase(domInvoiceId) &&
if( curDomDocKey.equalsIgnoreCase(domDocKey) &&
curDomCustCode.equalsIgnoreCase(domCustCode) && curDomCustCode.equalsIgnoreCase(domCustCode) &&
curDomItemCode.equalsIgnoreCase(domItemCode) && curDomItemCode.equalsIgnoreCase(domItemCode) &&
curDomLotNo.equalsIgnoreCase(domLotNo) && curDomLotNo.equalsIgnoreCase(domLotNo) &&
......
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