Skip to content

B
business-java
Commit deb7fb92 authored by smestry's avatar smestry
Browse files
Options

updated the Bean and servlet for PO Edit autosave 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@103303 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c717439c
Hide whitespace changes
Inline Side-by-side
Showing with 242 additions and 144 deletions
webitm-wms/ibase/webitm/bean/wms/PorderDetailBean.java
View file @ deb7fb92
...@@ -189,103 +189,16 @@ public class PorderDetailBean ...@@ -189,103 +189,16 @@ public class PorderDetailBean
SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat()); SimpleDateFormat sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
currDate = sdf.format(new java.util.Date()); currDate = sdf.format(new java.util.Date());
String sql = " SELECT PURC_ORDER, ORD_DATE, PORD_TYPE, SUPP_CODE, SITE_CODE__DLV, SITE_CODE__ORD, DEPT_CODE, EMP_CODE, ITEM_SER, CR_TERM, "
+ " CURR_CODE, CHG_DATE, CHG_USER, CHG_TERM, UDF_STR__1, CONFIRMED, CONF_DATE, REMARKS, TRAN_CODE, DLV_TERM, PRICE_LIST, "
+ " EXCH_RATE, TERM_TABLE, IND_NO, TRANS_MODE, SITE_DESCR, UDF_STR__2 FROM PORDER WHERE PURC_ORDER = ? "
+ " AND CONFIRMED = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if (rs.next())
{
purOrderDb = checkNullAndTrim(rs.getString("PURC_ORDER"));
ordDate = rs.getDate("ORD_DATE");
pordType = checkNullAndTrim(rs.getString("PORD_TYPE"));
suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
siteCodeDlv = checkNullAndTrim(rs.getString("SITE_CODE__DLV"));
siteCodeOrd = checkNullAndTrim(rs.getString("SITE_CODE__ORD"));
deptCode = checkNullAndTrim(rs.getString("DEPT_CODE"));
empCode = checkNullAndTrim(rs.getString("EMP_CODE"));
itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
crTerm = checkNullAndTrim(rs.getString("CR_TERM"));
currCode = checkNullAndTrim(rs.getString("CURR_CODE"));
chgDate = checkNullAndTrim(rs.getString("CHG_DATE"));
chgUser = checkNullAndTrim(rs.getString("CHG_USER"));
chgTerm = checkNullAndTrim(rs.getString("CHG_TERM"));
udfStr1 = checkNullAndTrim(rs.getString("UDF_STR__1"));
confirmed = checkNullAndTrim(rs.getString("CONFIRMED"));
confDate = checkNullAndTrim(rs.getString("CONF_DATE"));
remarks = checkNullAndTrim(rs.getString("REMARKS"));
tranCode = checkNullAndTrim(rs.getString("TRAN_CODE"));
dlvTerm = checkNullAndTrim(rs.getString("DLV_TERM"));
priceList = checkNullAndTrim(rs.getString("PRICE_LIST"));
exchRate = checkNullAndTrim(rs.getString("EXCH_RATE"));
termTable = checkNullAndTrim(rs.getString("TERM_TABLE"));
indNo = checkNullAndTrim(rs.getString("IND_NO"));
transMode = checkNullAndTrim(rs.getString("TRANS_MODE"));
siteDescr = checkNullAndTrim(rs.getString("SITE_DESCR"));
udfStr2 = checkNullAndTrim(rs.getString("UDF_STR__2"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT REL_AMT, TYPE, AMT_TYPE FROM PORD_PAY_TERM WHERE PURC_ORDER = ? "; int count = 0;
String sql = "";
sql = " SELECT COUNT(1) FROM PORDER_TEMP WHERE PURC_ORDER = ? ";
pstmt = conn.prepareStatement(sql); pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder); pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if (rs.next()) if (rs.next())
{ {
relAmt = checkNullAndTrim(rs.getString("REL_AMT")); count = rs.getInt(1);
type = checkNullAndTrim(rs.getString("TYPE"));
amtType = checkNullAndTrim(rs.getString("AMT_TYPE"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT DESCR FROM ITEMSER WHERE ITEM_SER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemSer);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerDescr = checkNullAndTrim(rs.getString("DESCR"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCode);
rs = pstmt.executeQuery();
if (rs.next())
{
suppName = checkNullAndTrim(rs.getString("SUPP_NAME"));
} }
if (rs != null) if (rs != null)
{ {
...@@ -298,61 +211,244 @@ public class PorderDetailBean ...@@ -298,61 +211,244 @@ public class PorderDetailBean
pstmt = null; pstmt = null;
} }
sql = "SELECT DESCR FROM CRTERM where CR_TERM = ? "; if(count > 0) //
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, crTerm);
rs = pstmt.executeQuery();
if (rs.next())
{ {
crTermDescr = checkNullAndTrim(rs.getString("DESCR")); sql = " SELECT PURC_ORDER, ORD_DATE, TRAN_DATE, IND_NO, PORD_TYPE, ITEM_SER, TASK_DESC, SUPP_CODE, SUPP_NAME, CR_TERM, CRTERM_DESCR,"
} + " REMARKS, DLV_TERM, TRAN_CODE, TRAN_NAME, PRICE_LIST, EXCH_RATE, DEPT_CODE, DEPT_DESCR, TRANS_MODE, SITE_CODE__DLV, "
if (rs != null) + " SITE_CODE__ORD, SITE_DESCR, SITE_ADD1, CURR_CODE, TERM_TABLE, UDF_STR__1, UDF_STR__2, EMP_CODE, CHG_DATE, CHG_USER, "
{ + " CHG_TERM, STATUS FROM PORDER_TEMP WHERE PURC_ORDER = ? ";
rs.close(); pstmt = conn.prepareStatement(sql);
rs = null; pstmt.setString(1, purcOrder);
} rs = pstmt.executeQuery();
if (pstmt != null ) if (rs.next())
{ {
pstmt.close(); purOrderDb = checkNullAndTrim(rs.getString("PURC_ORDER"));
pstmt = null; ordDate = rs.getDate("ORD_DATE");
indNo = checkNullAndTrim(rs.getString("IND_NO"));
pordType = checkNullAndTrim(rs.getString("PORD_TYPE"));
itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
itemSerDescr = checkNullAndTrim(rs.getString("TASK_DESC"));
suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
suppName = checkNullAndTrim(rs.getString("SUPP_NAME"));
crTerm = checkNullAndTrim(rs.getString("CR_TERM"));
crTermDescr = checkNullAndTrim(rs.getString("CRTERM_DESCR"));
remarks = checkNullAndTrim(rs.getString("REMARKS"));
dlvTerm = checkNullAndTrim(rs.getString("DLV_TERM"));
tranCode = checkNullAndTrim(rs.getString("TRAN_CODE"));
tranName = checkNullAndTrim(rs.getString("TRAN_NAME"));
priceList = checkNullAndTrim(rs.getString("PRICE_LIST"));
exchRate = checkNullAndTrim(rs.getString("EXCH_RATE"));
deptCode = checkNullAndTrim(rs.getString("DEPT_CODE"));
departmentDescr = checkNullAndTrim(rs.getString("DEPT_DESCR"));
transMode = checkNullAndTrim(rs.getString("TRANS_MODE"));
siteCodeDlv = checkNullAndTrim(rs.getString("SITE_CODE__DLV"));
siteCodeOrd = checkNullAndTrim(rs.getString("SITE_CODE__ORD"));
siteDescr = checkNullAndTrim(rs.getString("SITE_DESCR"));
currCode = checkNullAndTrim(rs.getString("CURR_CODE"));
termTable = checkNullAndTrim(rs.getString("TERM_TABLE"));
udfStr1 = checkNullAndTrim(rs.getString("UDF_STR__1"));
udfStr2 = checkNullAndTrim(rs.getString("UDF_STR__2"));
empCode = checkNullAndTrim(rs.getString("EMP_CODE"));
chgDate = checkNullAndTrim(rs.getString("CHG_DATE"));
chgUser = checkNullAndTrim(rs.getString("CHG_USER"));
chgTerm = checkNullAndTrim(rs.getString("CHG_TERM"));
type = checkNullAndTrim(rs.getString("UDF_STR__1"));
relAmt = checkNullAndTrim(rs.getString("SITE_ADD1"));
udfStr2 = checkNullAndTrim(rs.getString("UDF_STR__2"));
confirmed = "N";
confDate = currDate;
if(udfStr1.equalsIgnoreCase("% of base"))
{
amtType = "01";
}
else if(udfStr1.equalsIgnoreCase("% of net"))
{
amtType = "02";
}
else if(udfStr1.equalsIgnoreCase("Fixed Amount"))
{
amtType = "03";
}
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
} }
else //
sql = "SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
rs = pstmt.executeQuery();
if (rs.next())
{ {
tranName = checkNullAndTrim(rs.getString("TRAN_NAME")); sql = " SELECT PURC_ORDER, ORD_DATE, PORD_TYPE, SUPP_CODE, SITE_CODE__DLV, SITE_CODE__ORD, DEPT_CODE, EMP_CODE, ITEM_SER, CR_TERM, "
} + " CURR_CODE, CHG_DATE, CHG_USER, CHG_TERM, UDF_STR__1, CONFIRMED, CONF_DATE, REMARKS, TRAN_CODE, DLV_TERM, PRICE_LIST, "
if (rs != null) + " EXCH_RATE, TERM_TABLE, IND_NO, TRANS_MODE, SITE_DESCR, UDF_STR__2 FROM PORDER WHERE PURC_ORDER = ? "
{ + " AND CONFIRMED = ? ";
rs.close(); pstmt = conn.prepareStatement(sql);
rs = null; pstmt.setString(1, purcOrder);
} pstmt.setString(2, "N");
if (pstmt != null ) rs = pstmt.executeQuery();
{ if (rs.next())
pstmt.close(); {
pstmt = null; purOrderDb = checkNullAndTrim(rs.getString("PURC_ORDER"));
} ordDate = rs.getDate("ORD_DATE");
pordType = checkNullAndTrim(rs.getString("PORD_TYPE"));
sql = "SELECT DESCR FROM DEPARTMENT WHERE DEPT_CODE = ? "; suppCode = checkNullAndTrim(rs.getString("SUPP_CODE"));
pstmt = conn.prepareStatement(sql); siteCodeDlv = checkNullAndTrim(rs.getString("SITE_CODE__DLV"));
pstmt.setString(1, deptCode); siteCodeOrd = checkNullAndTrim(rs.getString("SITE_CODE__ORD"));
rs = pstmt.executeQuery(); deptCode = checkNullAndTrim(rs.getString("DEPT_CODE"));
if (rs.next()) empCode = checkNullAndTrim(rs.getString("EMP_CODE"));
{ itemSer = checkNullAndTrim(rs.getString("ITEM_SER"));
departmentDescr = checkNullAndTrim(rs.getString("DESCR")); crTerm = checkNullAndTrim(rs.getString("CR_TERM"));
} currCode = checkNullAndTrim(rs.getString("CURR_CODE"));
if (rs != null) chgDate = checkNullAndTrim(rs.getString("CHG_DATE"));
{ chgUser = checkNullAndTrim(rs.getString("CHG_USER"));
rs.close(); chgTerm = checkNullAndTrim(rs.getString("CHG_TERM"));
rs = null; udfStr1 = checkNullAndTrim(rs.getString("UDF_STR__1"));
} confirmed = checkNullAndTrim(rs.getString("CONFIRMED"));
if (pstmt != null ) confDate = checkNullAndTrim(rs.getString("CONF_DATE"));
{ remarks = checkNullAndTrim(rs.getString("REMARKS"));
pstmt.close(); tranCode = checkNullAndTrim(rs.getString("TRAN_CODE"));
pstmt = null; dlvTerm = checkNullAndTrim(rs.getString("DLV_TERM"));
priceList = checkNullAndTrim(rs.getString("PRICE_LIST"));
exchRate = checkNullAndTrim(rs.getString("EXCH_RATE"));
termTable = checkNullAndTrim(rs.getString("TERM_TABLE"));
indNo = checkNullAndTrim(rs.getString("IND_NO"));
transMode = checkNullAndTrim(rs.getString("TRANS_MODE"));
siteDescr = checkNullAndTrim(rs.getString("SITE_DESCR"));
udfStr2 = checkNullAndTrim(rs.getString("UDF_STR__2"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT REL_AMT, TYPE, AMT_TYPE FROM PORD_PAY_TERM WHERE PURC_ORDER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if (rs.next())
{
relAmt = checkNullAndTrim(rs.getString("REL_AMT"));
type = checkNullAndTrim(rs.getString("TYPE"));
amtType = checkNullAndTrim(rs.getString("AMT_TYPE"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT DESCR FROM ITEMSER WHERE ITEM_SER = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemSer);
rs = pstmt.executeQuery();
if (rs.next())
{
itemSerDescr = checkNullAndTrim(rs.getString("DESCR"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = " SELECT SUPP_NAME FROM SUPPLIER WHERE SUPP_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, suppCode);
rs = pstmt.executeQuery();
if (rs.next())
{
suppName = checkNullAndTrim(rs.getString("SUPP_NAME"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = "SELECT DESCR FROM CRTERM where CR_TERM = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, crTerm);
rs = pstmt.executeQuery();
if (rs.next())
{
crTermDescr = checkNullAndTrim(rs.getString("DESCR"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = "SELECT TRAN_NAME FROM TRANSPORTER WHERE TRAN_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranCode);
rs = pstmt.executeQuery();
if (rs.next())
{
tranName = checkNullAndTrim(rs.getString("TRAN_NAME"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
sql = "SELECT DESCR FROM DEPARTMENT WHERE DEPT_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, deptCode);
rs = pstmt.executeQuery();
if (rs.next())
{
departmentDescr = checkNullAndTrim(rs.getString("DESCR"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null )
{
pstmt.close();
pstmt = null;
}
} }
valueXmlString.append("<Detail1 domID='1' selected = 'N'>\r\n"); valueXmlString.append("<Detail1 domID='1' selected = 'N'>\r\n");
...@@ -374,6 +470,7 @@ public class PorderDetailBean ...@@ -374,6 +470,7 @@ public class PorderDetailBean
valueXmlString.append("<tran_code>").append("<![CDATA["+tranCode+"]]>").append("</tran_code>\r\n"); valueXmlString.append("<tran_code>").append("<![CDATA["+tranCode+"]]>").append("</tran_code>\r\n");
valueXmlString.append("<tran_name>").append("<![CDATA["+tranName+"]]>").append("</tran_name>\r\n"); valueXmlString.append("<tran_name>").append("<![CDATA["+tranName+"]]>").append("</tran_name>\r\n");
valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>\r\n"); valueXmlString.append("<price_list>").append("<![CDATA["+priceList+"]]>").append("</price_list>\r\n");
valueXmlString.append("<conf_date>").append("<![CDATA["+confDate+"]]>").append("</conf_date>\r\n"); valueXmlString.append("<conf_date>").append("<![CDATA["+confDate+"]]>").append("</conf_date>\r\n");
valueXmlString.append("<exch_rate>").append("<![CDATA["+exchRate+"]]>").append("</exch_rate>\r\n"); valueXmlString.append("<exch_rate>").append("<![CDATA["+exchRate+"]]>").append("</exch_rate>\r\n");
valueXmlString.append("<dept_code>").append("<![CDATA["+deptCode+"]]>").append("</dept_code>\r\n"); valueXmlString.append("<dept_code>").append("<![CDATA["+deptCode+"]]>").append("</dept_code>\r\n");
......
webitm-wms/ibase/webitm/servlet/wms/ProdWizItemChangeServlet.java
View file @ deb7fb92
...@@ -407,7 +407,7 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -407,7 +407,7 @@ public class ProdWizItemChangeServlet extends HttpServlet
System.out.println("detail value of ["+i+"]======>>" + detail[i]); System.out.println("detail value of ["+i+"]======>>" + detail[i]);
}*/ }*/
//System.out.println("detail value of [29]======>>" + detail[29]);
if(detail[29].equalsIgnoreCase("A")) if(detail[29].equalsIgnoreCase("A"))
{ {
sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? "; sqlSel = " SELECT PURC_ORDER FROM PORDER_TEMP WHERE STATUS = ? AND EMP_CODE = ? AND SITE_CODE__ORD = ? ";
...@@ -450,6 +450,7 @@ public class ProdWizItemChangeServlet extends HttpServlet ...@@ -450,6 +450,7 @@ public class ProdWizItemChangeServlet extends HttpServlet
detail[0] = generateTranId( "w_porderWiz_temp", ordSiteCode, conn ); detail[0] = generateTranId( "w_porderWiz_temp", ordSiteCode, conn );
System.out.println("purchase order after generateTranId ======>>" + detail[0]); System.out.println("purchase order after generateTranId ======>>" + detail[0]);
} }
System.out.println("------- purchase order after ----- " + detail[0]);
if(purcOrderTemp.length() > 0) // purchase order found blank and Status = "A" ADD if(purcOrderTemp.length() > 0) // purchase order found blank and Status = "A" ADD
{ {
......
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