Skip to content

B
business-java
Commit 8fa61ae2 authored by msaggam's avatar msaggam
Browse files
Options

Item can not be added in Sales order amendment 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@204670 ce508802-f39f-4f6c-b175-0d175dae99d5
parent e4d08248
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 6 deletions
webitm-dis/ibase/webitm/ejb/dis/SOrderAmdIC.java
View file @ 8fa61ae2
...@@ -776,12 +776,13 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -776,12 +776,13 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
{ {
lineNoSord = getLineNewNo(lineNoSord); lineNoSord = getLineNewNo(lineNoSord);
} }
else // commented by mahesh saggam on 01/Aug/19
/*else
{ {
errcode = "VMEMTLSNO"; errcode = "VMEMTLSNO";
errList.add(errcode); errList.add(errcode);
errFields.add(childNodeName.toLowerCase()); errFields.add(childNodeName.toLowerCase());
} }*/
System.out.println("line after"+ lineNoSord); System.out.println("line after"+ lineNoSord);
saleOrder = checkNull(genericUtility.getColumnValue("sale_order", dom)); saleOrder = checkNull(genericUtility.getColumnValue("sale_order", dom));
qtyStduom = checkNull(genericUtility.getColumnValue("quantity__stduom", dom)); qtyStduom = checkNull(genericUtility.getColumnValue("quantity__stduom", dom));
...@@ -1431,7 +1432,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -1431,7 +1432,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
if(convQtyStduom != null && convQtyStduom.trim().length() > 0) if(convQtyStduom != null && convQtyStduom.trim().length() > 0)
{ {
convQtyStduom1 = Integer.parseInt(convQtyStduom); // convQtyStduom1 = Integer.parseInt(convQtyStduom); // commented by mahesh saggam on 05/aug/19 as it was parsing int
convQtyStduom1 = Double.parseDouble(convQtyStduom);
} }
if( convQtyStduom1 != 1) if( convQtyStduom1 != 1)
{ {
...@@ -1958,7 +1960,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -1958,7 +1960,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
if(mCnt == 0) if(mCnt == 0)
{ {
sql = "Select count(1) from scheme_applicability_det where scheme_code = ? and and site_code is null and state_code = :mstate_cd"; //sql = "Select count(1) from scheme_applicability_det where scheme_code = ? and and site_code is null and state_code = :mstate_cd"; // commented by mahesh saggam on 01/aug/19
sql = "Select count(1) from scheme_applicability_det where scheme_code = ? and and site_code is null and state_code = ?"; // changes made to state_code by mahesh saggam on 01/aug/19
pStmt = conn.prepareStatement(sql); pStmt = conn.prepareStatement(sql);
pStmt.setString(1, itemCode); pStmt.setString(1, itemCode);
pStmt.setString(2, stateCodeDlv); pStmt.setString(2, stateCodeDlv);
...@@ -2085,10 +2088,12 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -2085,10 +2088,12 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
} }
} }
} }
if (childNodeName.equalsIgnoreCase("min_shelf_life")) if (childNodeName.equalsIgnoreCase("min_shelf_life"))
{ {
minshelfLife = checkNull(genericUtility.getColumnValue("min_shelf_life", dom)); minshelfLife = checkNull(genericUtility.getColumnValue("min_shelf_life", dom));
minshelfLifeO = checkNull(genericUtility.getColumnValue("min_shelf_life_o", dom)); minshelfLifeO = checkNull(genericUtility.getColumnValue("min_shelf_life_o", dom));
lineNoSord = checkNull(genericUtility.getColumnValue("line_no__sord", dom)); // added by mahesh saggam on 05/aug/19
if(minshelfLife != null && minshelfLife.trim().length() > 0) if(minshelfLife != null && minshelfLife.trim().length() > 0)
{ {
...@@ -2099,7 +2104,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -2099,7 +2104,8 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
minshelfLifeODb = Double.parseDouble(minshelfLifeO); minshelfLifeODb = Double.parseDouble(minshelfLifeO);
} }
if(minshelfLife != null && minshelfLife.trim().length() > 0) // if(minshelfLife != null && minshelfLife.trim().length() > 0) // commented by mahesh saggam on 05/aug/19
if(minshelfLife != null && minshelfLife.trim().length() > 0 && lineNoSord != null && lineNoSord.trim().length() > 0) // added by mahesh saggam on 05/aug/19
{ {
if(minshelfLifeDb > minshelfLifeODb) if(minshelfLifeDb > minshelfLifeODb)
{ {
...@@ -3154,6 +3160,30 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -3154,6 +3160,30 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
valueXmlString.append("<rate__clg protect = \"0\">").append("<![CDATA[" + rate + "]]>").append("</rate__clg>"); valueXmlString.append("<rate__clg protect = \"0\">").append("<![CDATA[" + rate + "]]>").append("</rate__clg>");
} }
// added by mahesh saggam on 05/aug/19 [Start]
unit = checkNull(genericUtility.getColumnValue("unit", dom));
unitStd = checkNull(genericUtility.getColumnValue("unit__std", dom));
convQtyStduom = genericUtility.getColumnValue("conv__qty_stduom", dom);
unitRate = checkNull(genericUtility.getColumnValue("unit__rate", dom));
convRtuomStduom = genericUtility.getColumnValue("conv__rtuom_stduom", dom);
if (unit.trim().equalsIgnoreCase(unitStd.trim())) {
valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("<![CDATA[" + convQtyStduom + "]]>").append("</conv__qty_stduom>");
}
else
{
valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + convQtyStduom + "]]>").append("</conv__qty_stduom>");
}
if(unitStd.trim().equalsIgnoreCase(unitRate.trim()))
{
valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("<![CDATA[" + convRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
else
{
valueXmlString.append("<conv__rtuom_stduom protect = \"0\">").append("<![CDATA[" + convRtuomStduom + "]]>").append("</conv__rtuom_stduom>");
}
// added by mahesh saggam on 05/aug/19 [End]
} }
if (currentColumn.trim().equals("line_no__sord")) if (currentColumn.trim().equals("line_no__sord"))
{ {
...@@ -3500,6 +3530,31 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -3500,6 +3530,31 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
valueXmlString.append("<rate__stduom>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</rate__stduom>"); valueXmlString.append("<rate__stduom>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</rate__stduom>");
valueXmlString.append("<rate__clg>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</rate__clg>"); valueXmlString.append("<rate__clg>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</rate__clg>");
} }
// added by mahesh saggam on 01/Aug/19 [Start]
unit = checkNull(genericUtility.getColumnValue("unit", dom));
unitStd = checkNull(genericUtility.getColumnValue("unit__std", dom));
itemCodeOrd = checkNull(genericUtility.getColumnValue("item_code__ord", dom));
if(unit != null && unit.trim().length() > 0)
{
ArrayList ratestduomArr = null;
ratestduomArr = distCommon.getConvQuantityFact(unit, unitStd, itemCodeOrd, rateDb, convRtuomStduomDb, conn);
convRtuomStduomDb = Double.parseDouble(ratestduomArr.get(0).toString());
if(unit.trim().equalsIgnoreCase(unitStd.trim()))
{
valueXmlString.append("<conv__rtuom_stduom protect = \"1\">").append("1").append("</conv__rtuom_stduom>");
}
else
{
valueXmlString.append("<conv__rtuom_stduom protect = \"0\">").append("<![CDATA[" + convRtuomStduomDb + "]]>").append("</conv__rtuom_stduom>");
}
}
// added by mahesh saggam on 02/Aug/2019 [End]
} }
if (currentColumn.trim().equals("conv__rtuom_stduom")) if (currentColumn.trim().equals("conv__rtuom_stduom"))
{ {
...@@ -3542,6 +3597,36 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -3542,6 +3597,36 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
{ {
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</quantity__stduom>"); valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + mNum.get(1) + "]]>").append("</quantity__stduom>");
} }
// added by mahesh saggam on 02/Aug/2019 [Start]
itemCodeOrd = checkNull(genericUtility.getColumnValue("item_code__ord", dom));
convQtyStduom = genericUtility.getColumnValue("conv__qty_stduom", dom);
convQtyStduomDb = convQtyStduom == null || convQtyStduom.trim().length() == 0 ? 0.0 : Double.parseDouble(convQtyStduom);
System.out.println("conversion rate is = "+convQtyStduomDb);
mNum = distCommon.getConvQuantityFact(unit, unitStd, itemCodeOrd, qtyDb, convQtyStduomDb, conn);
if (mNum.size() > 0)
{
qty = (String) mNum.get(1);
qtyDb = Double.parseDouble(qty);
convQtyStduomDb = Double.parseDouble(mNum.get(0).toString());
System.out.println("mNum2 @@@@ get 0" + convQtyStduomDb);
}
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + qtyDb + "]]>").append("</quantity__stduom>");
if (unit.trim().equalsIgnoreCase(unitStd.trim()))
{
valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("<![CDATA[" + convQtyStduomDb + "]]>").append("</conv__qty_stduom>");
}
else
{
valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + convQtyStduomDb + "]]>").append("</conv__qty_stduom>");
}
// added by mahesh saggam on 02/Aug/2019 [End]
} }
if (currentColumn.trim().equals("unit__rate")) if (currentColumn.trim().equals("unit__rate"))
{ {
...@@ -4265,6 +4350,34 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde ...@@ -4265,6 +4350,34 @@ public class SOrderAmdIC extends ValidatorEJB implements SOrderAmdICRemote,SOrde
//qtyStd = checkNull(genericUtility.getColumnValue("quantity__stduom", dom1));; //qtyStd = checkNull(genericUtility.getColumnValue("quantity__stduom", dom1));;
packCode =checkNull(genericUtility.getColumnValue("pack_code", dom1));; packCode =checkNull(genericUtility.getColumnValue("pack_code", dom1));;
// added by mahesh saggam on 01/Aug/19 [Start]
unitStd = checkNull(genericUtility.getColumnValue("unit__std", dom));
convQtyStduom = genericUtility.getColumnValue("conv__qty_stduom", dom);
convQtyStduomDb = convQtyStduom == null || convQtyStduom.trim().length() == 0 ? 0.0 : Double.parseDouble(convQtyStduom);
System.out.println("conversion rate is = "+convQtyStduomDb);
mNum = distCommon.getConvQuantityFact(unit, unitStd, itemCodeOrd, qtyDb, convQtyStduomDb, conn);
if (mNum.size() > 0)
{
qty = (String) mNum.get(1);
qtyDb = Double.parseDouble(qty);
convQtyStduomDb = Double.parseDouble(mNum.get(0).toString());
System.out.println("mNum2 @@@@ get 0" + convQtyStduomDb);
}
valueXmlString.append("<quantity__stduom>").append("<![CDATA[" + qtyDb + "]]>").append("</quantity__stduom>");
if (unit.trim().equalsIgnoreCase(unitStd.trim()))
{
valueXmlString.append("<conv__qty_stduom protect = \"1\">").append("<![CDATA[" + convQtyStduomDb + "]]>").append("</conv__qty_stduom>");
}
else
{
valueXmlString.append("<conv__qty_stduom protect = \"0\">").append("<![CDATA[" + convQtyStduomDb + "]]>").append("</conv__qty_stduom>");
}
// added by mahesh saggam on 01/Aug/19 [End]
} }
if (currentColumn.trim().equals("nature")) if (currentColumn.trim().equals("nature"))
{ {
......
webitm-dis/ibase/webitm/ejb/dis/adv/SOrderAmdConf.java
View file @ 8fa61ae2
...@@ -809,7 +809,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca ...@@ -809,7 +809,7 @@ public class SOrderAmdConf extends ActionHandlerEJB implements SOrderAmdConfLoca
lineNoSo = Integer.toString(lineCnt); lineNoSo = Integer.toString(lineCnt);
System.out.println("lineNoSo:::>>>["+lineNoSo+"]"); System.out.println("lineNoSo:::>>>["+lineNoSo+"]");
updtSql = "UPDATE SORDAMDDET SET LINE_NO__SORD = ? " + updtSql = "UPDATE SORDAMDDET SET LINE_NO__SORD = ? " +
"WHERE AMD_NO = ? AND SALE_ORDER = ? AND LINE_NO = ? ;"; "WHERE AMD_NO = ? AND SALE_ORDER = ? AND LINE_NO = ? ";
pstln= conn.prepareStatement(updtSql); pstln= conn.prepareStatement(updtSql);
pstln.setString(1, lineNoSo); pstln.setString(1, lineNoSo);
......
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