Commit c83681bb authored by dpawar's avatar dpawar

scheme condition change


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95025 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e555721d
...@@ -631,7 +631,7 @@ private String generateDebitNote(Connection conn,ArrayList<String> podProcessInv ...@@ -631,7 +631,7 @@ private String generateDebitNote(Connection conn,ArrayList<String> podProcessInv
conn.rollback(); conn.rollback();
return errString; return errString;
} }
System.out.println("errString before partial mrthod--->>["+errString+"]"); System.out.println("errString before partial method--->>["+errString+"]");
System.out.println("partialInvoiceMapG before partial mrthod--->>["+partialInvoiceMapG+"]"); System.out.println("partialInvoiceMapG before partial mrthod--->>["+partialInvoiceMapG+"]");
if(errString.length() > 0 && partialInvoiceMapG.size() > 0){ if(errString.length() > 0 && partialInvoiceMapG.size() > 0){
errString =actualQtyPODProcessPartial(conn); //partialInvoiceMapV errString =actualQtyPODProcessPartial(conn); //partialInvoiceMapV
...@@ -990,9 +990,9 @@ private boolean isSchemeApply(Connection conn,String itemCodeL,String invoiceId) ...@@ -990,9 +990,9 @@ private boolean isSchemeApply(Connection conn,String itemCodeL,String invoiceId)
else if(schemeCodeList.size() == 1){ else if(schemeCodeList.size() == 1){
schemeOrderType=podObject.getColumnDescr(conn, "order_type", "scheme_applicability", "scheme_code", schemeCodeList.get(0)); schemeOrderType=podObject.getColumnDescr(conn, "order_type", "scheme_applicability", "scheme_code", schemeCodeList.get(0));
schemeOrderType=schemeOrderType==null ? "" : schemeOrderType.trim(); schemeOrderType=schemeOrderType==null ? "" : schemeOrderType.trim();
System.out.println("schemeOrderType-------->>["+schemeOrderType+"]"); System.out.println("schemeOrderType11-------->>["+schemeOrderType+"]");
if(noApplyCustList.length() == 0 && applyCustList.length() ==0 && schemeOrderType.length() ==0){ if(noApplyCustList.length() == 0 && applyCustList.length() ==0 && schemeOrderType.length() >= 0){
schemeApply=true; schemeApply=true;
checkBom=true; checkBom=true;
} }
...@@ -1586,7 +1586,7 @@ public String actualQtyPODProcessPartial(Connection conn) //partialInvoiceMap ...@@ -1586,7 +1586,7 @@ public String actualQtyPODProcessPartial(Connection conn) //partialInvoiceMap
{ {
//itemCode=partialItem.get(itemCnt)==null ? "" :partialItem.get(itemCnt).trim(); //itemCode=partialItem.get(itemCnt)==null ? "" :partialItem.get(itemCnt).trim();
//invQty=partialInvoiceMapG.get(invIdPartial+":"+itemCode); //invQty=partialInvoiceMapG.get(invIdPartial+":"+itemCode);
detail2xmlString="";
sql1="select rate,lot_no,lot_sl,discount,item_code from invoice_trace " sql1="select rate,lot_no,lot_sl,discount,item_code from invoice_trace "
+ "where invoice_id = ?"; + "where invoice_id = ?";
......
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