Skip to content

B
business-java
Commit e89a75b5 authored by smane's avatar smane
Browse files
Options

Changes EJB File for QC Approval Wizard(M14HFRA002) to set qc_order field for valuexmlstring 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@97030 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d6dca873
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 78 deletions
webitm-mfg/ibase/webitm/ejb/mfg/QCApprovalWizIC.java
View file @ e89a75b5
...@@ -194,56 +194,13 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -194,56 +194,13 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
break; break;
case 2 : case 2 :
{ {
System.out.println(">>>>>>>>>>>>>>>>>>QCSampleWizIC Validation Call Case 2>>>>>>>>>>>>>>>>>>>>>>"); System.out.println(">>>>>>>>>>>>>>>>>>QCApprovalWizIC Validation Call Case 2>>>>>>>>>>>>>>>>>>>>>>");
/*parentNodeList = dom.getElementsByTagName("Detail2");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
childNodeListLength = childNodeList.getLength();
for(ctr = 0; ctr < childNodeListLength; ctr++)
{
childNode = childNodeList.item(ctr);
childNodeName = childNode.getNodeName();
if(childNode.getFirstChild()!= null)
{
childNodeValue = childNode.getFirstChild().getNodeValue();
}
System.out.println(">>>>>>>>>childNodeName:"+childNodeName);
if(childNodeName.equalsIgnoreCase("tran_date"))
{
System.out.println(">>>>>>>Validaion for tran_date "+genericUtility.getColumnValue("tran_date", dom));
if(genericUtility.getColumnValue("tran_date", dom) == null)
{
errString = getErrorString("tran_date","VTTRNDTNUL",userId);
break;
}
}
else if(childNodeName.equalsIgnoreCase("site_code"))
{
siteCode = genericUtility.getColumnValue("site_code", dom);
System.out.println(">>>>>>>Validaion for site_code "+siteCode);
if(siteCode==null || siteCode.trim().length() == 0)
{
errString = getErrorString("site_code","VTSITEEMT",userId);
break;
}
else
{
cnt = isValueExist("site","site_code",siteCode, conn);
if(cnt == 0)
{
errString = getErrorString("site_code","VMSITE",userId);
break;
}
}
}
}//END FOR
*/
} //end case 2 } //end case 2
break; break;
case 3 : case 3 :
{ {
System.out.println(">>>>>>>>>>>>>>>>>>QCSampleWizIC Validation Call Case 3>>>>>>>>>>>>>>>>>>>>>>"); System.out.println(">>>>>>>>>>>>>>>>>>QCApprovalWizIC Validation Call Case 3>>>>>>>>>>>>>>>>>>>>>>");
NodeList parentNodeList1 = dom2.getElementsByTagName("Detail3"); NodeList parentNodeList1 = dom2.getElementsByTagName("Detail3");
Node parentNode1 = parentNodeList1.item(0); Node parentNode1 = parentNodeList1.item(0);
System.out.println(">>>>>>>>>>parentNode1.getNodeName().length():"+parentNode1.getNodeName().length()); System.out.println(">>>>>>>>>>parentNode1.getNodeName().length():"+parentNode1.getNodeName().length());
...@@ -260,7 +217,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -260,7 +217,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
break; break;
case 4 : case 4 :
{ {
System.out.println(">>>>>>>>>>>>>>>>>>QCSampleWizIC Validation Call Case 4>>>>>>>>>>>>>>>>>>>>>>"); System.out.println(">>>>>>>>>>>>>>>>>>QCApprovalWizIC Validation Call Case 4>>>>>>>>>>>>>>>>>>>>>>");
parentNodeList = dom.getElementsByTagName("Detail4"); parentNodeList = dom.getElementsByTagName("Detail4");
parentNode = parentNodeList.item(0); parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes(); childNodeList = parentNode.getChildNodes();
...@@ -300,28 +257,6 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -300,28 +257,6 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
errString = getErrorString("loc_code__to","VMINVLOC",userId); errString = getErrorString("loc_code__to","VMINVLOC",userId);
break; break;
} }
else
{
/*sql = " select inv_stat from location where loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, locCodeTo);
rs = pstmt.executeQuery();
cnt = 0;
if (rs.next())
{
invStat = rs.getString("inv_stat").trim();
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
if (!("TEST".equalsIgnoreCase(invStat)))
{
errString = getErrorString("loc_code__to","VTINVSTLOC",userId);
break;
}*/
}
} }
else else
{ {
...@@ -434,6 +369,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -434,6 +369,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
String lotNo="",locCode="",lotSl="",locCodeFrom="",locDescrFrom="",lotNoFrom="",lotNoTo="",lotSlFrom="",lotSlTo="",locCodeTo="",locCodeIss=""; String lotNo="",locCode="",lotSl="",locCodeFrom="",locDescrFrom="",lotNoFrom="",lotNoTo="",lotSlFrom="",lotSlTo="",locCodeTo="",locCodeIss="";
String qcOrdType="",descr = "",unit = "",unitSample="",testStatus="",suppCode="",porcpNo="",siteDescr="",qcOrdDateStr=""; String qcOrdType="",descr = "",unit = "",unitSample="",testStatus="",suppCode="",porcpNo="",siteDescr="",qcOrdDateStr="";
String userId = "", termId = "",errCode="",chgTerm="",locType="",dbLocCode="",dbLocType,containerNo=""; String userId = "", termId = "",errCode="",chgTerm="",locType="",dbLocCode="",dbLocType,containerNo="";
String rejectionCode="",rejectionDescr="";
int lineNo = 0,dbLineNo=0; int lineNo = 0,dbLineNo=0;
int currentFormNo= 0; int currentFormNo= 0;
int noArt=0,domId=0,lineNoMax=0; int noArt=0,domId=0,lineNoMax=0;
...@@ -486,7 +422,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -486,7 +422,7 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
System.out.println(">>>>>>>>>>>>>>>>>>>>>>qcOrdNo dom1:"+qcOrdNo); System.out.println(">>>>>>>>>>>>>>>>>>>>>>qcOrdNo dom1:"+qcOrdNo);
sql = "select qorder_date,qorder_type,site_code,item_code,quantity,unit,qty_passed,qty_rejected," + sql = "select qorder_date,qorder_type,site_code,item_code,quantity,unit,qty_passed,qty_rejected," +
"qty_sample,unit__sample,supp_code,porcp_no,lot_no " + "qty_sample,unit__sample,supp_code,porcp_no,lot_no,rejection_code,rejection_descr " +
"from qc_order where qorder_no= ?"; "from qc_order where qorder_no= ?";
pstmt= conn.prepareStatement(sql); pstmt= conn.prepareStatement(sql);
pstmt.setString(1, qcOrdNo); pstmt.setString(1, qcOrdNo);
...@@ -506,6 +442,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -506,6 +442,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
suppCode = rs.getString("supp_code") == null ? "" : rs.getString("supp_code"); suppCode = rs.getString("supp_code") == null ? "" : rs.getString("supp_code");
porcpNo = rs.getString("porcp_no") == null ? "" : rs.getString("porcp_no"); porcpNo = rs.getString("porcp_no") == null ? "" : rs.getString("porcp_no");
lotNo = rs.getString("lot_no") == null ? "" : rs.getString("lot_no"); lotNo = rs.getString("lot_no") == null ? "" : rs.getString("lot_no");
rejectionCode = rs.getString("rejection_code") == null ? "" : rs.getString("rejection_code");
rejectionDescr = rs.getString("rejection_descr") == null ? "" : rs.getString("rejection_descr");
} }
pstmt.close(); pstmt.close();
rs.close(); rs.close();
...@@ -536,8 +474,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -536,8 +474,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
valueXmlString.append("<porcp_no><![CDATA["+ porcpNo +"]]></porcp_no>"); valueXmlString.append("<porcp_no><![CDATA["+ porcpNo +"]]></porcp_no>");
valueXmlString.append("<lot_no><![CDATA["+ lotNo +"]]></lot_no>"); valueXmlString.append("<lot_no><![CDATA["+ lotNo +"]]></lot_no>");
valueXmlString.append("<chg_date><![CDATA[" + sdf.format(currDate).toString() + "]]></chg_date>"); valueXmlString.append("<chg_date><![CDATA[" + sdf.format(currDate).toString() + "]]></chg_date>");
System.out.println(">>>>termId::"+termId); valueXmlString.append("<rejection_code><![CDATA[" + rejectionCode + "]]></rejection_code>");
System.out.println(">>>>userId::"+userId); valueXmlString.append("<rejection_descr><![CDATA[" + rejectionDescr + "]]></rejection_descr>");
valueXmlString.append("<chg_term><![CDATA[" + termId + "]]></chg_term>"); valueXmlString.append("<chg_term><![CDATA[" + termId + "]]></chg_term>");
valueXmlString.append("<chg_user><![CDATA[" + userId + "]]></chg_user>"); valueXmlString.append("<chg_user><![CDATA[" + userId + "]]></chg_user>");
valueXmlString.append("</Detail2>\r\n"); valueXmlString.append("</Detail2>\r\n");
...@@ -645,7 +583,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -645,7 +583,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n"); valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n"); valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull("1")).append("]]></line_no_sl>\r\n"); valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull("1")).append("]]></line_no_sl>\r\n");
//valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n"); System.out.println(">>>>>>>>in case3 Add qc_order:"+qcOrdNo);
valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n");
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
else else
...@@ -666,7 +605,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -666,7 +605,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n"); valueXmlString.append("<unit><![CDATA[").append(unit).append("]]></unit>\r\n");
valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n"); valueXmlString.append("<no_art><![CDATA[").append(noArt).append("]]></no_art>\r\n");
valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull("1")).append("]]></line_no_sl>\r\n"); valueXmlString.append("<line_no_sl><![CDATA[").append(checkNull("1")).append("]]></line_no_sl>\r\n");
//valueXmlString.append("<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n"); System.out.println(">>>>>>>>in case3 Add qc_order:"+qcOrdNo);
valueXmlString.append("<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n");
valueXmlString.append("</Detail3>\r\n"); valueXmlString.append("</Detail3>\r\n");
} }
pstmt1.close(); pstmt1.close();
...@@ -758,8 +698,6 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -758,8 +698,6 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
dbLocType= rs.getString("loctype") == null ? "" : rs.getString("loctype"); dbLocType= rs.getString("loctype") == null ? "" : rs.getString("loctype");
System.out.println(">>>>>>In case 4 dbLineNo Exist:"+dbLineNo); System.out.println(">>>>>>In case 4 dbLineNo Exist:"+dbLineNo);
//valueXmlString.append("<Detail4 domID='" + dbLineNo + "' selected=\"Y\">\r\n");
//valueXmlString.append("<attribute selected=\"N\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append("<Detail4 domID='" + dbLineNo + "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n"); valueXmlString.append("<Detail4 domID='" + dbLineNo + "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n"); valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\" />\r\n");
valueXmlString.append( "<qorder_no><![CDATA[" ).append( qcOrdNo ).append( "]]></qorder_no>\r\n"); valueXmlString.append( "<qorder_no><![CDATA[" ).append( qcOrdNo ).append( "]]></qorder_no>\r\n");
...@@ -775,7 +713,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -775,7 +713,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
valueXmlString.append( "<sample_qty><![CDATA[" ).append( sampleQty ).append( "]]></sample_qty>\r\n" ); valueXmlString.append( "<sample_qty><![CDATA[" ).append( sampleQty ).append( "]]></sample_qty>\r\n" );
valueXmlString.append( "<loctype><![CDATA[" ).append( dbLocType ).append( "]]></loctype>\r\n" ); valueXmlString.append( "<loctype><![CDATA[" ).append( dbLocType ).append( "]]></loctype>\r\n" );
valueXmlString.append( "<line_no_sl><![CDATA[").append(checkNull(containerNo)).append("]]></line_no_sl>\r\n"); valueXmlString.append( "<line_no_sl><![CDATA[").append(checkNull(containerNo)).append("]]></line_no_sl>\r\n");
//valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n"); System.out.println(">>>>>>>>in case4 Add qc_order:"+qcOrdNo);
valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n");
valueXmlString.append("</Detail4>\r\n"); valueXmlString.append("</Detail4>\r\n");
} }
else else
...@@ -797,7 +736,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca ...@@ -797,7 +736,8 @@ public class QCApprovalWizIC extends ValidatorEJB implements QCApprovalWizICLoca
valueXmlString.append( "<sample_qty><![CDATA[" ).append( sampleQty ).append( "]]></sample_qty>\r\n" ); valueXmlString.append( "<sample_qty><![CDATA[" ).append( sampleQty ).append( "]]></sample_qty>\r\n" );
valueXmlString.append( "<loctype><![CDATA[" ).append( "" ).append( "]]></loctype>\r\n" ); valueXmlString.append( "<loctype><![CDATA[" ).append( "" ).append( "]]></loctype>\r\n" );
valueXmlString.append( "<line_no_sl><![CDATA[").append(checkNull(containerNo)).append("]]></line_no_sl>\r\n"); valueXmlString.append( "<line_no_sl><![CDATA[").append(checkNull(containerNo)).append("]]></line_no_sl>\r\n");
//valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n"); System.out.println(">>>>>>>>in case4 Add qc_order:"+qcOrdNo);
valueXmlString.append( "<qc_order><![CDATA[" ).append( qcOrdNo ).append( "]]></qc_order>\r\n");
valueXmlString.append("</Detail4>\r\n"); valueXmlString.append("</Detail4>\r\n");
} }
}//end for loop for get selected/... }//end for loop for get selected/...
......
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