[Servsys-svn] SF.net SVN: servsys:[124] trunk/servsys/src/com/pandmservices
Brought to you by:
molnar_c
Menu
▾
▴
[Servsys-svn] SF.net SVN: servsys:[124] trunk/servsys/src/com/pandmservices
|
From: <mol...@us...> - 2010-01-25 22:12:15
|
Revision: 124
http://servsys.svn.sourceforge.net/servsys/?rev=124&view=rev
Author: molnar_c
Date: 2010-01-25 22:12:08 +0000 (Mon, 25 Jan 2010)
Log Message:
-----------
Fix sync server. Needed to add some fields that had been forgotten about.
Modified Paths:
--------------
trunk/servsys/src/com/pandmservices/UniCompConfig.java
trunk/servsys/src/com/pandmservices/dbserver/SyncCustQuotes.java
trunk/servsys/src/com/pandmservices/dbserver/SyncQuotes.java
trunk/servsys/src/com/pandmservices/dbserver/SyncWorksheets.java
trunk/servsys/src/com/pandmservices/web/UniCash.java
Modified: trunk/servsys/src/com/pandmservices/UniCompConfig.java
===================================================================
--- trunk/servsys/src/com/pandmservices/UniCompConfig.java 2010-01-24 19:01:09 UTC (rev 123)
+++ trunk/servsys/src/com/pandmservices/UniCompConfig.java 2010-01-25 22:12:08 UTC (rev 124)
@@ -81,7 +81,7 @@
{
Statement stmt = con.createStatement();
stmt.executeUpdate("DROP TABLE IF EXISTS configcompany;");
- stmt.executeUpdate("create table configcompany (image text, imagewidth text, imagehight text, coname text, cologo text, coaddress text, cophone text, useletterhead text not null, yearenddate date default '2005-09-31', enabcustomer text not null, nocustonlaptop text, laptopretentiontime int(11), reportemail text not null);");
+ stmt.executeUpdate("create table configcompany (image text, imagewidth text, imagehight text, coname text, cologo text, coaddress text, cophone text, useletterhead text not null, yearenddate date default '2010-12-31', enabcustomer text not null, nocustonlaptop text, laptopretentiontime int(11), reportemail text not null);");
stmt.executeUpdate("insert into configcompany (image,imagehight, imagewidth, coname, cologo,coaddress,cophone, useletterhead, enabcustomer, reportemail, yearenddate, nocustonlaptop, laptopretentiontime) values ('"+image+"','"+imagehight+"','"+imagewidth+"','"+coname+"','"+cologo+"','"+coaddress+"','"+cophone+"','"+useletterhead+"', '"+enabcustomer+"', '"+reportemail+"', '"+yearenddate+"', 'yes', 4);");
}
Modified: trunk/servsys/src/com/pandmservices/dbserver/SyncCustQuotes.java
===================================================================
--- trunk/servsys/src/com/pandmservices/dbserver/SyncCustQuotes.java 2010-01-24 19:01:09 UTC (rev 123)
+++ trunk/servsys/src/com/pandmservices/dbserver/SyncCustQuotes.java 2010-01-25 22:12:08 UTC (rev 124)
@@ -81,7 +81,7 @@
String acolumns= new String("quotenum");
String tqnotes = qnotes.replaceAll("'","''");
- int recordset = stmtu.executeUpdate("INSERT INTO quotes (crecnum, qdate, qdescription, qpayterms, qnotes, qdisc, qadditionalserv, status, solddate, antstart, custsite, sitenum, techid, servsync,combineopts) Values ('"+remotecrecnum+"','" +qdate+ "','" +qdescription+ "','"+qpayterms+"','"+tqnotes+"', '"+qdisc+"','"+qadditionalserv+"', '"+qstatus+"', '"+solddate+"', '"+antstart+"', '"+custsite +"','"+sitenum +"','"+techid +"', '"+servsync+"','"+combineopts+"')",keyColumn);
+ int recordset = stmtu.executeUpdate("INSERT INTO quotes (crecnum, qdate, qdescription, qpayterms, qnotes, qdisc, qadditionalserv, status, solddate, antstart, custsite, sitenum, techid, servsync,combineopts, jobnum) Values ('"+remotecrecnum+"','" +qdate+ "','" +qdescription+ "','"+qpayterms+"','"+tqnotes+"', '"+qdisc+"','"+qadditionalserv+"', '"+qstatus+"', '"+solddate+"', '"+antstart+"', '"+custsite +"','"+sitenum +"','"+techid +"', '"+servsync+"','"+combineopts+"','"+jobnum+"')",keyColumn);
ResultSet rsKeyColumn = stmtu.getGeneratedKeys();
if(rsKeyColumn.next()) { // ADD THIS LINE! IMPORTANT!
Modified: trunk/servsys/src/com/pandmservices/dbserver/SyncQuotes.java
===================================================================
--- trunk/servsys/src/com/pandmservices/dbserver/SyncQuotes.java 2010-01-24 19:01:09 UTC (rev 123)
+++ trunk/servsys/src/com/pandmservices/dbserver/SyncQuotes.java 2010-01-25 22:12:08 UTC (rev 124)
@@ -115,7 +115,7 @@
String acolumns= new String("quotenum");
String tqnotes = qnotes.replaceAll("'","''");
- int recordset = stmtu.executeUpdate("INSERT INTO quotes (crecnum, qdate, qdescription, qpayterms, qnotes, qdisc, qadditionalserv, status, solddate, antstart, custsite, sitenum, techid, servsync,combineopts) Values ('"+remotecrecnum+"','" +qdate+ "','" +qdescription+ "','"+qpayterms+"','"+tqnotes+"', '"+qdisc+"','"+qadditionalserv+"', '"+qstatus+"', '"+solddate+"', '"+antstart+"', '"+custsite +"','"+sitenum +"','"+techid +"', '"+servsync+"','"+combineopts+"')",keyColumn);
+ int recordset = stmtu.executeUpdate("INSERT INTO quotes (crecnum, qdate, qdescription, qpayterms, qnotes, qdisc, qadditionalserv, status, solddate, jobnum, antstart, custsite, sitenum, techid, servsync,combineopts) Values ('"+remotecrecnum+"','" +qdate+ "','" +qdescription+ "','"+qpayterms+"','"+tqnotes+"', '"+qdisc+"','"+qadditionalserv+"', '"+qstatus+"', '"+solddate+"','"+jobnum+"', '"+antstart+"', '"+custsite +"','"+sitenum +"','"+techid +"', '"+servsync+"','"+combineopts+"')",keyColumn);
ResultSet rsKeyColumn = stmtu.getGeneratedKeys();
if(rsKeyColumn.next()) { // ADD THIS LINE! IMPORTANT!
Modified: trunk/servsys/src/com/pandmservices/dbserver/SyncWorksheets.java
===================================================================
--- trunk/servsys/src/com/pandmservices/dbserver/SyncWorksheets.java 2010-01-24 19:01:09 UTC (rev 123)
+++ trunk/servsys/src/com/pandmservices/dbserver/SyncWorksheets.java 2010-01-25 22:12:08 UTC (rev 124)
@@ -25,6 +25,7 @@
private String custsite=null;
private String sitenum=null;
private String techid=null;
+ private String wsnotes=null;
private String remotecrecnum=null;
private int custnum=0;
private int servsync;
@@ -33,6 +34,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;
@@ -80,7 +83,10 @@
this.wsrec = rs2.getInt("wsrec");
this.crec = rs2.getInt("crec");
this.wsmult = rs2.getString("wsmult");
+ this.wsmultlab = rs2.getString("wsmultlab");
+ this.wsmultsub = rs2.getString("wsmultsub");
this.wsdate = rs2.getString("wsdate");
+ this.wsnotes = rs2.getString("wsnotes");
this.wsdesc = rs2.getString("wsdesc");
this.custsite=rs2.getString("custsite");
this.sitenum=rs2.getString("sitenum");
@@ -108,8 +114,8 @@
String acolumns= new String("quotenum");
///String tqnotes = qnotes.replaceAll("'","''");
-System.out.println("\nINSERT INTO worksheet (crec, wsdate, wsdesc, wsmult) Values ('"+remotecrecnum+"','" +wsdate+ "','" +wsdesc+ "', '"+wsmult+"')\n");
-int recordset=stmtu.executeUpdate("INSERT INTO worksheet (crec, wsdate, wsdesc, wsmult) Values ('"+remotecrecnum+"','" +wsdate+ "','" +wsdesc+ "', '"+wsmult+"')",keyColumn);
+System.out.println("\nINSERT INTO worksheet (crec, wsdate, wsdesc, wsmult, wsmultlab, wsmultsub) Values ('"+remotecrecnum+"','" +wsdate+ "','" +wsdesc+ "', '"+wsmult+"')\n");
+int recordset=stmtu.executeUpdate("INSERT INTO worksheet (crec, wsdate, wsdesc, wsmult, wsmultlab, wsmultsub, wsnotes) Values ('"+remotecrecnum+"','" +wsdate+ "','" +wsdesc+ "', '"+wsmult+"', '"+wsmultlab+"', '"+wsmultsub+"', '"+wsnotes+"')",keyColumn);
ResultSet rsKeyColumn = stmtu.getGeneratedKeys();
if(rsKeyColumn.next()) { // ADD THIS LINE! IMPORTANT!
ID = rsKeyColumn.getString(1);
@@ -133,11 +139,13 @@
int laborhours = tp.getWsLaborHours();
int shophours = tp.getWsShopHours();
double laborcost = tp.getWsLaborCost();
+ double subcost = tp.getWsSubCost();
String scost=""+cost+"";
+ String ssubcost=""+subcost+"";
String slaborcost=""+laborcost+"";
String titem = item.replaceAll("'","''");
- UniWsItems.AddItem(conu,Integer.parseInt(ID),titem,keycode,quantity,scost,laborhours,slaborcost,shophours);
+ UniWsItems.AddItem(conu,Integer.parseInt(ID),titem,keycode,quantity,scost,laborhours,slaborcost,shophours,ssubcost);
}
Modified: trunk/servsys/src/com/pandmservices/web/UniCash.java
===================================================================
--- trunk/servsys/src/com/pandmservices/web/UniCash.java 2010-01-24 19:01:09 UTC (rev 123)
+++ trunk/servsys/src/com/pandmservices/web/UniCash.java 2010-01-25 22:12:08 UTC (rev 124)
@@ -3003,9 +3003,9 @@
int result=stmt.executeUpdate("DROP TABLE IF EXISTS masterworksheet;");
result=stmt.executeUpdate("DROP TABLE IF EXISTS masterwsitem;");
// Rebuild Local Tables
- result=stmt.executeUpdate("create table masterworksheet (wsrec int(11) NOT NULL auto_increment,wsdesc text NOT NULL, wsdate date NOT NULL default '2000-01-01',wsnotes text NOT NULL,wsmult decimal(10,2) NOT NULL default '0.00',PRIMARY KEY (wsrec),KEY wsrec (wsrec));");
+ result=stmt.executeUpdate("create table masterworksheet (wsrec int(11) NOT NULL auto_increment,wsdesc text NOT NULL, wsdate date NOT NULL default '2000-01-01',wsnotes text NOT NULL,wsmult decimal(10,2) NOT NULL default '0.00',wsmultlab decimal(10,2) NOT NULL default '0.00',wsmultsub decimal(10,2) NOT NULL default '0.00',PRIMARY KEY (wsrec),KEY wsrec (wsrec));");
- result=stmt.executeUpdate("CREATE TABLE masterwsitem ( wsrec int(11) NOT NULL default '0',itemrec int(11) NOT NULL auto_increment,item text NOT NULL,keycode text NOT NULL,quantity int(11) NOT NULL default '0',cost decimal(10,2) NOT NULL default '0.00',laborhours int(11) NOT NULL default '0', laborcost decimal(10,2) NOT NULL default '0.00',shophours int(11) NOT NULL default '0',UNIQUE KEY itemrec_2 (itemrec),KEY itemrec (itemrec));");
+ result=stmt.executeUpdate("CREATE TABLE masterwsitem ( wsrec int(11) NOT NULL default '0',itemrec int(11) NOT NULL auto_increment,item text NOT NULL,keycode text NOT NULL,quantity int(11) NOT NULL default '0',cost decimal(10,2) NOT NULL default '0.00',laborhours int(11) NOT NULL default '0', laborcost decimal(10,2) NOT NULL default '0.00',shophours int(11) NOT NULL default '0' , subcost decimal(10,2) NOT NULL default '0.00',UNIQUE KEY itemrec_2 (itemrec),KEY itemrec (itemrec));");
// Get Master Worksheet Items
Vector vw;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
