Skip to content

B
business-java
Commit a64e630f authored by wansari's avatar wansari
Browse files
Options

W16FKAT002 updated Source for opening screen from standard screen 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103998 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 56621d53
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 9 deletions
webitm-wms/ibase/webitm/ejb/wms/SorderWizardEJB.java
View file @ a64e630f
......@@ -442,7 +442,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.close();pstmt = null;
}
sql = " SELECT REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?";
/*sql = " SELECT REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"w_item");
rs = pstmt.executeQuery();
......@@ -457,7 +457,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
if(pstmt != null)
{
pstmt.close();pstmt = null;
}
}*/
if(objContext != null && objContext.trim().length() > 0)
{
......@@ -653,7 +653,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<part_qty>").append("<![CDATA["+checkNullAndTrim(rs.getString("PART_QTY"))+"]]>").append("</part_qty>\r\n");
valueXmlString.append("<due_date>").append("<![CDATA["+sdf.format(dueDate)+"]]>").append("</due_date>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat+"::"+itemRefSer) +"]]>").append("</udf__str1>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat) +"]]>").append("</udf__str1>\r\n");
}
else
{
......@@ -695,7 +695,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<tel2__dlv>").append("<![CDATA[]]>").append("</tel2__dlv>\r\n");
valueXmlString.append("<part_qty>").append("<![CDATA[]]>").append("</part_qty>\r\n");
valueXmlString.append("<due_date>").append("<![CDATA["+currDate+"]]>").append("</due_date>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat+"::"+itemRefSer) +"]]>").append("</udf__str1>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat) +"]]>").append("</udf__str1>\r\n");
}
if(rs != null)
{
......@@ -871,7 +871,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
valueXmlString.append("<part_qty>").append("<![CDATA["+partQty+"]]>").append("</part_qty>\r\n");
valueXmlString.append("<due_date>").append("<![CDATA["+dueDate+"]]>").append("</due_date>\r\n");
valueXmlString.append("<delivery_term_descr>").append("<![CDATA["+dlvTermDescr+"]]>").append("</delivery_term_descr>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat+"::"+itemRefSer) +"]]>").append("</udf__str1>\r\n");
valueXmlString.append("<udf__str1>").append("<![CDATA["+ checkNullAndTrim(applDateFormat) +"]]>").append("</udf__str1>\r\n");
valueXmlString.append("</Detail3>\r\n");
......@@ -3267,14 +3267,16 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
sql = " SELECT COUNT(*) FROM SORDER WHERE SALE_ORDER = ? AND CONFIRMED = ? ";
//sql = " SELECT COUNT(*) FROM SORDER WHERE SALE_ORDER = ? AND CONFIRMED = ? ";
String confirmed = "";
sql = " SELECT CONFIRMED FROM SORDER WHERE SALE_ORDER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if (rs.next())
{
count = rs.getInt(1);
confirmed = checkNullAndTrim(rs.getString("CONFIRMED"));
count++;
}
if (rs != null)
{
......@@ -3285,6 +3287,10 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
pstmt.close();pstmt = null;
}
if("Y".equalsIgnoreCase(confirmed))
{
return "1";
}
if(count == 0)
{
retString = String.valueOf(count);
......@@ -3651,7 +3657,7 @@ public class SorderWizardEJB extends ValidatorEJB implements SorderWizardEJBLoca
sql = " SELECT REF_SER FROM TRANSETUP WHERE TRAN_WINDOW = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,"w_item");
pstmt.setString(1,refSer);
rs = pstmt.executeQuery();
if(rs.next())
{
......
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