Skip to content

B
business-java
Commit 9c515950 authored by msaggam's avatar msaggam
Browse files
Options

changes made in itemchange of lot_no, loc_code, lot_sl 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@203916 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c53984ff
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 56 deletions
webitm-dis/ibase/webitm/ejb/dis/PoReturnIC.java
View file @ 9c515950
...@@ -6944,16 +6944,21 @@ PoReturnICRemote { ...@@ -6944,16 +6944,21 @@ PoReturnICRemote {
ldt_expdtStr=sdfNew.format(ldt_expdt).toString(); ldt_expdtStr=sdfNew.format(ldt_expdt).toString();
//ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())); //ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
} }
// Changed by Mahesh Saggam on 23 jul 19 [Start]
ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation, ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation,
mlotno, mlotsl, "M", conn); mlotno, mlotsl, "M", conn);
System.out.println("ls_site_mfg@function[" + ls_site_mfg System.out.println("ls_site_mfg@function[" + ls_site_mfg
+ "]"); + "]");
ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno, if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg))
mlotsl, "P", conn); {
System.out.println("ls_pack@function[" + ls_pack + "]"); valueXmlString.append("<site_code__mfg/>");
valueXmlString.append("<site_code__mfg>") }
.append("<![CDATA[" + ls_site_mfg + "]]>") else
.append("</site_code__mfg>"); {
valueXmlString.append("<site_code__mfg>").append("<![CDATA[" + ls_site_mfg + "]]>").append("</site_code__mfg>");
}
valueXmlString.append("<mfg_date>") valueXmlString.append("<mfg_date>")
.append("<![CDATA[" + ldt_mfgdtStr + "]]>") .append("<![CDATA[" + ldt_mfgdtStr + "]]>")
.append("</mfg_date>"); .append("</mfg_date>");
...@@ -6964,17 +6969,15 @@ PoReturnICRemote { ...@@ -6964,17 +6969,15 @@ PoReturnICRemote {
.append("<![CDATA[" + ls_batch + "]]>") .append("<![CDATA[" + ls_batch + "]]>")
.append("</batch_no>"); .append("</batch_no>");
ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno,mlotsl, "P", conn);
System.out.println("ls_pack@function[" + ls_pack + "]");
if (!"NOTFOUND".equalsIgnoreCase(ls_pack)) { if (!"NOTFOUND".equalsIgnoreCase(ls_pack)) {
valueXmlString.append("<pack_code >") valueXmlString.append("<pack_code>")
.append("<![CDATA[" + ls_pack + "]]>") .append("<![CDATA[" + ls_pack + "]]>")
.append("</pack_code>"); .append("</pack_code>");
} }
if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg)) // Mahesh Saggam [End]
{
valueXmlString.append("<site_code__mfg >").append(" ")
.append("</site_code__mfg>");
}
if (mrate <= 0) { if (mrate <= 0) {
...@@ -7169,17 +7172,15 @@ PoReturnICRemote { ...@@ -7169,17 +7172,15 @@ PoReturnICRemote {
ldt_expdtStr=sdfNew.format(ldt_expdt).toString(); ldt_expdtStr=sdfNew.format(ldt_expdt).toString();
//ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())); //ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
} }
// Changed by Mahesh Saggam on 23 jul 19 [Start]
ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation, ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation,mlotno, mlotsl, "M", conn);
mlotno, mlotsl, "M", conn); System.out.println("ls_site_mfg@function[" + ls_site_mfg+ "]");
System.out.println("ls_site_mfg@function[" + ls_site_mfg if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg))
+ "]"); {
ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno, valueXmlString.append("<site_code__mfg/>");
mlotsl, "P", conn); }else {
System.out.println("ls_pack@function[" + ls_pack + "]"); valueXmlString.append("<site_code__mfg>").append("<![CDATA[" + ls_site_mfg + "]]>").append("</site_code__mfg>");
valueXmlString.append("<site_code__mfg>") }
.append("<![CDATA[" + ls_site_mfg + "]]>")
.append("</site_code__mfg>");
valueXmlString.append("<mfg_date>") valueXmlString.append("<mfg_date>")
.append("<![CDATA[" + ldt_mfgdtStr + "]]>") .append("<![CDATA[" + ldt_mfgdtStr + "]]>")
.append("</mfg_date>"); .append("</mfg_date>");
...@@ -7190,18 +7191,14 @@ PoReturnICRemote { ...@@ -7190,18 +7191,14 @@ PoReturnICRemote {
.append("<![CDATA[" + ls_batch + "]]>") .append("<![CDATA[" + ls_batch + "]]>")
.append("</batch_no>"); .append("</batch_no>");
System.out.println("LOT_NO@DATE Sucess"); System.out.println("LOT_NO@DATE Sucess");
if (!"NOTFOUND".equalsIgnoreCase(ls_pack)) {
valueXmlString.append("<pack_code >") ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno,mlotsl, "P", conn);
.append("<![CDATA[" + ls_pack + "]]>") System.out.println("ls_pack@function[" + ls_pack + "]");
.append("</pack_code>"); if (!"NOTFOUND".equalsIgnoreCase(ls_pack))
}
if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg))
{ {
valueXmlString.append("<site_code__mfg >").append(" ") valueXmlString.append("<pack_code>").append("<![CDATA[" + ls_pack + "]]>").append("</pack_code>");
.append("</site_code__mfg>");
} }
// Mahesh Saggam [End]
if (mrate <= 0) if (mrate <= 0)
{ {
...@@ -7424,17 +7421,16 @@ PoReturnICRemote { ...@@ -7424,17 +7421,16 @@ PoReturnICRemote {
ldt_expdtStr=sdfNew.format(ldt_expdt).toString(); ldt_expdtStr=sdfNew.format(ldt_expdt).toString();
//ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat())); //ld_tax_date = Timestamp.valueOf(genericUtility.getValidDateString(ld_tax_date.toString(),genericUtility.getApplDateFormat(),genericUtility.getDBDateFormat()));
} }
// Changed by Mahesh Saggam on 23 jul 19 [Start]
ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation, ls_site_mfg = gfgetmfgsite(mItem, ls_site, mLocation,mlotno, mlotsl, "M", conn);
mlotno, mlotsl, "M", conn); System.out.println("ls_site_mfg@function[" + ls_site_mfg+ "]");
System.out.println("ls_site_mfg@function[" + ls_site_mfg
+ "]"); if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg))
ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno, {
mlotsl, "P", conn); valueXmlString.append("<site_code__mfg/>");
System.out.println("ls_pack@function[" + ls_pack + "]"); }else {
valueXmlString.append("<site_code__mfg>") valueXmlString.append("<site_code__mfg>").append("<![CDATA[" + ls_site_mfg + "]]>").append("</site_code__mfg>");
.append("<![CDATA[" + ls_site_mfg + "]]>") }
.append("</site_code__mfg>");
valueXmlString.append("<mfg_date>") valueXmlString.append("<mfg_date>")
.append("<![CDATA[" + ldt_mfgdtStr + "]]>") .append("<![CDATA[" + ldt_mfgdtStr + "]]>")
.append("</mfg_date>"); .append("</mfg_date>");
...@@ -7445,18 +7441,14 @@ PoReturnICRemote { ...@@ -7445,18 +7441,14 @@ PoReturnICRemote {
.append("<![CDATA[" + ls_batch + "]]>") .append("<![CDATA[" + ls_batch + "]]>")
.append("</batch_no>"); .append("</batch_no>");
System.out.println("LOT_NO@DATE Sucess"); System.out.println("LOT_NO@DATE Sucess");
if (!"NOTFOUND".equalsIgnoreCase(ls_pack)) {
valueXmlString.append("<pack_code >") ls_pack = gfgetmfgsite(mItem, ls_site, mLocation, mlotno,mlotsl, "P", conn);
.append("<![CDATA[" + ls_pack + "]]>") System.out.println("ls_pack@function[" + ls_pack + "]");
.append("</pack_code>"); if (!"NOTFOUND".equalsIgnoreCase(ls_pack))
}
if ("NOTFOUND".equalsIgnoreCase(ls_site_mfg))
{ {
valueXmlString.append("<site_code__mfg >").append(" ") valueXmlString.append("<pack_code>").append("<![CDATA[" + ls_pack + "]]>").append("</pack_code>");
.append("</site_code__mfg>");
} }
// Mahesh Saggam [End]
if (mrate <= 0) { if (mrate <= 0) {
mlotno = checkNull(genericUtility.getColumnValue( mlotno = checkNull(genericUtility.getColumnValue(
...@@ -7650,7 +7642,8 @@ PoReturnICRemote { ...@@ -7650,7 +7642,8 @@ PoReturnICRemote {
pstmt.setString(5, aslotsl); pstmt.setString(5, aslotsl);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) { if (rs.next()) {
lsmfgsite = rs.getString(1); // lsmfgsite = rs.getString(1);
lsmfgsite = checkNull(rs.getString(1)); // Added by Mahesh Saggam on 22-july-2019
} }
rs.close(); rs.close();
rs = null; rs = null;
......
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