Skip to content

B
business-java
Commit cb2694d5 authored by manohar's avatar manohar
Browse files
Options

logical changes 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95872 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 10158d5a
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 70 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WorkOrdRcpDet.java
View file @ cb2694d5
...@@ -745,18 +745,18 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -745,18 +745,18 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
rs = null; rs = null;
} }
} }
/*else commented on 11/aug/14 else //commented on 11/aug/14
{ {
System.out.println("in add >>>>>"); System.out.println("in add >>>>>");
if(currentColumn.trim().equalsIgnoreCase("itm_default_add")) //if(currentColumn.trim().equalsIgnoreCase("itm_default_add"))
{ //{
sdf=new SimpleDateFormat(genutility.getApplDateFormat()); sdf=new SimpleDateFormat(genutility.getApplDateFormat());
currDate = new java.sql.Timestamp(System.currentTimeMillis()) ; currDate = new java.sql.Timestamp(System.currentTimeMillis()) ;
currAppdate = sdf.format(currDate); currAppdate = sdf.format(currDate);
String xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>"; /*String xmlValues ="<?xml version=\"1.0\" encoding=\"utf-8\"?><Root>";
xmlValues = xmlValues + "<Header></Header>"; xmlValues = xmlValues + "<Header></Header>";
xmlValues = xmlValues + "<Detail1>"; xmlValues = xmlValues + "<Detail1>";
xmlValues = xmlValues + "<tran_id></tran_id>"; xmlValues = xmlValues + "<tran_id></tran_id>";
...@@ -768,12 +768,11 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -768,12 +768,11 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME); TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
atranid = tg.generateTranSeqID("WORDWI","tran_id","_spsite_code,T,tran_type,_pptran_date,seq04",conn); atranid = tg.generateTranSeqID("WORDWI","tran_id","_spsite_code,T,tran_type,_pptran_date,seq04",conn);
System.out.println(">>>>>NEW id"+atranid); System.out.println(">>>>>NEW id"+atranid);
*/
System.out.println("in add >>>>>enter"); sql = "select site_code,rel_date,item_code,lot_no,exp_date,mfg_date__start from workorder where work_order = ?";
sql = "select site_code,rel_date,item_code,lot_no,exp_date,mfg_date__start from workorder where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder); pstmt.setString(1,workOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
...@@ -803,19 +802,24 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -803,19 +802,24 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
sMfgDateStart = simpleDateFormat.format(mfgDateStart); sMfgDateStart = simpleDateFormat.format(mfgDateStart);
} }
count = 1;
count++;
valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n"); valueXmlString.append("<Detail2 domID='" + count + "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n"); valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
//valueXmlString.append("<tran_id/>\r\n"); //valueXmlString.append("<tran_id/>\r\n");
valueXmlString.append("<tran_id>").append("<![CDATA[" + atranid + "]]>").append("</tran_id>"); valueXmlString.append("<tran_id>").append("<![CDATA[]]>").append("</tran_id>");
valueXmlString.append("<tran_date>").append("<![CDATA[" + currAppdate + "]]>").append("</tran_date>"); valueXmlString.append("<tran_date>").append("<![CDATA[" + currAppdate + "]]>").append("</tran_date>");
valueXmlString.append("<site_code>").append("<![CDATA[" + loginSite + "]]>").append("</site_code>"); valueXmlString.append("<site_code>").append("<![CDATA[" + woSiteCode + "]]>").append("</site_code>");
valueXmlString.append("<work_order>").append("<![CDATA[" + workOrder + "]]>").append("</work_order>"); valueXmlString.append("<work_order>").append("<![CDATA[" + workOrder + "]]>").append("</work_order>");
valueXmlString.append("<tran_type>").append("<![CDATA[F]]>").append("</tran_type>");
valueXmlString.append("<operation>").append("<![CDATA[0]]>").append("</operation>");
valueXmlString.append("<date__start>").append("<![CDATA[" + sStartDate + "]]>").append("</date__start>"); valueXmlString.append("<date__start>").append("<![CDATA[" + sStartDate + "]]>").append("</date__start>");
valueXmlString.append("<date__compl>").append("<![CDATA[" + currAppdate + "]]>").append("</date__compl>"); valueXmlString.append("<date__compl>").append("<![CDATA[" + currAppdate + "]]>").append("</date__compl>");
valueXmlString.append("<item_code>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>"); valueXmlString.append("<item_code>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>");
valueXmlString.append("<loc_code>").append("<![CDATA[ ]]>").append("</loc_code>");
valueXmlString.append("<lot_no>").append("<![CDATA[" + lotNo + "]]>").append("</lot_no>");
valueXmlString.append("<lot_sl>").append("<![CDATA[]]>").append("</lot_sl>");
valueXmlString.append("<exp_date>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>");
valueXmlString.append("<site_code__own>").append("<![CDATA[" + woSiteCode + "]]>").append("</site_code__own>");
sql = "select descr from item where item_code = ?"; sql = "select descr from item where item_code = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -830,43 +834,80 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -830,43 +834,80 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
pstmt = null; pstmt = null;
rs = null; rs = null;
valueXmlString.append("<descr>").append("<![CDATA[" + itemDescr + "]]>").append("</descr>"); valueXmlString.append("<descr>").append("<![CDATA[" + itemDescr + "]]>").append("</descr>");
sql = "select unit,pack_code from item where item_code = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
unit = rs.getString("unit") == null ? "":rs.getString("unit");
packCode = rs.getString("pack_code") == null ? "":rs.getString("pack_code");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
valueXmlString.append("<loc_code>").append("<![CDATA[ ]]>").append("</loc_code>"); valueXmlString.append("<unit>").append("<![CDATA[" + unit + "]]>").append("</unit>");
valueXmlString.append("<lot_no>").append("<![CDATA[" + lotNo + "]]>").append("</lot_no>"); valueXmlString.append("<pack_code>").append("<![CDATA[" + packCode + "]]>").append("</pack_code>");
valueXmlString.append("<lot_sl>").append("<![CDATA[ ]]>").append("</lot_sl>"); valueXmlString.append("<confirmed>").append("<![CDATA[N]]>").append("</confirmed>");
valueXmlString.append("<exp_date>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>"); valueXmlString.append("<mfg_date>").append("<![CDATA[" + sMfgDateStart + "]]>").append("</mfg_date>");
valueXmlString.append("<site_code__own>").append("<![CDATA[" + woSiteCode + "]]>").append("</site_code__own>"); sql = "select qc_reqd from siteitem where site_code = ? and item_code = ?";
sql = "select sum(quantity) from workorder_rcp_det where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder); pstmt.setString(1,loginSite);
pstmt.setString(2, "N"); pstmt.setString(2,itemCode);
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
totDetQuan = rs.getDouble(1); qcReqd = rs.getString(1) == null ? "":rs.getString(1);
} }
pstmt.close(); pstmt.close();
rs.close(); rs.close();
pstmt = null; pstmt = null;
rs = null; rs = null;
valueXmlString.append("<quantity>").append("<![CDATA[" + totDetQuan + "]]>").append("</quantity>"); valueXmlString.append("<qc_reqd>").append("<![CDATA[" + qcReqd + "]]>").append("</qc_reqd>");
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[1]]>").append("</conv__qty_stduom>");
valueXmlString.append("<unit__std>").append("<![CDATA[" + unit + "]]>").append("</unit__std>");
valueXmlString.append("<std_qty>").append("<![CDATA[" + totDetQuan + "]]>").append("</std_qty>");
valueXmlString.append("<create_stab>").append("<![CDATA[N]]>").append("</create_stab>");
if(qcReqd.equalsIgnoreCase("Y"))
{
sql = "select var_value from mfgparm where var_name = 'WORCP_LOCK_GROUP'";
pstmt=conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
locGrp = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
sql = "select unit from item where item_code = ?"; if(locGrp != null && locGrp.trim().length() > 0)
{
valueXmlString.append("<lock_group>").append("<![CDATA[" + locGrp + "]]>").append("</lock_group>");
}
}
/*sql = "select sum(quantity) from workorder_rcp_det where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,itemCode); pstmt.setString(1,workOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery(); rs = pstmt.executeQuery();
if(rs.next()) if(rs.next())
{ {
unit = rs.getString(1) == null ? "":rs.getString(1); totDetQuan = rs.getDouble(1);
} }
pstmt.close(); pstmt.close();
rs.close(); rs.close();
pstmt = null; pstmt = null;
rs = null; rs = null;
valueXmlString.append("<unit>").append("<![CDATA[" + unit + "]]>").append("</unit>"); valueXmlString.append("<quantity>").append("<![CDATA[" + totDetQuan + "]]>").append("</quantity>");
sql = "select pack_code from item where item_code = ?"; sql = "select pack_code from item where item_code = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
...@@ -894,24 +935,6 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -894,24 +935,6 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
sql = "select qc_reqd from siteitem where site_code = ? and item_code = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,loginSite);
pstmt.setString(2,itemCode);
rs = pstmt.executeQuery();
if(rs.next())
{
qcReqd = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
valueXmlString.append("<qc_reqd>").append("<![CDATA[" + qcReqd + "]]>").append("</qc_reqd>");
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[1]]>").append("</conv__qty_stduom>");
sql = "select sum(no_art) from workorder_rcp_det where work_order = ? and confirmed = ?"; sql = "select sum(no_art) from workorder_rcp_det where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql); pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder); pstmt.setString(1,workOrder);
...@@ -926,38 +949,15 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W ...@@ -926,38 +949,15 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
pstmt = null; pstmt = null;
rs = null; rs = null;
valueXmlString.append("<no_art>").append("<![CDATA[" + totNoArt + "]]>").append("</no_art>"); valueXmlString.append("<no_art>").append("<![CDATA[" + totNoArt + "]]>").append("</no_art>");
valueXmlString.append("<unit__std>").append("<![CDATA[" + unit + "]]>").append("</unit__std>");
valueXmlString.append("<std_qty>").append("<![CDATA[" + totDetQuan + "]]>").append("</std_qty>");
valueXmlString.append("<create_stab>").append("<![CDATA[N]]>").append("</create_stab>");
valueXmlString.append("<gross_weight>").append("<![CDATA[0]]>").append("</gross_weight>"); valueXmlString.append("<gross_weight>").append("<![CDATA[0]]>").append("</gross_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[0]]>").append("</tare_weight>"); valueXmlString.append("<tare_weight>").append("<![CDATA[0]]>").append("</tare_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[0]]>").append("</net_weight>"); valueXmlString.append("<net_weight>").append("<![CDATA[0]]>").append("</net_weight>");
*/
if(qcReqd.equalsIgnoreCase("Y"))
{
sql = "select var_value from mfgparm where var_name = 'WORCP_LOCK_GROUP'";
pstmt=conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if(rs.next())
{
locGrp = rs.getString(1) == null ? "":rs.getString(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
if(locGrp != null && locGrp.trim().length() > 0)
{
valueXmlString.append("<lock_group>").append("<![CDATA[" + locGrp + "]]>").append("</lock_group>");
}
}
valueXmlString.append("</Detail2>"); valueXmlString.append("</Detail2>");
} }
}*/ //}
......
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