[Servsys-svn] SF.net SVN: servsys:[122] trunk/servsys/src/com/pandmservices
Brought to you by:
molnar_c
Menu
▾
▴
[Servsys-svn] SF.net SVN: servsys:[122] trunk/servsys/src/com/pandmservices
|
From: <mol...@us...> - 2010-01-24 01:06:03
|
Revision: 122
http://servsys.svn.sourceforge.net/servsys/?rev=122&view=rev
Author: molnar_c
Date: 2010-01-24 01:05:56 +0000 (Sun, 24 Jan 2010)
Log Message:
-----------
Added subcontractor costs
Changed keycode description
All changes on worksheets and master worksheets
Modified Paths:
--------------
trunk/servsys/src/com/pandmservices/UniMasterWsItems.java
trunk/servsys/src/com/pandmservices/UniWorksheet.java
trunk/servsys/src/com/pandmservices/UniWsItems.java
trunk/servsys/src/com/pandmservices/web/UniCash.java
Modified: trunk/servsys/src/com/pandmservices/UniMasterWsItems.java
===================================================================
--- trunk/servsys/src/com/pandmservices/UniMasterWsItems.java 2010-01-22 01:47:55 UTC (rev 121)
+++ trunk/servsys/src/com/pandmservices/UniMasterWsItems.java 2010-01-24 01:05:56 UTC (rev 122)
@@ -16,6 +16,7 @@
private int quantity=0; //default value to null
private double cost=0; //default value to null
private double laborcost=0; //default value to null
+ private double subcost=0;
private int laborhours=0;
private int shophours=0;
@@ -38,6 +39,7 @@
this.laborhours = rs.getInt("laborhours");
this.shophours = rs.getInt("shophours");
this.laborcost = rs.getDouble("laborcost");
+ this.subcost=rs.getDouble("subcost");
}
@@ -99,18 +101,18 @@
}
- public static void UpdateItem(Connection con, int itemrec, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours )
+ public static void UpdateItem(Connection con, int itemrec, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours, String subcost )
throws SQLException
{
Statement stmt = con.createStatement();
- stmt.executeUpdate("Update masterwsitem Set wsrec='" +wsrec+ "',item = '"+item+"', keycode = '"+keycode +"',quantity = '"+quantity +"',cost = '"+cost +"', laborhours = '"+laborhours+"', laborcost = '"+laborcost+"', shophours = '"+shophours+"' Where itemrec=" + itemrec + ";");
+ stmt.executeUpdate("Update masterwsitem Set wsrec='" +wsrec+ "',item = '"+item+"', keycode = '"+keycode +"',quantity = '"+quantity +"',cost = '"+cost +"', laborhours = '"+laborhours+"', laborcost = '"+laborcost+"', shophours = '"+shophours+"', subcost = '"+subcost+"' Where itemrec=" + itemrec + ";");
}
-public static void AddItem(Connection con, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours)
+public static void AddItem(Connection con, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours, String subcost)
throws SQLException
{
Statement stmt = con.createStatement();
- stmt.executeUpdate("INSERT INTO masterwsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"')");
+ stmt.executeUpdate("INSERT INTO masterwsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours, subcost) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"','"+subcost+"')");
}
public int getId() { return id; }
@@ -122,6 +124,7 @@
public int getWsQuant() { return quantity; }
public double getWsCost() { return cost; }
public double getWsLaborCost() { return laborcost; }
+ public double getWsSubCost() { return subcost; }
public int getWsLaborHours() { return laborhours; }
public int getWsShopHours() { return shophours; }
Modified: trunk/servsys/src/com/pandmservices/UniWorksheet.java
===================================================================
--- trunk/servsys/src/com/pandmservices/UniWorksheet.java 2010-01-22 01:47:55 UTC (rev 121)
+++ trunk/servsys/src/com/pandmservices/UniWorksheet.java 2010-01-24 01:05:56 UTC (rev 122)
@@ -14,6 +14,8 @@
private String wsdate=null; //default value to null
private String wsdesc=null; //default value to null
private String wsmult=null;
+ private String wsmultlab=null;
+ private String wsmultsub=null;
private String custsite=null;
private String sitenum=null;
private String techid=null;
@@ -38,6 +40,8 @@
this.sitenum=rs.getString("sitenum");
this.techid=rs.getString("techid");
this.servsync=rs.getInt("servsync");
+ this.wsmultlab = rs.getString("wsmultlab");
+ this.wsmult = rs.getString("wsmultsub");
}
@@ -129,19 +133,19 @@
stmt.executeUpdate("Delete From wsitem Where custsite=NULL and sitenum=NULL;");
}
- public static void UpdateItem(Connection con, int wsrec, int crec, String wsdate, String wsdescription, String wsmult)
+ public static void UpdateItem(Connection con, int wsrec, int crec, String wsdate, String wsdescription, String wsmult, String wsmultlab, String wsmultsub)
throws SQLException
{
Statement stmt = con.createStatement();
- stmt.executeUpdate("Update worksheet Set crec='" +crec+ "',wsdate = '"+wsdate+"',wsdesc = '"+wsdescription +"', wsmult='"+wsmult+"', servsync='9' Where wsrec=" + wsrec + ";");
+ stmt.executeUpdate("Update worksheet Set crec='" +crec+ "',wsdate = '"+wsdate+"',wsdesc = '"+wsdescription +"', wsmult='"+wsmult+"', wsmultlab='"+wsmultlab+"', wsmultsub='"+wsmultsub+"', servsync='9' Where wsrec=" + wsrec + ";");
}
-public static void AddItem(Connection con, int crec, String wsdate, String wsdescription, String wsmult, String custsite, String sitenum, String techid, int servsync)
+public static void AddItem(Connection con, int crec, String wsdate, String wsdescription, String wsmult, String custsite, String sitenum, String techid, int servsync, String wsmultlab, String wsmultsub)
throws SQLException
{
Statement stmt = con.createStatement();
//System.out.println("INSERT INTO worksheet (crec, wsdate, wsdesc, wsmult) Values ('"+crec+"','" +wsdate+ "','" +wsdescription+ "', '"+wsmult+"')");
- stmt.executeUpdate("INSERT INTO worksheet (crec, wsdate, wsdesc, wsmult, custsite, sitenum, techid, servsync, wsnotes) Values ('"+crec+"','" +wsdate+ "','" +wsdescription+ "', '"+wsmult+"', '"+custsite+"','"+sitenum+"','"+techid+"','"+servsync+"','-')");
+ stmt.executeUpdate("INSERT INTO worksheet (crec, wsdate, wsdesc, wsmult, custsite, sitenum, techid, servsync, wsnotes, wsmultlab, wsmultsub) Values ('"+crec+"','" +wsdate+ "','" +wsdescription+ "', '"+wsmult+"', '"+custsite+"','"+sitenum+"','"+techid+"','"+servsync+"','-', '"+wsmultlab+"','"+wsmultsub+"')");
}
public static Vector getMaxItem(Connection c)
@@ -171,5 +175,7 @@
public String getCustSite() { return custsite; }
public String getTechId() { return techid; }
public int getServSync() { return servsync; }
+ public String getWsMultLab() { return wsmultlab; }
+ public String getWsMultSub() { return wsmultsub; }
}
Modified: trunk/servsys/src/com/pandmservices/UniWsItems.java
===================================================================
--- trunk/servsys/src/com/pandmservices/UniWsItems.java 2010-01-22 01:47:55 UTC (rev 121)
+++ trunk/servsys/src/com/pandmservices/UniWsItems.java 2010-01-24 01:05:56 UTC (rev 122)
@@ -16,6 +16,7 @@
private int quantity=0; //default value to null
private double cost=0; //default value to null
private double laborcost=0; //default value to null
+ private double subcost=0;
private int laborhours=0;
private int shophours=0;
@@ -38,6 +39,7 @@
this.laborhours = rs.getInt("laborhours");
this.shophours = rs.getInt("shophours");
this.laborcost = rs.getDouble("laborcost");
+ this.subcost = rs.getDouble("subcost");
}
@@ -83,19 +85,19 @@
}
- public static void UpdateItem(Connection con, int itemrec, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours )
+ public static void UpdateItem(Connection con, int itemrec, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours, String subcost )
throws SQLException
{
Statement stmt = con.createStatement();
- stmt.executeUpdate("Update wsitem Set wsrec='" +wsrec+ "',item = '"+item+"', keycode = '"+keycode +"',quantity = '"+quantity +"',cost = '"+cost +"', laborhours = '"+laborhours+"', laborcost = '"+laborcost+"', shophours = '"+shophours+"' Where itemrec=" + itemrec + ";");
+ stmt.executeUpdate("Update wsitem Set wsrec='" +wsrec+ "',item = '"+item+"', keycode = '"+keycode +"',quantity = '"+quantity +"',cost = '"+cost +"', laborhours = '"+laborhours+"', laborcost = '"+laborcost+"', shophours = '"+shophours+"', subcost='"+subcost+"' Where itemrec=" + itemrec + ";");
}
-public static void AddItem(Connection con, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours)
+public static void AddItem(Connection con, int wsrec, String item, String keycode, int quantity, String cost, int laborhours, String laborcost, int shophours, String subcost)
throws SQLException
{
Statement stmt = con.createStatement();
- System.out.println("INSERT INTO wsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"')");
- stmt.executeUpdate("INSERT INTO wsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"')");
+ //System.out.println("INSERT INTO wsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"')");
+ stmt.executeUpdate("INSERT INTO wsitem (wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours, subcost) Values ('" +wsrec+ "','" +item + "','"+keycode +"','"+quantity +"','"+cost+"','"+laborhours+"','"+laborcost+"','"+shophours+"', '"+subcost+"')");
}
public int getId() { return id; }
@@ -108,6 +110,7 @@
public double getWsCost() { return cost; }
public double getWsLaborCost() { return laborcost; }
public int getWsLaborHours() { return laborhours; }
+ public double getWsSubCost() { return subcost; }
public int getWsShopHours() { return shophours; }
Modified: trunk/servsys/src/com/pandmservices/web/UniCash.java
===================================================================
--- trunk/servsys/src/com/pandmservices/web/UniCash.java 2010-01-22 01:47:55 UTC (rev 121)
+++ trunk/servsys/src/com/pandmservices/web/UniCash.java 2010-01-24 01:05:56 UTC (rev 122)
@@ -36,6 +36,8 @@
import org.apache.commons.io.*;
//import org.apache.commons.beanutils.*;
//import org.apache.commons.beanutils.MethodUtils;
+import java.io.FileOutputStream;
+import java.io.IOException;
public class UniCash extends HttpServlet
{
@@ -3032,10 +3034,12 @@
int laborhours = tp.getWsLaborHours();
int shophours = tp.getWsShopHours();
double cost=tp.getWsCost();
+ double subcost=tp.getWsSubCost();
double laborcost=tp.getWsLaborCost();
String scost= ""+cost+"";
+ String ssubcost=""+subcost+"";
String slaborcost=""+laborcost+"";
- UniMasterWsItems.AddItem(con,wsrec,item,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniMasterWsItems.AddItem(con,wsrec,item,keycode,quantity,scost,laborhours,slaborcost,shophours, ssubcost);
}
printHeader(req, res, out, username);
@@ -6420,16 +6424,28 @@
}
//RELEASE_VERSION
- vnumber = "2.50";
+ vnumber = "2.51";
+
+ if (dbvnumber.equalsIgnoreCase("2.50")) {
+ Statement stmtu2 = con.createStatement();
+ int result251z = stmtu2.executeUpdate("UPDATE version set vnumber='2.51';");
+ int result251x = stmtu2.executeUpdate("UPDATE version set vdate='2010-01-23';");
+ int result251a = stmtu2.executeUpdate("alter table worksheet add wsmultlab decimal(10,2) default 0.00 after techid;");
+ int result251b = stmtu2.executeUpdate("alter table worksheet add wsmultsub decimal(10,2) default 0.00 after wsmultlab;");
+ int result251c = stmtu2.executeUpdate("alter table masterworksheet add wsmultlab decimal(10,2) default 0.00 after wsmult;");
+ int result251d = stmtu2.executeUpdate("alter table masterworksheet add wsmultsub decimal(10,2) default 0.00 after wsmultlab;");
+ int result251e = stmtu2.executeUpdate("alter table masterwsitem add subcost decimal(10,2) default 0.00 after shophours;");
+ int result251f = stmtu2.executeUpdate("alter table wsitem add subcost decimal(10,2) default 0.00 after techid;");
+ }
if (dbvnumber.equalsIgnoreCase("2.31")) {
Statement stmtu2 = con.createStatement();
- int result230z = stmtu2.executeUpdate("UPDATE version set vnumber='2.50';");
- int result230x = stmtu2.executeUpdate("UPDATE version set vdate='2010-01-21';");
+ int result250z = stmtu2.executeUpdate("UPDATE version set vnumber='2.50';");
+ int result250x = stmtu2.executeUpdate("UPDATE version set vdate='2010-01-21';");
}
if (dbvnumber.equalsIgnoreCase("2.30")) {
Statement stmtu2 = con.createStatement();
- int result230z = stmtu2.executeUpdate("UPDATE version set vnumber='2.31';");
- int result230x = stmtu2.executeUpdate("UPDATE version set vdate='2009-08-01';");
+ int result231z = stmtu2.executeUpdate("UPDATE version set vnumber='2.31';");
+ int result231x = stmtu2.executeUpdate("UPDATE version set vdate='2009-08-01';");
}
if (dbvnumber.equalsIgnoreCase("2.29")) {
Statement stmtu2 = con.createStatement();
@@ -8676,6 +8692,8 @@
String custnum=req.getParameter("custnum");
String wsnum=req.getParameter("wsnum");
out.println("<html><head><title>Proposal System</title></head><body><table width=60% border=1>");
+
+ out.println("<br><br><br><a href="+classdir+"UniCash?action=editws&custnum="+custnum+"&wsnum="+wsnum+">Back to Worksheet</a></body></html>");
out.println("<tr>");
out.println("<th>Category</th>");
out.println("</tr>");
@@ -10898,6 +10916,7 @@
double laborcost = 0.00;
int laborhours = 0;
int shophours = 0;
+ double subcost = 0.00;
int counter=0;
for (int i = 0 ; i < v.size(); i++)
@@ -10911,6 +10930,7 @@
laborhours = t.getWsLaborHours();
shophours = t.getWsShopHours();
laborcost = t.getWsLaborCost();
+ subcost = t.getWsSubCost();
}
out.println("<html>");
out.println("<head>");
@@ -10920,7 +10940,7 @@
out.println("<p>Item :");
out.println("<input type=\"text\" name=\"item\" value = \""+item+"\">");
out.println("</p>");
- out.println("<p>Keycode :");
+ out.println("<p>Keycode or Part # :");
out.println("<input type=\"text\" name=\"keycode\" value = \""+keycode+"\"> ");
out.println("</p>");
out.println("<p>Quantity :");
@@ -10937,7 +10957,10 @@
out.println("</p>");
out.println("<p>Labor Cost :");
out.println("<input type=\"text\" name=\"laborcost\" value=\""+laborcost+"\">");
+ out.println("<p>Sub Cost :");
+ out.println("<input type=\"text\" name=\"subcost\" value = \""+subcost+"\">");
out.println("</p>");
+ out.println("</p>");
out.println("<input type=\"hidden\" name=\"itemrec\" value=\""+itemrec+"\">");
out.println("<input type=\"hidden\" name=\"wsnum\" value=\""+wsrec+"\">");
out.println("<input type=\"hidden\" name=\"custnum\" value=\""+custrec+"\">");
@@ -10976,20 +10999,20 @@
out.println("<p>Item :");
out.println("<input type=\"text\" name=\"item\">");
out.println("</p>");
- out.println("<p>Keycode :");
+ out.println("<p>Keycode or Part Number :");
out.println("<input type=\"text\" name=\"keycode\" > ");
out.println("</p>");
out.println("<p>Quantity :");
out.println("<input type=\"text\" name=\"quantity\">");
out.println("</p>");
- out.println("<p>Cost :");
+ out.println("<p>Part Cost :");
out.println("<input type=\"text\" name=\"cost\">");
out.println("</p>");
out.println("<p>Labor Hours :");
- out.println("<input type=\"text\" name=\"laborhours\">");
+ out.println("<input type=\"text\" value=\"0.00\" name=\"laborhours\">");
out.println("</p>");
out.println("<p>Shop Hours :");
- out.println("<input type=\"text\" name=\"shophours\">");
+ out.println("<input type=\"text\" value=\"0.00\" name=\"shophours\">");
out.println("</p>");
out.println("<p>Labor Cost :");
out.println("<input type=\"text\" name=\"laborcost\" value=\""+doGetLaborCost()+"\">");
@@ -11171,7 +11194,7 @@
out.println("<p>Item :");
out.println("<input type=\"text\" name=\"item\" value=\""+item+"\">");
out.println("</p>");
- out.println("<p>Keycode :");
+ out.println("<p>Keycode or Part # :");
out.println("<input type=\"text\" name=\"keycode\" value=\""+keycode+"\" > ");
out.println("</p>");
out.println("<p>Quantity :");
@@ -11891,13 +11914,14 @@
String tquantity = req.getParameter("quantity");
int quantity = Integer.parseInt(tquantity);
String cost = req.getParameter("cost");
+ String subcost = req.getParameter("subcost");
String tlaborhours = req.getParameter("laborhours");
int laborhours = Integer.parseInt(tlaborhours);
String tshophours = req.getParameter("shophours");
int shophours = Integer.parseInt(tshophours);
String laborcost = req.getParameter("laborcost");
- UniWsItems.UpdateItem(con, itemrec, wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours);
+ UniWsItems.UpdateItem(con, itemrec, wsrec, item, keycode, quantity, cost, laborhours, laborcost, shophours, subcost);
con.close();
res.sendRedirect(""+classdir+"UniCash?action=editws&wsnum="+wsnum+"&custnum="+custnum+"");
}
@@ -11914,6 +11938,7 @@
String tquantity = req.getParameter("quantity");
int quantity = Integer.parseInt(tquantity);
String cost = req.getParameter("cost");
+ String subcost = req.getParameter("subcost");
String tlaborhours = req.getParameter("laborhours");
int laborhours = Integer.parseInt(tlaborhours);
String tshophours = req.getParameter("shophours");
@@ -11923,7 +11948,7 @@
BigDecimal d = new BigDecimal(cost);
d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
String cost2 = d.toString();
- UniWsItems.AddItem(con, wsrec, item, keycode, quantity, cost2, laborhours, laborcost, shophours);
+ UniWsItems.AddItem(con, wsrec, item, keycode, quantity, cost2, laborhours, laborcost, shophours, subcost);
con.close();
res.sendRedirect(""+classdir+"UniCash?action=editws&wsnum="+wsnum+"&custnum="+custnum+"&adjper="+adjper+"");
}
@@ -22334,6 +22359,8 @@
out.println("<input type=\"hidden\" name=\"custstart\" value=\""+custstart+"\">");
out.println("<input type=\"hidden\" name=\"custstop\" value=\""+custstop+"\">");
out.println("<input type=\"hidden\" name=\"wsmult\" value=\""+doGetMarkUpDiv()+"\">");
+ out.println("<input type=\"hidden\" name=\"wsmultlab\" value=\""+doGetMarkUpDiv()+"\">");
+ out.println("<input type=\"hidden\" name=\"wsmultsub\" value=\""+doGetMarkUpDiv()+"\">");
out.println("</table>");
out.println("<p> <CENTER>");
out.println("<INPUT TYPE=\"submit\" NAME=\"submit\" VALUE=\"Save\">");
@@ -22570,13 +22597,15 @@
String tcustnum = req.getParameter("custnum");
String twsnum = req.getParameter("contnum");
String wsmult = req.getParameter("wsmult");
+ String wsmultlab = req.getParameter("wsmultlab");
+ String wsmultsub = req.getParameter("wsmultsub");
String custstart = req.getParameter("custstart");
String custstop = req.getParameter("custstop");
int custnum = Integer.parseInt(tcustnum);
int wsnum = Integer.parseInt(twsnum);
String wsdescription = req.getParameter("wsdescription");
String wsdate = req.getParameter("wsdate");
- UniWorksheet.UpdateItem(con, wsnum, custnum, doFormatDateDb(getDateDb(wsdate)), wsdescription, wsmult);
+ UniWorksheet.UpdateItem(con, wsnum, custnum, doFormatDateDb(getDateDb(wsdate)), wsdescription, wsmult, wsmultlab, wsmultsub);
out.println("Your item has been updated in the database<br>");
con.close();
res.sendRedirect(""+classdir+"UniCash?action=showcustdetail&csection=6&custnum="+custnum+"&custstart="+custstart+"&custstop="+custstop+"");
@@ -22646,13 +22675,15 @@
String custstop = req.getParameter("custstop");
int custnum = Integer.parseInt(tcustnum);
String wsmult = req.getParameter("wsmult");
+ String wsmultlab = req.getParameter("wsmultlab");
+ String wsmultsub = req.getParameter("wsmultsub");
String wsdescription = req.getParameter("wssummary");
String wsdate = req.getParameter("wsdate");
String custsite = doGetCustSite(custnum);
String sitenum = doGetSiteNum(custnum);
int servsync=0;
String login=(String)session.getAttribute("login");
- UniWorksheet.AddItem(con, custnum, doFormatDateDb(getDateDb(wsdate)), wsdescription, wsmult, custsite, sitenum,login, 0);
+ UniWorksheet.AddItem(con, custnum, doFormatDateDb(getDateDb(wsdate)), wsdescription, wsmult, custsite, sitenum,login, 0, wsmultlab, wsmultsub);
con.close();
out.println("Your item has been updated in the database<br>");
res.sendRedirect(""+classdir+"UniCash?action=showcustdetail&csection=6&custnum="+custnum+"&custstart="+custstart+"&custstop="+custstop+"");
@@ -22826,6 +22857,7 @@
String keycode="";
int quantity=0;
double cost=0.00;
+ double subcost=0.00;
int laborhours=0;
int shophours=0;
double laborcost=0;
@@ -22907,7 +22939,7 @@
mbody=combinestring(mbody,"</table>");
mbody=combinestring(mbody,"<br><br><br><table border=\"1\" width=\"100%\">");
- mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
+ mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
Vector vp;
vp = UniWsItems.getAllItems(con,wsnum);
@@ -22924,6 +22956,7 @@
laborhours = tp.getWsLaborHours();
shophours = tp.getWsShopHours();
laborcost = tp.getWsLaborCost();
+ subcost = tp.getWsSubCost();
double subtot=cost*quantity;
subtotlabor=(shophours+laborhours)*laborcost;
@@ -23076,6 +23109,7 @@
int totlaborhours=0;
int totshophours=0;
double totlabor=0.00;
+ double subcost=0.00;
double subtotlabor=0.00;
int itemrec=0;
String item=null;
@@ -23085,6 +23119,7 @@
int laborhours=0;
int shophours=0;
double laborcost=0;
+ double totsubcost=0.00;
double awsmult=0.00;
String wsmult="";
String investment=null;
@@ -23144,7 +23179,7 @@
mbody=combinestring(mbody,"</tr>");
mbody=combinestring(mbody,"</table>");
mbody=combinestring(mbody,"<br><br><br><table border=\"1\" width=\"100%\">");
- mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
+ mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Sub Cost</th></tr>");
Vector vp;
vp = UniWsItems.getAllItems(con,wsnum);
for (int j = 0 ; j < vp.size(); j++)
@@ -23156,16 +23191,18 @@
keycode = tp.getWsKeyCode();
quantity = tp.getWsQuant();
cost = tp.getWsCost();
+ subcost=tp.getWsSubCost();
laborhours = tp.getWsLaborHours();
shophours = tp.getWsShopHours();
laborcost = tp.getWsLaborCost();
double subtot=cost*quantity;
subtotlabor=(shophours+laborhours)*laborcost;
totinvestment=totinvestment+subtot;
+ totsubcost=totsubcost+subcost;
totlabor = totlabor+subtotlabor;
totlaborhours = totlaborhours+laborhours;
totshophours = totshophours+shophours;
- mbody=combinestring(mbody,"<tr><td>"+item+"</td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td></tr>");
+ mbody=combinestring(mbody,"<tr><td>"+item+"</td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subcost)+"</td></tr>");
}
double partmarkup = totinvestment * doGetPartMult();
@@ -23259,6 +23296,7 @@
int itemquant=0;
int itemnum=0;
double totinvestment=0.00;
+ double subcost=0.00;
int totlaborhours=0;
int totshophours=0;
double totlabor=0.00;
@@ -23272,6 +23310,7 @@
int laborhours=0;
int shophours=0;
double laborcost=0;
+ double totsubcost=0.00;
double awsmult=0.00;
String wsmult="";
String investment=null;
@@ -23340,7 +23379,7 @@
mbody=combinestring(mbody,"</table>");
mbody=combinestring(mbody,"<br><br><br><table border=\"1\" width=\"100%\">");
- mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
+ mbody=combinestring(mbody,"<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Sub Cost</th></tr>");
Vector vp;
vp = UniWsItems.getAllItems(con,wsnum);
@@ -23355,17 +23394,19 @@
quantity = tp.getWsQuant();
cost = tp.getWsCost();
laborhours = tp.getWsLaborHours();
+ subcost = tp.getWsSubCost();
shophours = tp.getWsShopHours();
laborcost = tp.getWsLaborCost();
double subtot=cost*quantity;
subtotlabor=(shophours+laborhours)*laborcost;
totinvestment=totinvestment+subtot;
+ totsubcost = totsubcost + subcost;
totlabor = totlabor+subtotlabor;
totlaborhours = totlaborhours+laborhours;
totshophours = totshophours+shophours;
- mbody=combinestring(mbody,"<tr><td>"+item+"</td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td></tr>");
+ mbody=combinestring(mbody,"<tr><td>"+item+"</td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subcost)+"</td></tr>");
}
double partmarkup = totinvestment * doGetPartMult();
@@ -23520,11 +23561,16 @@
String keycode="";
int quantity=0;
double cost=0.00;
+ double subcost=0.00;
int laborhours=0;
int shophours=0;
double laborcost=0;
double awsmult=0.00;
+ double awsmultlab=0.00;
+ double awsmultsub=0.00;
String wsmult="";
+ String wsmultlab="";
+ String wsmultsub="";
String investment=null;
double qtotal=0.00;
@@ -23553,6 +23599,8 @@
wsdate=doFormatDate(getDate(tt.getWsDate()));
wsdescription=tt.getWsDesc();
wsmult=tt.getWsMult();
+ wsmultlab=tt.getWsMultLab();
+ wsmultsub=tt.getWsMultSub();
}
if (Double.parseDouble(wsmult)!=0.00) {
awsmult = Double.parseDouble(wsmult);
@@ -23561,6 +23609,20 @@
awsmult = doGetMarkUpDiv();
}
+ if (Double.parseDouble(wsmultlab)!=0.00) {
+ awsmultlab = Double.parseDouble(wsmultlab);
+ }
+ else {
+ awsmultlab = awsmult;
+ }
+
+ if (Double.parseDouble(wsmultsub)!=0.00) {
+ awsmultsub = Double.parseDouble(wsmultsub);
+ }
+ else {
+ awsmultsub = awsmult;
+ }
+
out.println("<html><basefont size=2>");
out.println("<html><head><title>Quote Worksheet</title></head>");
doMHeader(req, res, out, session, username);
@@ -23590,7 +23652,7 @@
out.println("</table>");
out.println("<br><br><br><table border=\"1\" width=\"100%\">");
- out.println("<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
+ out.println("<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th></tr>");
Vector vp;
vp = UniWsItems.getAllItems(con,wsnum);
@@ -23622,10 +23684,12 @@
// HERE IS ADJUSTED LABOR HOUTS
double adjtotlabor = (totlaborhours+totshophours) * doGetLabMult();
//double fsellprice = (totlabor+partmarkup)/awsmult;
- double fsellprice = ((laborcost*adjtotlabor)+partmarkup)/awsmult;
+ double laborsellprice = (laborcost*adjtotlabor)/awsmultlab;
+ double subsellprice = subcost/awsmultsub;
+ double partsellprice = partmarkup/awsmult;
+ double fsellprice = laborsellprice+partsellprice+subsellprice;
double lsellprice = (totlabor*doGetGpToLabor())+totlabor+partmarkup;
totcrewdays = totlaborhours / laborday;
-
out.println("</table><br><h4>Summary Section</h4>");
out.println("<table width=\"75%\" border=1>");
out.println("<tr><td>");
@@ -23680,6 +23744,15 @@
*/
out.println("<tr><td>");
+ out.println("<b>Parts Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(partsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
+ out.println("<b>Labor Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(laborsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
+ out.println("<b>Subs Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(subsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
out.println("<b>Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(fsellprice)+"</b>");
out.println("</td></tr>");
/*
@@ -23802,7 +23875,7 @@
out.println("</CENTER></form>");
out.println("<br><br><br><table border=\"1\" width=\"100%\">");
- out.println("<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Delete</th></tr>");
+ out.println("<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Delete</th></tr>");
Vector vp;
vp = UniMasterWsItems.getAllItems(con,wsnum);
@@ -23958,7 +24031,9 @@
int totlaborhours=0;
int totshophours=0;
double totlabor=0.00;
+ double subcost=0.00;
double subtotlabor=0.00;
+ double totsubcost=0.00;
int laborday = 16;
int wsrec=0;
@@ -23968,7 +24043,11 @@
int quantity=0;
String twsmult=null;
String wsmult=null;
+ String wsmultlab=null;
+ String wsmultsub=null;
double awsmult=0.00;
+ double awsmultlab=0.00;
+ double awsmultsub=0.00;
double cost=0.00;
int laborhours=0;
int shophours=0;
@@ -23986,6 +24065,8 @@
wsdate=tt.getWsDate();
wsdescription=tt.getWsDesc();
wsmult=tt.getWsMult();
+ wsmultlab=tt.getWsMultLab();
+ wsmultsub=tt.getWsMultSub();
}
if (Double.parseDouble(wsmult)!=0.00) {
awsmult = Double.parseDouble(wsmult);
@@ -23995,6 +24076,20 @@
}
+ if (Double.parseDouble(wsmultlab)!=0.00) {
+ awsmultlab = Double.parseDouble(wsmultlab);
+ }
+ else {
+ awsmultlab = awsmult;
+ }
+
+ if (Double.parseDouble(wsmultsub)!=0.00) {
+ awsmultsub = Double.parseDouble(wsmultsub);
+ }
+ else {
+ awsmultsub = awsmult;
+ }
+
out.println("<html>");
out.println("<head>");
out.println("<title>Edit Worksheet</title>");
@@ -24004,9 +24099,15 @@
out.println("<tr><td>Date</td><td>");
out.println("<input type=\"text\" name=\"wsdate\" value=\""+doFormatDate(getDate(wsdate))+"\"></td>");
out.println("</tr>");
- out.println("<tr><td>MarkUp</td><td>");
+ out.println("<tr><td>Parts MarkUp</td><td>");
out.println("<input type=\"text\" name=\"wsmult\" value=\""+awsmult+"\" size=\"60\" ></td>");
out.println("</tr>");
+ out.println("<tr><td>Labor MarkUp</td><td>");
+ out.println("<input type=\"text\" name=\"wsmultlab\" value=\""+awsmultlab+"\" size=\"60\" ></td>");
+ out.println("</tr>");
+ out.println("<tr><td>Subs MarkUp</td><td>");
+ out.println("<input type=\"text\" name=\"wsmultsub\" value=\""+awsmultsub+"\" size=\"60\" ></td>");
+ out.println("</tr>");
out.println("<tr><td>Summary</td><td>");
out.println("<input type=\"text\" name=\"wsdescription\" value=\""+wsdescription +"\" size=\"60\" ></td>");
out.println("</tr>");
@@ -24020,7 +24121,7 @@
out.println("</CENTER></form>");
out.println("<br><br><br><table border=\"1\" width=\"100%\">");
- out.println("<tr><th>Item Name</th><th>Keycode</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Delete</th></tr>");
+ out.println("<tr><th>Item Name</th><th>Keycode<br>Part #</th><th>Quantity</th><th>Price</th><th>Item Cost</th><th>Labor Hours</th><th>Shop Hours</th><th>Labor Cost</th><th>Sub Cost</th><th>Delete</th></tr>");
Vector vp;
vp = UniWsItems.getAllItems(con,wsnum);
@@ -24035,6 +24136,7 @@
quantity = tp.getWsQuant();
cost = tp.getWsCost();
laborhours = tp.getWsLaborHours();
+ subcost=tp.getWsSubCost();
shophours = tp.getWsShopHours();
laborcost = tp.getWsLaborCost();
double subtot=cost*quantity;
@@ -24043,16 +24145,20 @@
totinvestment=totinvestment+subtot;
totlabor = totlabor+subtotlabor;
totlaborhours = totlaborhours+laborhours;
+ totsubcost=totsubcost+subcost;
totshophours = totshophours+shophours;
totcrewdays = totlaborhours / laborday;
- out.println("<tr><td><a href=\""+classdir+"UniCash?action=editwsitem&custnum="+crecnum+"&wsnum="+wsrec+"&itemrec="+itemrec+"\">"+item+"</a></td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td><td><a href="+classdir+"UniCash?action=delwsitem&custnum="+crecnum+"&wsrec="+wsrec+"&itemrec="+itemrec+">Delete</a></td></tr>");
+ out.println("<tr><td><a href=\""+classdir+"UniCash?action=editwsitem&custnum="+crecnum+"&wsnum="+wsrec+"&itemrec="+itemrec+"\">"+item+"</a></td><td>"+keycode+"</td><td>"+quantity+"</td><td>"+NumberFormat.getCurrencyInstance().format(cost)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtot)+"</td><td>"+laborhours+"</td><td>"+shophours+"</td><td>"+NumberFormat.getCurrencyInstance().format(subtotlabor)+"</td><td>"+NumberFormat.getCurrencyInstance().format(subcost)+"</td><td><a href="+classdir+"UniCash?action=delwsitem&custnum="+crecnum+"&wsrec="+wsrec+"&itemrec="+itemrec+">Delete</a></td></tr>");
}
double partmarkup = totinvestment * doGetPartMult();
// HERE IS ADJUSTED LABOR HOUTS
double adjtotlabor = (totlaborhours + totshophours) * doGetLabMult();
//double fsellprice = (totlabor+partmarkup)/awsmult;
- double fsellprice = ((laborcost*adjtotlabor)+partmarkup)/awsmult;
+ double laborsellprice = (laborcost*adjtotlabor)/awsmultlab;
+ double subsellprice = totsubcost/awsmultsub;
+ double partsellprice = partmarkup/awsmult;
+ double fsellprice = laborsellprice+partsellprice+subsellprice;
double lsellprice = (totlabor*doGetGpToLabor())+totlabor+partmarkup;
totcrewdays = totlaborhours / laborday;
out.println("</table><br><h4>Summary Section</h4>");
@@ -24111,6 +24217,15 @@
} else {
*/
out.println("<tr><td>");
+ out.println("<b>Parts Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(partsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
+ out.println("<b>Labor Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(laborsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
+ out.println("<b>Subs Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(subsellprice)+"</b>");
+ out.println("</td></tr>");
+ out.println("<tr><td>");
out.println("<b>Sellprice</td><td>"+ NumberFormat.getCurrencyInstance().format(fsellprice)+"</b>");
out.println("</td></tr>");
// }
@@ -24258,6 +24373,7 @@
String wsmult=null;
double cost=0.00;
int laborhours=0;
+ double subcost=0.00;
int shophours=0;
double laborcost=0;
@@ -24299,14 +24415,16 @@
itemrec = tp.getItemRec();
item = tp.getWsItem();
keycode = tp.getWsKeyCode();
+ subcost = tp.getWsSubCost();
quantity = tp.getWsQuant();
laborhours = tp.getWsLaborHours();
shophours = tp.getWsShopHours();
cost=tp.getWsCost();
laborcost=tp.getWsLaborCost();
String scost= ""+cost+"";
+ String ssubcost = ""+subcost+"";
String slaborcost=""+laborcost+"";
- UniMasterWsItems.AddItem(con2,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniMasterWsItems.AddItem(con2,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours,ssubcost);
}
con.close();
con2.close();
@@ -24349,8 +24467,11 @@
String keycode="";
int quantity=0;
String wsmult=null;
+ String wsmultlab=null;
+ String wsmultsub=null;
double cost=0.00;
int laborhours=0;
+ double subcost=0.00;
int shophours=0;
double laborcost=0;
@@ -24365,6 +24486,8 @@
UniMasterWorksheet tt = (UniMasterWorksheet) vv.elementAt(i);
wsdate=tt.getWsDate();
wsmult=tt.getWsMult();
+ wsmultlab=tt.getWsMult();
+ wsmultsub=tt.getWsMult();
wsdescription=tt.getWsDesc();
}
String custsite = doGetCustSite(ncrecnum);
@@ -24377,7 +24500,7 @@
//formatter = new SimpleDateFormat("MM-dd-yyyy");
formatter = new SimpleDateFormat("yyyy-MM-dd");
String s = formatter.format(date);
- UniWorksheet.AddItem(con, ncrecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync);
+ UniWorksheet.AddItem(con, ncrecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync, wsmultlab, wsmultsub);
Vector v;
@@ -24407,9 +24530,11 @@
shophours = tp.getWsShopHours();
cost=tp.getWsCost();
laborcost=tp.getWsLaborCost();
+ subcost=tp.getWsSubCost();
String scost= ""+cost+"";
+ String ssubcost =""+subcost+"";
String slaborcost=""+laborcost+"";
- UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours,ssubcost);
}
con.close();
@@ -24443,6 +24568,7 @@
int itemnum=0;
int qnum=0;
double totinvestment=0.00;
+ double subcost=0.00;
int totlaborhours=0;
double totlabor=0.00;
double subtotlabor=0.00;
@@ -24453,6 +24579,8 @@
String keycode="";
int quantity=0;
String wsmult=null;
+ String wsmultlab=null;
+ String wsmultsub=null;
double cost=0.00;
int laborhours=0;
int shophours=0;
@@ -24469,6 +24597,8 @@
UniWorksheet tt = (UniWorksheet) vv.elementAt(i);
wsdate=tt.getWsDate();
wsmult=tt.getWsMult();
+ wsmultlab=tt.getWsMultLab();
+ wsmultsub=tt.getWsMultSub();
wsdescription=tt.getWsDesc();
}
Format formatter;
@@ -24480,8 +24610,16 @@
String custsite = doGetCustSite(ncrecnum);
String sitenum = doGetSiteNum(ncrecnum);
int servsync=0;
+ if (Double.parseDouble(wsmultlab)==0.00) {
+ wsmultlab = wsmult;
+ }
+
+ if (Double.parseDouble(wsmultsub)==0.00) {
+ wsmultsub = wsmult;
+ }
+
String login=(String)session.getAttribute("login");
- UniWorksheet.AddItem(con, ncrecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync);
+ UniWorksheet.AddItem(con, ncrecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync, wsmultlab, wsmultsub);
Vector v;
@@ -24508,12 +24646,14 @@
keycode = tp.getWsKeyCode();
quantity = tp.getWsQuant();
laborhours = tp.getWsLaborHours();
+ subcost = tp.getWsSubCost();
shophours = tp.getWsShopHours();
cost=tp.getWsCost();
laborcost=tp.getWsLaborCost();
String scost= ""+cost+"";
+ String ssubcost=""+subcost+"";
String slaborcost=""+laborcost+"";
- UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours,ssubcost);
}
con.close();
@@ -24555,9 +24695,12 @@
String keycode="";
int quantity=0;
String wsmult=null;
+ String wsmultlab=null;
+ String wsmultsub=null;
double cost=0.00;
int laborhours=0;
int shophours=0;
+ double subcost=0;
double laborcost=0;
String investment=null;
@@ -24577,13 +24720,15 @@
UniWorksheet tt = (UniWorksheet) vv.elementAt(i);
wsdate=tt.getWsDate();
wsmult=tt.getWsMult();
+ wsmultlab=tt.getWsMultLab();
+ wsmultsub=tt.getWsMultSub();
wsdescription=tt.getWsDesc();
}
String custsite = doGetCustSite(crecnum);
String sitenum = doGetSiteNum(crecnum);
int servsync=0;
String login=(String)session.getAttribute("login");
- UniWorksheet.AddItem(con, crecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync);
+ UniWorksheet.AddItem(con, crecnum, s, wsdescription, wsmult, custsite, sitenum, login, servsync, wsmultlab, wsmultsub);
Vector v;
@@ -24614,8 +24759,9 @@
cost=tp.getWsCost();
laborcost=tp.getWsLaborCost();
String scost= ""+cost+"";
+ String ssubcost=""+subcost+"";
String slaborcost=""+laborcost+"";
- UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniWsItems.AddItem(con,qnum,item,keycode,quantity,scost,laborhours,slaborcost,shophours,ssubcost);
}
con.close();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
