Skip to content

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

correction of logic 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@95871 ce508802-f39f-4f6c-b175-0d175dae99d5
parent c9bc0078
Show whitespace changes
Inline Side-by-side
Showing with 246 additions and 72 deletions
webitm-mfg/ibase/webitm/ejb/mfg/WorkOrdRcpDet.java
View file @ 10158d5a
......@@ -432,7 +432,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
}
}
else if(childNodeName.equalsIgnoreCase("no_art"))
/*else if(childNodeName.equalsIgnoreCase("no_art"))
{
String noArt = genericUtility.getColumnValue("no_art",dom2);
......@@ -451,7 +451,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
errString = getErrorString("no_art",errCode,userId);
break;
}
}
}*/
else if(childNodeName.equalsIgnoreCase("quantity"))
{
......@@ -569,7 +569,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
String siteCodeTo = "", siteCodeFr = "", fromTranDate = "", toTranDate = "", insertQuery = "", path = "", objName = "intercomp_reconcile";
String sundryTypeFr = "", sundryTypeTo = "", sundryCodeFr = "", sundryCodeTo = "",siteCodeFrDescr="",siteCodeToDescr="";
StringBuffer valueXmlString = null;
int currentFormNo = 0;
int currentFormNo = 0, lineNo = 0;
NodeList parentNodeList = null;
NodeList childNodeList = null;
Node parentNode = null;
......@@ -585,7 +585,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
System.out.println("DOM111 Elements>>["+genericUtility.serializeDom(dom).toString()+"]");
System.out.println("DOM222 Elements>>["+genericUtility.serializeDom(dom1).toString()+"]");
System.out.println("DOM322 Elements>>["+genericUtility.serializeDom(dom2).toString()+"]");
String workOrder = "",itemCode = "",itemDescr="",sql="",lineNo="",unit="",packCode="",qcReqd="",locGrp="";
String workOrder = "",itemCode = "",itemDescr="",sql="",unit="",packCode="",qcReqd="",locGrp="";
double totDetQuan = 0.0,totNoArt=0.0;
java.sql.Timestamp currDate = null,mfgDateStart = null,startDate=null,expDate=null,tdate = null;
double quantity = 0,grossWeight = 0,tareWeight = 0,netWeight = 0,noOfArt=0,shippsize = 0;
......@@ -599,6 +599,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
String scrFlag = "";
String xmlString = "";
String todayDate = "";
String noOfArts = "";
try
{
......@@ -634,9 +635,10 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
System.out.println("itm_default >>>>> 2>>");
workOrder = genericUtility.getColumnValue("work_order", dom1);
sql = "select count(1) from workorder_receipt where work_order = ?";
sql = "select count(1) from workorder_receipt where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder);
pstmt.setString(2,"N");
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -658,10 +660,11 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
System.out.println(">>>>>>>>>>>SXD"+workOrder);
sql = "select a.tran_id,a.tran_date,a.site_code,a.work_order,a.date__start,"
+ "a.item_code,b.descr,a.loc_code,a.lot_sl,a.quantity,a.no_art,a.unit,a.gross_weight,a.tare_weight,a.net_weight "
+ "FROM workorder_receipt a,item b WHERE a.item_code = b.item_code and a.work_order = ?";
+ "a.item_code,b.descr,a.loc_code,a.lot_sl,a.quantity,a.no_art,a.unit "
+ "FROM workorder_receipt a,item b WHERE a.item_code = b.item_code and a.work_order = ? and a.confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder);
pstmt.setString(2,"N");
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -677,9 +680,25 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
quantity = rs.getDouble(10);
noOfArt = rs.getDouble(11);
unit = rs.getString(12) == null ? "":rs.getString(12);
grossWeight = rs.getDouble(13);
tareWeight = rs.getDouble(14);
netWeight = rs.getDouble(15);
sql = "select gross_weight,net_weight from item where item_code = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
grossWeight = rs1.getDouble(1);
netWeight = rs1.getDouble(2);
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
tareWeight = grossWeight - netWeight;
simpleDateFormat=new SimpleDateFormat(genutility.getApplDateFormat());
currAppdate = simpleDateFormat.format(currDate);
......@@ -726,7 +745,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
rs = null;
}
}
else
/*else commented on 11/aug/14
{
......@@ -751,9 +770,10 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
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.setString(1,workOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -817,9 +837,10 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
valueXmlString.append("<exp_date>").append("<![CDATA[" + sExpDate + "]]>").append("</exp_date>");
valueXmlString.append("<site_code__own>").append("<![CDATA[" + woSiteCode + "]]>").append("</site_code__own>");
sql = "select sum(quantity) from workorder_rcp_det where work_order = ?";
sql = "select sum(quantity) from workorder_rcp_det where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -891,9 +912,10 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
valueXmlString.append("<conv__qty_stduom>").append("<![CDATA[1]]>").append("</conv__qty_stduom>");
sql = "select sum(no_art) from workorder_rcp_det where work_order = ?";
sql = "select sum(no_art) from workorder_rcp_det where work_order = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,workOrder);
pstmt.setString(2, "N");
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -935,7 +957,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
}
}
}*/
......@@ -944,7 +966,8 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
parentNodeList = dom2.getElementsByTagName("Detail3");
parentNode = parentNodeList.item(0);
childNodeList = parentNode.getChildNodes();
tranid = genericUtility.getColumnValue("tran_id", dom2, "2");
//tranid = genericUtility.getColumnValue("tran_id", dom2, "2");
tranid = genericUtility.getColumnValue("tranid", dom1);
//childNodeListLength = childNodeList.getLength();
System.out.println("tran val"+tranid);
if(currentColumn.trim().equalsIgnoreCase("itm_default"))
......@@ -952,10 +975,11 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
System.out.println("tran id is"+tranid);
sql = "select work_order,item_code,lot_sl,lot_no,no_art,quantity,gross_weight,tare_weight,net_weight,line_no "
+ "from workorder_rcp_det where tran_id = ?";
sql = "select work_order,item_code,lot_sl,lot_no,no_art,quantity,line_no,gross_weight, tare_weight,net_weight "
+ "from workorder_rcp_det where tran_id = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranid);
pstmt.setString(2,"N");
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -966,12 +990,32 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
lotNo = rs.getString(4) == null ? "":rs.getString(4);
noOfArt = rs.getDouble(5);
quantity = rs.getDouble(6);
grossWeight = rs.getDouble(7);
tareWeight = rs.getDouble(8);
netWeight = rs.getDouble(9);
lineNo = rs.getString(10) == null ? "":rs.getString(10);
lineNo = rs.getInt(7);
grossWeight = rs.getDouble("gross_weight");
netWeight = rs.getDouble("net_weight");
tareWeight = rs.getDouble("tare_weight");
/*sql = "select gross_weight,net_weight from item where item_code = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
grossWeight = rs1.getDouble(1);
netWeight = rs1.getDouble(2);
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
tareWeight = grossWeight - netWeight;
*/
valueXmlString.append("<Detail3 domID='" + lineNo+ "' objContext = '"+currentFormNo+"' selected=\"Y\">\r\n");
valueXmlString.append("<attribute selected=\"Y\" updateFlag=\"E\" status=\"O\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id>").append("<![CDATA[" + tranid + "]]>").append("</tran_id>");
......@@ -1003,9 +1047,12 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
{
tranid = genericUtility.getColumnValue("tran_id", dom2, "2");
workOrder = genericUtility.getColumnValue("work_order", dom2, "2");
itemCode = genericUtility.getColumnValue("item_code", dom2, "2");
//tranid = genericUtility.getColumnValue("tran_id", dom2, "2");
//workOrder = genericUtility.getColumnValue("work_order", dom2, "2");
//itemCode = genericUtility.getColumnValue("item_code", dom2, "2");
tranid = genericUtility.getColumnValue("tranid", dom1);
workOrder = genericUtility.getColumnValue("work_order", dom1);
itemCode = genericUtility.getColumnValue("item_code", dom1);
System.out.println("TRANID IS>>>"+tranid);
NodeList nodeList = dom2.getElementsByTagName("Detail3");
......@@ -1016,11 +1063,27 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
System.out.println("tran id is"+tranid);
sql = "max(line_no) "
+ "from workorder_rcp_det where tran_id = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranid);
pstmt.setString(2,"N");
rs = pstmt.executeQuery();
if(rs.next())
{
lineNo = rs.getInt(1);
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
sql = "select work_order,item_code,lot_sl,lot_no,no_art,quantity,gross_weight,tare_weight,net_weight "
+ "from workorder_receipt where tran_id = ?";
sql = "select work_order,item_code,lot_sl,lot_no,no_art,quantity "
+ "from workorder_receipt where tran_id = ? and confirmed = ?";
pstmt=conn.prepareStatement(sql);
pstmt.setString(1,tranid);
pstmt.setString(2,"N");
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -1031,30 +1094,55 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
lotNo = rs.getString(4) == null ? "":rs.getString(4);
noOfArt = rs.getDouble(5);
quantity = rs.getDouble(6);
grossWeight = rs.getDouble(7);
tareWeight = rs.getDouble(8);
netWeight = rs.getDouble(9);
valueXmlString.append("<Detail3 domID='" + domId+ "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
lineNo++;
valueXmlString.append("<Detail3 domID='" + lineNo+ "' objContext = '"+currentFormNo+"' selected=\"N\">\r\n");
valueXmlString.append("<attribute selected=\"N\" updateFlag=\"A\" status=\"N\" pkNames=\"\"/>\r\n");
valueXmlString.append("<tran_id><![CDATA[" + tranid + "]]></tran_id>");
valueXmlString.append("<line_no><![CDATA[" + domId + "]]></line_no>");
valueXmlString.append("<line_no><![CDATA[" + lineNo + "]]></line_no>");
valueXmlString.append("<work_order>").append("<![CDATA[" + workOrder + "]]>").append("</work_order>");
valueXmlString.append("<item_code>").append("<![CDATA[" + itemCode + "]]>").append("</item_code>");
valueXmlString.append("<lot_no>").append("<![CDATA[" + lotNo + "]]>").append("</lot_no>");
valueXmlString.append("<lot_sl>").append("<![CDATA[" + lotsl + "]]>").append("</lot_sl>");
valueXmlString.append("<no_art>").append("<![CDATA[" + noOfArt + "]]>").append("</no_art>");
valueXmlString.append("<lot_sl>").append("<![CDATA[]]>").append("</lot_sl>");
valueXmlString.append("<no_art>").append("<![CDATA[0]]>").append("</no_art>");
valueXmlString.append("<gross_weight>").append("<![CDATA[0]]>").append("</gross_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[0]]>").append("</tare_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[0]]>").append("</net_weight>");
valueXmlString.append("<quantity>").append("<![CDATA[0]]>").append("</quantity>");
//select shipper_size from item_lot_packsize where item_code = 'EF0050';
sql = "select shipper_size from item_lot_packsize where item_code = ?";
/*sql = "select gross_weight,net_weight from item where item_code = ?";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
grossWeight = rs1.getDouble(1);
netWeight = rs1.getDouble(2);
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
tareWeight = grossWeight - netWeight;
valueXmlString.append("<gross_weight>").append("<![CDATA[" + grossWeight + "]]>").append("</gross_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[" + tareWeight + "]]>").append("</tare_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[" + netWeight + "]]>").append("</net_weight>");
sql = "select shipper_size from item_lot_packsize where item_code = ? and lot_no = ? and gross_weight = ? and net_weight = ?"; //changes (add lot_no,gross_weight,net_weight) done as per 11/AUG/14
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
pstmt1.setString(2,lotNo);
pstmt1.setDouble(3,grossWeight);
pstmt1.setDouble(4,netWeight);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
shippsize = rs1.getDouble(1);
}
......@@ -1076,6 +1164,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
setNodeValue( dom, "quantity", getAbsString(""+quantity));
}
*/
sql = "select loc_code__insp from siteitem where item_code = ? and site_code = ?";
pstmt1=conn.prepareStatement(sql);
......@@ -1095,30 +1184,57 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
valueXmlString.append("<loc_code>").append("<![CDATA[" + locCode + "]]>").append("</loc_code>");
valueXmlString.append("<gross_weight>").append("<![CDATA[" + grossWeight + "]]>").append("</gross_weight>");
valueXmlString.append("<tare_weight>").append("<![CDATA[" + tareWeight + "]]>").append("</tare_weight>");
valueXmlString.append("<net_weight>").append("<![CDATA[" + netWeight + "]]>").append("</net_weight>");
valueXmlString.append("</Detail3>");
valueXmlString.append("</Detail3>");
}
pstmt.close();
rs.close();
pstmt = null;
rs = null;
}
else if(currentColumn.trim().equalsIgnoreCase("no_art"))
{
noOfArts = genericUtility.getColumnValue("no_art",dom);
lotNo = genericUtility.getColumnValue("lot_no",dom);
itemCode = genericUtility.getColumnValue("item_code",dom);
if (noOfArts == null || noOfArts.trim().length() == 0)
{
noOfArt = 0;
}
else
{
noOfArt = Double.parseDouble(noOfArts);
}
if(noOfArt > 0)
{
sql = "select shipper_size,gross_weight,net_weight from item_lot_packsize where item_code = ? and lot_no = ? and lot_no__from <= ? and lot_no__to >= ? ";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
pstmt1.setString(2,lotNo);
pstmt1.setString(3,lotNo);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
shippsize = rs1.getDouble("shipper_size");
grossWeight = rs1.getDouble("gross_weight");
netWeight = rs1.getDouble("net_weight");
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
else if(currentColumn.trim().equalsIgnoreCase("no_art"))
{
sql = "select shipper_size from item_lot_packsize where item_code = ?";
/*sql = "select shipper_size from item_lot_packsize where item_code = ? and lot_no = ? and gross_weight = ? and net_weight = ?"; //changes (add lot_no,gross_weight,net_weight) done as per 11/AUG/14
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
pstmt1.setString(2,lotNo);
pstmt1.setDouble(3,grossWeight);
pstmt1.setDouble(4,netWeight);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
......@@ -1130,6 +1246,7 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
rs1.close();
pstmt1 = null;
rs1 = null;
*/
quantity = shippsize * noOfArt;
......@@ -1142,8 +1259,65 @@ public class WorkOrdRcpDet extends ValidatorEJB implements WorkOrdRcpDetLocal, W
{
valueXmlString.append("<quantity protect=\"1\">").append("<![CDATA[" + quantity + "]]>").append("</quantity>");
setNodeValue( dom, "quantity", getAbsString(""+quantity));
}
valueXmlString.append("<gross_weight protect=\"0\">").append("<![CDATA[" + (noOfArt * grossWeight) + "]]>").append("</gross_weight>");
setNodeValue( dom, "gross_weight", getAbsString(""+ (noOfArt * grossWeight)));
valueXmlString.append("<net_weight protect=\"0\">").append("<![CDATA[" + (noOfArt * netWeight) + "]]>").append("</net_weight>");
setNodeValue( dom, "net_weight", getAbsString(""+(noOfArt * netWeight)));
valueXmlString.append("<tare_weight protect=\"0\">").append("<![CDATA[" + ( (noOfArt * grossWeight) - (noOfArt * netWeight)) + "]]>").append("</tare_weight>");
setNodeValue( dom, "tare_weight", getAbsString(""+( (noOfArt * grossWeight) - (noOfArt * netWeight))));
}
else if(currentColumn.trim().equalsIgnoreCase("quantity"))
{
quantity = Double.parseDouble(genericUtility.getColumnValue("quantity",dom));
lotNo = genericUtility.getColumnValue("lot_no",dom);
itemCode = genericUtility.getColumnValue("item_code",dom);
sql = "select gross_weight,net_weight from item where item_code = ? ";
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
grossWeight = rs1.getDouble("gross_weight");
netWeight = rs1.getDouble("net_weight");
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
/*sql = "select shipper_size from item_lot_packsize where item_code = ? and lot_no = ? and gross_weight = ? and net_weight = ?"; //changes (add lot_no,gross_weight,net_weight) done as per 11/AUG/14
pstmt1=conn.prepareStatement(sql);
pstmt1.setString(1,itemCode);
pstmt1.setString(2,lotNo);
pstmt1.setDouble(3,grossWeight);
pstmt1.setDouble(4,netWeight);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
shippsize = rs1.getDouble(1);
}
pstmt1.close();
rs1.close();
pstmt1 = null;
rs1 = null;
*/
valueXmlString.append("<gross_weight protect=\"0\">").append("<![CDATA[" + (quantity * grossWeight) + "]]>").append("</gross_weight>");
setNodeValue( dom, "gross_weight", getAbsString(""+ (quantity * grossWeight)));
valueXmlString.append("<net_weight protect=\"0\">").append("<![CDATA[" + (quantity * netWeight) + "]]>").append("</net_weight>");
setNodeValue( dom, "net_weight", getAbsString(""+(quantity * netWeight)));
valueXmlString.append("<tare_weight protect=\"0\">").append("<![CDATA[" + ( (quantity * grossWeight) - (quantity * netWeight)) + "]]>").append("</tare_weight>");
setNodeValue( dom, "tare_weight", getAbsString(""+( (quantity * grossWeight) - (quantity * netWeight))));
}
}
break;
......
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