'更新xxx'

src/com/tohi/app/compaccept/CompAcceptLineMbo.java

 package com.tohi.app.compaccept;
 
 import java.rmi.RemoteException;
+import java.util.HashSet;
 
 import psdi.mbo.Mbo;
 import psdi.mbo.MboRemote;
 import psdi.mbo.MboSet;
+import psdi.mbo.MboValueInfo;
 import psdi.util.MXException;
 
 public class CompAcceptLineMbo extends Mbo implements MboRemote {
-	
+
+	private static HashSet skipFieldCopy = new HashSet();
+	private static boolean isHashSetLoaded = false;
 
 	public CompAcceptLineMbo(MboSet ms) throws RemoteException {
 		super(ms);
@@ -23,5 +27,18 @@ public class CompAcceptLineMbo extends Mbo implements MboRemote {
 		setValue("UDCOMPACCEPTID",owner.getUniqueIDValue(),2L);
 		setValue("linenum",String.valueOf(this.getThisMboSet().count(16)+1),2L);
 	}
-	
+	protected boolean skipCopyField(MboValueInfo mvi) throws MXException, RemoteException {
+		loadSkipFieldCopyHashSet();
+		return skipFieldCopy.contains(mvi.getName());
+	}
+
+	private static void loadSkipFieldCopyHashSet() throws MXException, RemoteException {
+		isHashSetLoaded = true;
+		skipFieldCopy.add("ORGID");
+		skipFieldCopy.add("SITEID");
+		skipFieldCopy.add("UDCOMPACCEPTID");
+	}
+	public static HashSet getHashSet() throws MXException, RemoteException {
+		return skipFieldCopy;
+	}
 }
\ No newline at end of file

src/com/tohi/app/compaccept/CompAcceptMbo.java

 package com.tohi.app.compaccept;
 
 import java.rmi.RemoteException;
+import java.util.HashSet;
 
 import com.tohi.util.Common;
 
@@ -8,6 +9,7 @@ import psdi.mbo.Mbo;
 import psdi.mbo.MboRemote;
 import psdi.mbo.MboSet;
 import psdi.mbo.MboSetRemote;
+import psdi.mbo.MboValueInfo;
 import psdi.mbo.SqlFormat;
 import psdi.server.MXServer;
 import psdi.util.MXApplicationException;
@@ -15,6 +17,8 @@ import psdi.util.MXException;
 
 public class CompAcceptMbo extends Mbo implements MboRemote {
 	private boolean isModified = false;
+	private static HashSet skipFieldCopy = new HashSet();
+	private static boolean isHashSetLoaded = false;
 
 	public CompAcceptMbo(MboSet ms) throws RemoteException {
 		super(ms);
@@ -182,4 +186,67 @@ public class CompAcceptMbo extends Mbo implements MboRemote {
 		mbosetremote.close();
 		return flag;
 	}
+	public MboRemote duplicate() throws MXException, RemoteException {
+		if (!isHashSetLoaded) {
+			loadSkipFieldCopyHashSet();
+		}
+
+		MboRemote mboremote = copy();
+		
+		MboSetRemote toollogline = getMboSet("UDCOMPACCEPTLINE");
+		if (!toollogline.isEmpty()) {
+			toollogline.copy(mboremote.getMboSet("UDCOMPACCEPTLINE"));
+		}
+
+		return mboremote;
+	}
+
+	protected boolean skipCopyField(MboValueInfo mvi) throws MXException, RemoteException {
+		return skipFieldCopy.contains(mvi.getName());
+	}
+
+	private static void loadSkipFieldCopyHashSet() throws MXException, RemoteException {
+		isHashSetLoaded = true;
+		skipFieldCopy.add("ORGID");
+		skipFieldCopy.add("SITEID");
+		skipFieldCopy.add("CHANGEBY");
+		skipFieldCopy.add("CHANGEDATE");
+		skipFieldCopy.add("ACCEPTBY");
+		skipFieldCopy.add("CREATEDATE");
+		skipFieldCopy.add("STATUS");
+		skipFieldCopy.add("DEPT");
+		skipFieldCopy.add("HISTORYFLAG");
+//		skipFieldCopy.add("CONTNUM");
+//		skipFieldCopy.add("PONUM");
+//		skipFieldCopy.add("VENDOR");
+		skipFieldCopy.add("ACCEPTTOTAL1");
+		skipFieldCopy.add("ACCEPTCOST");
+		skipFieldCopy.add("PAYTOTAL1");
+		skipFieldCopy.add("PAYCOST");
+//		skipFieldCopy.add("CONCLUSION");
+		skipFieldCopy.add("SIGNPERSON1");
+		skipFieldCopy.add("SIGNPERSON2");
+		skipFieldCopy.add("SIGNPERSON3");
+		skipFieldCopy.add("SIGNPERSON4");
+		skipFieldCopy.add("SIGNPERSON8");
+		skipFieldCopy.add("SIGNDATE1");
+		skipFieldCopy.add("SIGNDATE2");
+		skipFieldCopy.add("SIGNDATE3");
+		skipFieldCopy.add("SIGNDATE4");
+		skipFieldCopy.add("SIGNDATE8");
+//		skipFieldCopy.add("STARTDATE");
+//		skipFieldCopy.add("ENDDATE");
+		skipFieldCopy.add("LINEADVISE1");
+		skipFieldCopy.add("LINEADVISE2");
+		skipFieldCopy.add("SIGNPERSON6");
+		skipFieldCopy.add("SIGNDATE6");
+		skipFieldCopy.add("SHEAPPRBY");
+		skipFieldCopy.add("LINEADVISE3");
+//		skipFieldCopy.add("LINEADVISE4");
+		skipFieldCopy.add("LINEADVISE5");
+	}
+
+	public static HashSet getHashSet() throws MXException, RemoteException {
+		return skipFieldCopy;
+	}
 }
\ No newline at end of file

src/com/tohi/app/crontask/fincntrl/Fincntrl.java

+package com.tohi.app.crontask.fincntrl;
+
+public class Fincntrl {
+	private Long fincntrlid;
+	private String projectid;
+	private Long parentfincntrlid;
+	public Long getFincntrlid() {
+		return fincntrlid;
+	}
+	public void setFincntrlid(Long fincntrlid) {
+		this.fincntrlid = fincntrlid;
+	}
+	public String getProjectid() {
+		return projectid;
+	}
+	public void setProjectid(String projectid) {
+		this.projectid = projectid;
+	}
+	public Long getParentfincntrlid() {
+		return parentfincntrlid;
+	}
+	public void setParentfincntrlid(Long parentfincntrlid) {
+		this.parentfincntrlid = parentfincntrlid;
+	}
+	 
+	 
+	
+	
+}

src/com/tohi/app/dltj/DltjMbo.java

@@ -345,12 +345,12 @@ public class DltjMbo extends Mbo implements MboRemote {
 	// --------------------------------------------------------------------报总调-低谷----------------------------------------------------
 	// 报总调 （低谷）1A高厂变 = （今日7点-昨日23点）×88
 	public void setBZD_DG_GCB1A() throws RemoteException, MXException {
-		setValue("BZD_DG_GCB1A", (getDouble("DL3_7") - getDouble("LASTDAY.DL3_23")) * 88, 2L);
+		setValue("BZD_DG_GCB1A", (getDouble("DL3_7") - getDouble("LASTDAY.DL3_23")) * 55, 2L);
 	}
 
 	// 报总调 （低谷）1B高厂变 = （今日7点-昨日23点）×88
 	public void setBZD_DG_GCB1B() throws RemoteException, MXException {
-		setValue("BZD_DG_GCB1B", (getDouble("DL4_7") - getDouble("LASTDAY.DL4_23")) * 88, 2L);
+		setValue("BZD_DG_GCB1B", (getDouble("DL4_7") - getDouble("LASTDAY.DL4_23")) * 55, 2L);
 	}
 
 	// 报总调 （低谷）#1主变 = （今日7点-昨日23点）×1250
@@ -453,12 +453,12 @@ public class DltjMbo extends Mbo implements MboRemote {
 
 	// 报总调 （高峰）1A高厂变 = （今日23点-今日7点）×88
 	public void setBZD_GF_GCB1A() throws RemoteException, MXException {
-		setValue("BZD_GF_GCB1A", (getDouble("DL3_23") - getDouble("DL3_7")) * 88, 2L);
+		setValue("BZD_GF_GCB1A", (getDouble("DL3_23") - getDouble("DL3_7")) * 55, 2L);
 	}
 
 	// 报总调 （高峰）1B高厂变 = （今日23点-今日7点）×88
 	public void setBZD_GF_GCB1B() throws RemoteException, MXException {
-		setValue("BZD_GF_GCB1B", (getDouble("DL4_23") - getDouble("DL4_7")) * 88, 2L);
+		setValue("BZD_GF_GCB1B", (getDouble("DL4_23") - getDouble("DL4_7")) * 55, 2L);
 	}
 
 	// 报总调 （低谷）#1厂用电量 = 1A高厂变+1B高厂变
@@ -652,12 +652,12 @@ public class DltjMbo extends Mbo implements MboRemote {
 	// 24时-----------------------------------------------
 	// 报中调 1A高厂变 = （今日24点-昨日24点）×88
 	public void setBZD_GCB1A() throws RemoteException, MXException {
-		setValue("BZD_GCB1A", (getDouble("DL3_24") - getDouble("LASTDAY.DL3_24")) * 88, 2L);
+		setValue("BZD_GCB1A", (getDouble("DL3_24") - getDouble("LASTDAY.DL3_24")) * 55, 2L);
 	}
 
 	// 报中调 1B高厂变 = （今日24点-昨日24点）×88
 	public void setBZD_GCB1B() throws RemoteException, MXException {
-		setValue("BZD_GCB1B", (getDouble("DL4_24") - getDouble("LASTDAY.DL4_24")) * 88, 2L);
+		setValue("BZD_GCB1B", (getDouble("DL4_24") - getDouble("LASTDAY.DL4_24")) * 55, 2L);
 	}
 
 	// 报中调#1主变 = （今日24点-昨日24点）×1250

src/com/tohi/app/fincntrl/FinExpenseMbo.java

@@ -38,7 +38,7 @@ public class FinExpenseMbo extends Mbo implements MboRemote {
 			if(line.toBeSaved())
 			{
 				line.setValue("actualcost", line.getDouble("budgetcost")+line.getDouble("ALTERCOST"));
-				line.setValue("netcost", line.getDouble("actualcost") - line.getDouble("PROJECTCOST"));
+				line.setValue("netcost", line.getDouble("actualcost") - line.getDouble("PROJECTCOST") - line.getDouble("pendingcost"));
 			}
 		}
 
@@ -69,5 +69,5 @@ public class FinExpenseMbo extends Mbo implements MboRemote {
 			setValue("changeby", getUserInfo().getPersonId(), 11L);
 		}
 	}
-
+	
 }
\ No newline at end of file

src/com/tohi/app/inbxconfig/FcgInbxConfigSet.java

+package com.tohi.app.inbxconfig;
+import java.rmi.RemoteException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Vector;
+import psdi.app.inbxconfig.InbxConfig;
+import psdi.app.inbxconfig.InbxConfigRemote;
+//import psdi.app.inbxconfig.InbxConfigSet;
+import psdi.app.inbxconfig.InbxConfigSetRemote;
+import psdi.app.scconfig.Layout;
+import psdi.mbo.Mbo;
+import psdi.mbo.MboRemote;
+import psdi.mbo.MboServerInterface;
+import psdi.mbo.MboSet;
+import psdi.mbo.MboSetInfo;
+import psdi.mbo.MboSetRemote;
+import psdi.mbo.MboValueData;
+import psdi.mbo.MboValueInfo;
+import psdi.mbo.SqlFormat;
+import psdi.server.MXServer;
+import psdi.util.MXException;
+import psdi.util.MXFormat;
+import psdi.workflow.WFAssignmentSetRemote;
+
+public class FcgInbxConfigSet extends MboSet implements InbxConfigSetRemote {
+  private Vector inboxColumns;
+  
+  private MboValueData[][] keyAttribData = (MboValueData[][])null;
+  
+  private int noOfAssignments = 0;
+  
+  private String latestDate = "";
+  
+  private String inboxDescTitle = "";
+  
+  public FcgInbxConfigSet(MboServerInterface ms) throws MXException, RemoteException {
+    super(ms);
+  }
+  
+  protected Mbo getMboInstance(MboSet ms) throws MXException, RemoteException {
+    return (Mbo)new InbxConfig(ms);
+  }
+  
+  public void setInboxColumns() throws RemoteException, MXException {
+    try {
+      Hashtable vecAttributes = getWFAssignmentColumns();
+      int size = vecAttributes.size();
+      Enumeration<String> e = vecAttributes.keys();
+      int i = 0;
+      while (e.hasMoreElements()) {
+        String key = e.nextElement();
+        MboRemote inboxconfigMbo = add();
+        inboxconfigMbo.setValue("INBXCOLUMN", key);
+        inboxconfigMbo.setValue("DESCRIPTION", (String)vecAttributes.get(key));
+        inboxconfigMbo.setValue("DISPLAY", false);
+        i++;
+      } 
+    } catch (Throwable t) {
+      t.printStackTrace();
+    } 
+  }
+  
+  public Vector getColumns() throws RemoteException, MXException {
+    Vector<String[]> vecAttributes = new Vector();
+    setOrderBy("ordernum asc,description asc");
+    for (int i = 0;; i++) {
+      InbxConfigRemote inbx = (InbxConfigRemote)getMbo(i);
+      if (inbx == null)
+        break; 
+      String[] arrColumn = new String[2];
+      arrColumn[0] = inbx.getString("inbxcolumn");
+      arrColumn[1] = inbx.getString("description");
+      vecAttributes.add(arrColumn);
+    } 
+    return vecAttributes;
+  }
+  
+  private Hashtable getWFAssignmentColumns() throws RemoteException, MXException {
+	  Hashtable<Object, Object> attibutes = new Hashtable<Object, Object>();
+    MboSetRemote msr = MXServer.getMXServer().getMboSet("WFASSIGNMENT", getUserInfo());
+    MboSetInfo msi = msr.getMboSetInfo();
+    Iterator<MboValueInfo> fields = msi.getAttributes();
+    while (fields.hasNext()) {
+      MboValueInfo mvi = fields.next();
+      String sAttribute = mvi.getAttributeName();
+      String sTitle = mvi.getTitle();
+      if (sTitle == null)
+        sTitle = ""; 
+      attibutes.put(sAttribute, sTitle);
+    } 
+    return attibutes;
+  }
+  
+  public MboValueData[][] getAssignments(int start, int rowcount, String sortBy) throws RemoteException, MXException {
+    Vector columns = getInboxColumns();
+    String[] arrColumns = new String[columns.size()];
+    String[] keyColumns = { "description", "app", "assignid", "ownerid", "isownerlocked", "ownerlockedby" };
+    for (int i = 0; i < columns.size(); i++)
+      arrColumns[i] = ((String[])columns.elementAt(i))[0]; 
+    WFAssignmentSetRemote wf = (WFAssignmentSetRemote)MXServer.getMXServer().getMboSet("WFASSIGNMENT", getUserInfo());
+    if (!sortBy.equals(""))
+      wf.setOrderBy(sortBy); 
+    wf.getInboxAssignments();
+    processGroupOROrder(wf,sortBy);
+    this.inboxDescTitle = wf.getMboValueInfoStatic("description").getTitle();
+    Date date = wf.latestDate("duedate");
+    if (date != null)
+      this.latestDate = MXFormat.dateTimeToString(date, getUserInfo().getLocale(), getUserInfo().getTimeZone()); 
+    this.noOfAssignments = wf.count();
+    MboValueData[][] keyData = wf.getMboValueData(start, rowcount, keyColumns);
+    this.keyAttribData = keyData;
+    MboValueData[][] mvd = wf.getMboValueData(start, rowcount, arrColumns);
+    return mvd;
+  }
+  private void processGroupOROrder(WFAssignmentSetRemote wf, String sortBy)
+		    throws RemoteException, MXException
+		  {
+		    if ((wf == null) || (wf.isEmpty()))
+		      return;
+		    MboRemote layout = getOwner();
+		    if ((layout == null) || (!(layout instanceof Layout)))
+		      return;
+		    String desc = layout.getString("description");
+		    
+		    String orderby = "startdate";
+		    String type = "desc";
+		      String completeWhere = wf.getCompleteWhere();
+		      String where = "";
+		    if(desc.startsWith("ú̿")){
+		    	where = " app  in ('COALPR1','COALRFQ1','COALPO1','COALPURCH','COALINV')";
+		    }
+		    else
+		    	  where = " app not in ('COALPR1','COALRFQ1','COALPO1','COALPURCH','COALINV')";
+		      SqlFormat s = new SqlFormat(where);
+
+		      if ((completeWhere != null) && (!"".equals(completeWhere.trim())))
+		        completeWhere = s.format() + "  and  " + completeWhere;
+		      else
+		        completeWhere = s.format();
+		      wf.setWhere(completeWhere);
+		      wf.setOrderBy(orderby + "  " + type);
+		      wf.reset();
+		  }
+  public Vector getInboxColumns() throws RemoteException, MXException {
+    if (this.inboxColumns != null && !this.inboxColumns.isEmpty())
+      return this.inboxColumns; 
+    this.inboxColumns = new Vector();
+    String sql = "display=:yes";
+    SqlFormat sqf = new SqlFormat(sql);
+    setWhere(sqf.format());
+    setOrderBy("ordernum asc,description asc");
+    reset();
+    for (int i = 0;; i++) {
+      InbxConfigRemote inbx = (InbxConfigRemote)getMbo(i);
+      if (inbx == null)
+        break; 
+      if (!"description".equalsIgnoreCase(inbx.getString("inbxcolumn"))) {
+        String[] arrColumn = new String[2];
+        arrColumn[0] = inbx.getString("inbxcolumn");
+        arrColumn[1] = inbx.getString("description");
+        this.inboxColumns.add(arrColumn);
+      } 
+    } 
+    return this.inboxColumns;
+  }
+  
+  public void resetInboxColumns() throws RemoteException, MXException {
+    this.inboxColumns = null;
+  }
+  
+  public MboValueData[][] getKeyAttributeData() throws RemoteException, MXException {
+    return this.keyAttribData;
+  }
+  
+  public int getNoOfAssignments() throws RemoteException, MXException {
+    if (this.noOfAssignments == 0) {
+      WFAssignmentSetRemote wf = (WFAssignmentSetRemote)MXServer.getMXServer().getMboSet("WFASSIGNMENT", getUserInfo());
+      wf.getInboxAssignments();
+      processGroupOROrder(wf,"");
+      this.noOfAssignments = wf.count();
+      return this.noOfAssignments;
+    } 
+    return this.noOfAssignments;
+  }
+  
+  public String latestDate() throws RemoteException, MXException {
+    return this.latestDate;
+  }
+  
+  public String getInboxDescTitle() throws RemoteException, MXException {
+    return this.inboxDescTitle;
+  }
+  
+  public ArrayList getNonPersistentAttributes() throws RemoteException, MXException {
+    ArrayList<String> npAttributes = new ArrayList();
+    MboSetRemote msr = MXServer.getMXServer().getMboSet("WFASSIGNMENT", getUserInfo());
+    MboSetInfo msi = msr.getMboSetInfo();
+    Iterator<MboValueInfo> allFields = msi.getAttributes();
+    while (allFields.hasNext()) {
+      MboValueInfo mvi = allFields.next();
+      if (!mvi.isPersistent())
+        npAttributes.add(mvi.getAttributeName()); 
+    } 
+    return npAttributes;
+  }
+}

src/com/tohi/app/invoice/FldFcgBJSF.java

@@ -20,8 +20,12 @@ public class FldFcgBJSF extends MboValueAdapter {
 		super.action();
 		MboValue FldValue = getMboValue();
 		MboRemote mbo = FldValue.getMbo();
-		if(getMboValue().getDouble() <  0) 
+		
+		
+		if(getMboValue().getDouble() <  0) {
 			throw new MXApplicationException("\nʾ:", "\n ֧С0!");
+			}
+		
 		mbo.setValue("FCG_FINALCOST", mbo.getDouble("FCG_RATE") * getMboValue().getDouble(),11L);
 		mbo.setValue("FCG_COSTWORDS", MoneyUtil.amountToChinese(mbo.getDouble("FCG_FINALCOST")),11L);
 	}

src/com/tohi/app/mocchange/FldDateValidate.java

@@ -37,8 +37,8 @@ public class FldDateValidate extends MboValueAdapter {
 					if(day > 0)
 						result = result + 1;
 					int month = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * 12;
-					if (Math.abs(month + result) > 6)
-						throw new MXApplicationException("\n提示:", "\n   临时变更的最长时间不能超过6个月！");
+					if (Math.abs(month + result) > 12)
+						throw new MXApplicationException("\n提示:", "\n   临时变更的最长时间不能超过12个月！");
 				}
 
 			}
@@ -55,8 +55,8 @@ public class FldDateValidate extends MboValueAdapter {
 					if(day > 0)
 						result = result + 1;
 					int month = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * 12;
-					if (Math.abs(month + result) > 6)
-						throw new MXApplicationException("\n提示:", "\n   临时变更的最长时间不能超过6个月！");
+					if (Math.abs(month + result) > 12)
+						throw new MXApplicationException("\n提示:", "\n   临时变更的最长时间不能超过12个月！");
 				}
 				if(!mbo.isNull("B4_DIRECTORDATE")){
 					end.setTime(mbo.getDate("B4_DIRECTORDATE"));

src/com/tohi/app/shtj/ShtjMbo.java

@@ -316,15 +316,18 @@ public class ShtjMbo extends Mbo implements MboRemote {
 	}
 
 	// --------------------------------------------------------------------柳钢----------------------------------------------------
-	// 柳钢供汽日流量 = 今日（柳钢供汽累计流量）- 昨日（柳钢供汽累计流量）
+	 
+	// 累计供热量    --手填
 	public void setLG_GQRLL() throws RemoteException, MXException {
-		setValue("LG_GQRLL",
-				getDouble("SH70") - getDouble("LASTDAY.SH70") + getDouble("SH75") - getDouble("LASTDAY.SH75"), 2L);
+//		setValue("LG_GQRLL",
+//				getDouble("SH70") - getDouble("LASTDAY.SH70") + getDouble("SH75") - getDouble("LASTDAY.SH75"), 2L);
 	}
 
-	// 柳钢供汽水流量 = 今日（柳钢供水累计流量）- 昨日（柳钢供水累计流量）
+	// 日供热量 = 今日累计供热-昨日累计供热
 	public void setLG_GSRLL() throws RemoteException, MXException {
-		setValue("LG_GSRLL", getDouble("SH71") - getDouble("LASTDAY.SH71"), 2L);
+
+//		setValue("LG_GSRLL", getDouble("SH71") - getDouble("LASTDAY.SH71"), 2L);
+		setValue("LG_GSRLL", getDouble("LG_GQRLL") - getDouble("LASTDAY.LG_GQRLL"), 2L);
 	}
 
 	// --------------------------------------------------------------------淡水----------------------------------------------------

src/com/tohi/app/stock/StockTaking.java

@@ -21,7 +21,7 @@ public class StockTaking
   public void add() throws MXException, RemoteException {
 		super.add();
 		setValue("STATUS","WAPPR",2L);
-		setValue("LOCATION","CENTRAL",2L);
+//		setValue("LOCATION","CENTRAL",2L);
 	}
   public void modify() throws MXException, RemoteException {
 		if (!this.isModified) {

src/com/tohi/app/tenderbond/FldFcgFkje.java

+package com.tohi.app.tenderbond;
+
+import java.rmi.RemoteException;
+
+import psdi.mbo.Mbo;
+import psdi.mbo.MboValue;
+import psdi.mbo.MboValueAdapter;
+import psdi.server.MXServer;
+import psdi.util.MXException;
+
+/**
+ * 付款金额定义类
+ * @author assessment
+ *
+ */
+public class FldFcgFkje extends MboValueAdapter {
+	public FldFcgFkje(MboValue mbv) {
+		super(mbv);
+	}
+	@Override
+	public void initValue() throws MXException, RemoteException {
+		// TODO 自动生成的方法存根
+		super.initValue();
+	}
+	@Override
+	public void action() throws MXException, RemoteException {
+		Mbo mboRemote = this.getMboValue().getMbo();
+		if (!this.getMboValue().isNull()) {
+			System.out.println("进入FldFcgFkje进行赋值----"+mboRemote.getUserInfo().getLoginUserName());
+			mboRemote.setValue("PAYBY",mboRemote.getUserInfo().getLoginUserName());
+			mboRemote.setValue("PAYDATE",MXServer.getMXServer().getDate());
+		}
+	}
+	
+}

src/com/tohi/common/dto/mt/Contract.java

+package com.tohi.common.dto.mt;
+import java.util.*;
+
+public class Contract {
+	private Long CONTRACTID;
+	private String CONTRACTNUM;
+	private String DESCRIPTION;
+	private String FCG_HTBH;
+	private String FCG_SWJBR;
+	private String DISPLAYNAME;
+	private String FCG_MZ;
+	private String FCG_DJFS;
+	private String FCG_CJFS;
+	private String CURR_CODE;
+	private String CONTRACT_PRICE;
+	private String CALORIFIC_VALUE;
+	private String DELIVERY_DATE;
+	private String DELIVERY_DATE2;
+	private String FCG_DSHDATA;
+	private String FCG_GLADATE;
+	private String CONTRACT_SUPPLY;
+	private String FLD_2;
+	private String FLD_1;
+	private String RATIFY_BUDGET_AMOUNT;
+	private String MARGIN_AMOUNT;
+	private String ACTPOQTY;
+	private String CUSTMAXVOL;
+	private String MAXRELVOL;
+	List<ContractLine> contractLineList=new ArrayList<ContractLine>();
+	
+	public List<ContractLine> getContractLineList() {
+		return contractLineList;
+	}
+	public void setContractLineList(List<ContractLine> contractLineList) {
+		this.contractLineList = contractLineList;
+	}
+	public Long getCONTRACTID() {
+		return CONTRACTID;
+	}
+	public void setCONTRACTID(Long cONTRACTID) {
+		CONTRACTID = cONTRACTID;
+	}
+	public String getCONTRACTNUM() {
+		return CONTRACTNUM;
+	}
+	public void setCONTRACTNUM(String cONTRACTNUM) {
+		CONTRACTNUM = cONTRACTNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getFCG_HTBH() {
+		return FCG_HTBH;
+	}
+	public void setFCG_HTBH(String fCG_HTBH) {
+		FCG_HTBH = fCG_HTBH;
+	}
+	public String getFCG_SWJBR() {
+		return FCG_SWJBR;
+	}
+	public void setFCG_SWJBR(String fCG_SWJBR) {
+		FCG_SWJBR = fCG_SWJBR;
+	}
+	public String getDISPLAYNAME() {
+		return DISPLAYNAME;
+	}
+	public void setDISPLAYNAME(String dISPLAYNAME) {
+		DISPLAYNAME = dISPLAYNAME;
+	}
+	public String getFCG_MZ() {
+		return FCG_MZ;
+	}
+	public void setFCG_MZ(String fCG_MZ) {
+		FCG_MZ = fCG_MZ;
+	}
+	public String getFCG_DJFS() {
+		return FCG_DJFS;
+	}
+	public void setFCG_DJFS(String fCG_DJFS) {
+		FCG_DJFS = fCG_DJFS;
+	}
+	public String getFCG_CJFS() {
+		return FCG_CJFS;
+	}
+	public void setFCG_CJFS(String fCG_CJFS) {
+		FCG_CJFS = fCG_CJFS;
+	}
+	public String getCURR_CODE() {
+		return CURR_CODE;
+	}
+	public void setCURR_CODE(String cURR_CODE) {
+		CURR_CODE = cURR_CODE;
+	}
+	public String getCONTRACT_PRICE() {
+		return CONTRACT_PRICE;
+	}
+	public void setCONTRACT_PRICE(String cONTRACT_PRICE) {
+		CONTRACT_PRICE = cONTRACT_PRICE;
+	}
+	public String getCALORIFIC_VALUE() {
+		return CALORIFIC_VALUE;
+	}
+	public void setCALORIFIC_VALUE(String cALORIFIC_VALUE) {
+		CALORIFIC_VALUE = cALORIFIC_VALUE;
+	}
+	public String getDELIVERY_DATE() {
+		return DELIVERY_DATE;
+	}
+	public void setDELIVERY_DATE(String dELIVERY_DATE) {
+		DELIVERY_DATE = dELIVERY_DATE;
+	}
+	public String getDELIVERY_DATE2() {
+		return DELIVERY_DATE2;
+	}
+	public void setDELIVERY_DATE2(String dELIVERY_DATE2) {
+		DELIVERY_DATE2 = dELIVERY_DATE2;
+	}
+	public String getFCG_DSHDATA() {
+		return FCG_DSHDATA;
+	}
+	public void setFCG_DSHDATA(String fCG_DSHDATA) {
+		FCG_DSHDATA = fCG_DSHDATA;
+	}
+	public String getFCG_GLADATE() {
+		return FCG_GLADATE;
+	}
+	public void setFCG_GLADATE(String fCG_GLADATE) {
+		FCG_GLADATE = fCG_GLADATE;
+	}
+	public String getCONTRACT_SUPPLY() {
+		return CONTRACT_SUPPLY;
+	}
+	public void setCONTRACT_SUPPLY(String cONTRACT_SUPPLY) {
+		CONTRACT_SUPPLY = cONTRACT_SUPPLY;
+	}
+	public String getFLD_2() {
+		return FLD_2;
+	}
+	public void setFLD_2(String fLD_2) {
+		FLD_2 = fLD_2;
+	}
+	public String getFLD_1() {
+		return FLD_1;
+	}
+	public void setFLD_1(String fLD_1) {
+		FLD_1 = fLD_1;
+	}
+	public String getRATIFY_BUDGET_AMOUNT() {
+		return RATIFY_BUDGET_AMOUNT;
+	}
+	public void setRATIFY_BUDGET_AMOUNT(String rATIFY_BUDGET_AMOUNT) {
+		RATIFY_BUDGET_AMOUNT = rATIFY_BUDGET_AMOUNT;
+	}
+	public String getMARGIN_AMOUNT() {
+		return MARGIN_AMOUNT;
+	}
+	public void setMARGIN_AMOUNT(String mARGIN_AMOUNT) {
+		MARGIN_AMOUNT = mARGIN_AMOUNT;
+	}
+	public String getACTPOQTY() {
+		return ACTPOQTY;
+	}
+	public void setACTPOQTY(String aCTPOQTY) {
+		ACTPOQTY = aCTPOQTY;
+	}
+	public String getCUSTMAXVOL() {
+		return CUSTMAXVOL;
+	}
+	public void setCUSTMAXVOL(String cUSTMAXVOL) {
+		CUSTMAXVOL = cUSTMAXVOL;
+	}
+	public String getMAXRELVOL() {
+		return MAXRELVOL;
+	}
+	public void setMAXRELVOL(String mAXRELVOL) {
+		MAXRELVOL = mAXRELVOL;
+	}
+	
+}

src/com/tohi/common/dto/mt/ContractLine.java

+package com.tohi.common.dto.mt;
+
+public class ContractLine {
+	private String ITEMNUM;
+	private String DESCRIPTION;
+	private String ENTERBY;
+	private String ENTERDATE;
+	private String ORDERQTY;
+	private String ORDERUNIT;
+	private String CUSTUNITCOST;
+	private String CUSTTAX1;
+	private String CUSTTAX1CODE;
+	private String CUSTUSD;
+	private String UNITCOST;
+	private String LINECOST;
+	public String getITEMNUM() {
+		return ITEMNUM;
+	}
+	public void setITEMNUM(String iTEMNUM) {
+		ITEMNUM = iTEMNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getENTERBY() {
+		return ENTERBY;
+	}
+	public void setENTERBY(String eNTERBY) {
+		ENTERBY = eNTERBY;
+	}
+	public String getENTERDATE() {
+		return ENTERDATE;
+	}
+	public void setENTERDATE(String eNTERDATE) {
+		ENTERDATE = eNTERDATE;
+	}
+	public String getORDERQTY() {
+		return ORDERQTY;
+	}
+	public void setORDERQTY(String oRDERQTY) {
+		ORDERQTY = oRDERQTY;
+	}
+	public String getORDERUNIT() {
+		return ORDERUNIT;
+	}
+	public void setORDERUNIT(String oRDERUNIT) {
+		ORDERUNIT = oRDERUNIT;
+	}
+	public String getCUSTUNITCOST() {
+		return CUSTUNITCOST;
+	}
+	public void setCUSTUNITCOST(String cUSTUNITCOST) {
+		CUSTUNITCOST = cUSTUNITCOST;
+	}
+	public String getCUSTTAX1() {
+		return CUSTTAX1;
+	}
+	public void setCUSTTAX1(String cUSTTAX1) {
+		CUSTTAX1 = cUSTTAX1;
+	}
+	public String getCUSTTAX1CODE() {
+		return CUSTTAX1CODE;
+	}
+	public void setCUSTTAX1CODE(String cUSTTAX1CODE) {
+		CUSTTAX1CODE = cUSTTAX1CODE;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getUNITCOST() {
+		return UNITCOST;
+	}
+	public void setUNITCOST(String uNITCOST) {
+		UNITCOST = uNITCOST;
+	}
+	public String getLINECOST() {
+		return LINECOST;
+	}
+	public void setLINECOST(String lINECOST) {
+		LINECOST = lINECOST;
+	}
+	
+
+}

src/com/tohi/common/dto/mt/Invoice.java

+package com.tohi.common.dto.mt;
+
+import java.util.*;
+
+public class Invoice {
+	private Long INVOICEID;
+	private String INVOICENUM;
+	private String 	DESCRIPTION;
+	private String 	FCG_PAYTYPE;
+	private String 	LCNO;
+	private String 	FCG_PAYCLASS;
+	private String 	COALTYPE;
+	private String 	FCG_SHIPPERIOD;
+	private String 	CUSTUSD;
+	private String 	FCG_RATE;
+	private String 	DESCRIPTION_LONGDESCRIPTION;
+	private String 	FCG_TOTALCOSTPLAN;
+	private String 	FCG_BJSF;
+	private String 	COAL;
+	private String 	TRANSMODE;
+	private String 	CONTRACTNATURE;
+	private String 	STATUSDESC_DESCRIPTION;
+	private String 	VENDOR;
+	private String 	NAME;
+	
+	private List<InvoiceLine> InvoiceLine=new ArrayList<InvoiceLine>();
+	
+	
+	public List<InvoiceLine> getInvoiceLine() {
+		return InvoiceLine;
+	}
+	public void setInvoiceLine(List<InvoiceLine> invoiceLine) {
+		InvoiceLine = invoiceLine;
+	}
+	public Long getINVOICEID() {
+		return INVOICEID;
+	}
+	public void setINVOICEID(Long iNVOICEID) {
+		INVOICEID = iNVOICEID;
+	}
+	public String getINVOICENUM() {
+		return INVOICENUM;
+	}
+	public void setINVOICENUM(String iNVOICENUM) {
+		INVOICENUM = iNVOICENUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getFCG_PAYTYPE() {
+		return FCG_PAYTYPE;
+	}
+	public void setFCG_PAYTYPE(String fCG_PAYTYPE) {
+		FCG_PAYTYPE = fCG_PAYTYPE;
+	}
+	public String getLCNO() {
+		return LCNO;
+	}
+	public void setLCNO(String lCNO) {
+		LCNO = lCNO;
+	}
+	public String getFCG_PAYCLASS() {
+		return FCG_PAYCLASS;
+	}
+	public void setFCG_PAYCLASS(String fCG_PAYCLASS) {
+		FCG_PAYCLASS = fCG_PAYCLASS;
+	}
+	public String getCOALTYPE() {
+		return COALTYPE;
+	}
+	public void setCOALTYPE(String cOALTYPE) {
+		COALTYPE = cOALTYPE;
+	}
+	public String getFCG_SHIPPERIOD() {
+		return FCG_SHIPPERIOD;
+	}
+	public void setFCG_SHIPPERIOD(String fCG_SHIPPERIOD) {
+		FCG_SHIPPERIOD = fCG_SHIPPERIOD;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getFCG_RATE() {
+		return FCG_RATE;
+	}
+	public void setFCG_RATE(String fCG_RATE) {
+		FCG_RATE = fCG_RATE;
+	}
+	public String getDESCRIPTION_LONGDESCRIPTION() {
+		return DESCRIPTION_LONGDESCRIPTION;
+	}
+	public void setDESCRIPTION_LONGDESCRIPTION(String dESCRIPTION_LONGDESCRIPTION) {
+		DESCRIPTION_LONGDESCRIPTION = dESCRIPTION_LONGDESCRIPTION;
+	}
+	public String getFCG_TOTALCOSTPLAN() {
+		return FCG_TOTALCOSTPLAN;
+	}
+	public void setFCG_TOTALCOSTPLAN(String fCG_TOTALCOSTPLAN) {
+		FCG_TOTALCOSTPLAN = fCG_TOTALCOSTPLAN;
+	}
+	public String getFCG_BJSF() {
+		return FCG_BJSF;
+	}
+	public void setFCG_BJSF(String fCG_BJSF) {
+		FCG_BJSF = fCG_BJSF;
+	}
+	public String getCOAL() {
+		return COAL;
+	}
+	public void setCOAL(String cOAL) {
+		COAL = cOAL;
+	}
+	public String getTRANSMODE() {
+		return TRANSMODE;
+	}
+	public void setTRANSMODE(String tRANSMODE) {
+		TRANSMODE = tRANSMODE;
+	}
+	public String getCONTRACTNATURE() {
+		return CONTRACTNATURE;
+	}
+	public void setCONTRACTNATURE(String cONTRACTNATURE) {
+		CONTRACTNATURE = cONTRACTNATURE;
+	}
+	public String getSTATUSDESC_DESCRIPTION() {
+		return STATUSDESC_DESCRIPTION;
+	}
+	public void setSTATUSDESC_DESCRIPTION(String sTATUSDESC_DESCRIPTION) {
+		STATUSDESC_DESCRIPTION = sTATUSDESC_DESCRIPTION;
+	}
+	public String getVENDOR() {
+		return VENDOR;
+	}
+	public void setVENDOR(String vENDOR) {
+		VENDOR = vENDOR;
+	}
+	public String getNAME() {
+		return NAME;
+	}
+	public void setNAME(String nAME) {
+		NAME = nAME;
+	}
+	
+}

src/com/tohi/common/dto/mt/InvoiceLine.java

+package com.tohi.common.dto.mt;
+
+public class InvoiceLine {
+	private String DESCRIPTION;
+	private String QTYFORUI;
+	private String INVOICEUNIT;
+	private String UNITCOST;
+	private String LINECOSTFORUI;
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getQTYFORUI() {
+		return QTYFORUI;
+	}
+	public void setQTYFORUI(String qTYFORUI) {
+		QTYFORUI = qTYFORUI;
+	}
+	public String getINVOICEUNIT() {
+		return INVOICEUNIT;
+	}
+	public void setINVOICEUNIT(String iNVOICEUNIT) {
+		INVOICEUNIT = iNVOICEUNIT;
+	}
+	public String getUNITCOST() {
+		return UNITCOST;
+	}
+	public void setUNITCOST(String uNITCOST) {
+		UNITCOST = uNITCOST;
+	}
+	public String getLINECOSTFORUI() {
+		return LINECOSTFORUI;
+	}
+	public void setLINECOSTFORUI(String lINECOSTFORUI) {
+		LINECOSTFORUI = lINECOSTFORUI;
+	}
+	
+}

src/com/tohi/common/dto/mt/Po.java

+package com.tohi.common.dto.mt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Po {
+	private Long POID;
+	private String PONUM;
+	private String 	DESCRIPTION;
+	private String 	CUSTSHIP;
+	private String CUSTUSD;
+	private String 	FCG_HTBH;
+	private String PURCHASEAGENT;
+	private String CONTRACTREFNUM;
+	private String TOTALCOST;
+	private String VENDOR;
+	private String NAME;
+	
+	List<Poline> polineList=new ArrayList<Poline>();
+	
+	public List<Poline> getPolineList() {
+		return polineList;
+	}
+	public void setPolineList(List<Poline> polineList) {
+		this.polineList = polineList;
+	}
+	public Long getPOID() {
+		return POID;
+	}
+	public void setPOID(Long pOID) {
+		POID = pOID;
+	}
+	public String getPONUM() {
+		return PONUM;
+	}
+	public void setPONUM(String pONUM) {
+		PONUM = pONUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getCUSTSHIP() {
+		return CUSTSHIP;
+	}
+	public void setCUSTSHIP(String cUSTSHIP) {
+		CUSTSHIP = cUSTSHIP;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getFCG_HTBH() {
+		return FCG_HTBH;
+	}
+	public void setFCG_HTBH(String fCG_HTBH) {
+		FCG_HTBH = fCG_HTBH;
+	}
+	public String getPURCHASEAGENT() {
+		return PURCHASEAGENT;
+	}
+	public void setPURCHASEAGENT(String pURCHASEAGENT) {
+		PURCHASEAGENT = pURCHASEAGENT;
+	}
+	public String getCONTRACTREFNUM() {
+		return CONTRACTREFNUM;
+	}
+	public void setCONTRACTREFNUM(String cONTRACTREFNUM) {
+		CONTRACTREFNUM = cONTRACTREFNUM;
+	}
+	public String getTOTALCOST() {
+		return TOTALCOST;
+	}
+	public void setTOTALCOST(String tOTALCOST) {
+		TOTALCOST = tOTALCOST;
+	}
+	public String getVENDOR() {
+		return VENDOR;
+	}
+	public void setVENDOR(String vENDOR) {
+		VENDOR = vENDOR;
+	}
+	public String getNAME() {
+		return NAME;
+	}
+	public void setNAME(String nAME) {
+		NAME = nAME;
+	}
+	
+}

src/com/tohi/common/dto/mt/Poline.java

+package com.tohi.common.dto.mt;
+
+public class Poline {
+	private String DESCRIPTION;
+	private String ORDERQTY;
+	private String ORDERUNIT;
+	private String CUSTUSD;
+	private String PLIN1;
+	private String TAX1CODE;
+	private String UNITCOST;
+	private String LINECOST;
+	private String TAX1;
+	private String ENTERBY;
+	private String ENTERDATE;
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getORDERQTY() {
+		return ORDERQTY;
+	}
+	public void setORDERQTY(String oRDERQTY) {
+		ORDERQTY = oRDERQTY;
+	}
+	public String getORDERUNIT() {
+		return ORDERUNIT;
+	}
+	public void setORDERUNIT(String oRDERUNIT) {
+		ORDERUNIT = oRDERUNIT;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getPLIN1() {
+		return PLIN1;
+	}
+	public void setPLIN1(String pLIN1) {
+		PLIN1 = pLIN1;
+	}
+	public String getTAX1CODE() {
+		return TAX1CODE;
+	}
+	public void setTAX1CODE(String tAX1CODE) {
+		TAX1CODE = tAX1CODE;
+	}
+	public String getUNITCOST() {
+		return UNITCOST;
+	}
+	public void setUNITCOST(String uNITCOST) {
+		UNITCOST = uNITCOST;
+	}
+	public String getLINECOST() {
+		return LINECOST;
+	}
+	public void setLINECOST(String lINECOST) {
+		LINECOST = lINECOST;
+	}
+	public String getTAX1() {
+		return TAX1;
+	}
+	public void setTAX1(String tAX1) {
+		TAX1 = tAX1;
+	}
+	public String getENTERBY() {
+		return ENTERBY;
+	}
+	public void setENTERBY(String eNTERBY) {
+		ENTERBY = eNTERBY;
+	}
+	public String getENTERDATE() {
+		return ENTERDATE;
+	}
+	public void setENTERDATE(String eNTERDATE) {
+		ENTERDATE = eNTERDATE;
+	}
+	
+	
+
+}

src/com/tohi/common/dto/mt/Pr.java

+package com.tohi.common.dto.mt;
+
+import java.util.*;
+ 
+
+public class Pr {
+
+	private Long PRID ;
+	private String PRNUM ;
+	private String DESCRIPTION ;
+	private String CUSTTYPE ;
+	private String FCG_SQLY ;
+	private String REQUESTEDBY ;
+	private String DISPLAYNAME ;
+	private String FCG_GJDH ;
+	private String FCG_MEMO ;
+	private String FCG_YGJE ;
+	private String FCG_PURCHASEMODE ;
+	private String FCG_SWJBR ;
+	
+	private List<PrLine> prLineList=new ArrayList<>();
+	
+	
+	public List<PrLine> getPrLineList() {
+		return prLineList;
+	}
+	public void setPrLineList(List<PrLine> prLineList) {
+		this.prLineList = prLineList;
+	}
+	public Long getPRID() {
+		return PRID;
+	}
+	public void setPRID(Long pRID) {
+		PRID = pRID;
+	}
+	public String getPRNUM() {
+		return PRNUM;
+	}
+	public void setPRNUM(String pRNUM) {
+		PRNUM = pRNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getCUSTTYPE() {
+		return CUSTTYPE;
+	}
+	public void setCUSTTYPE(String cUSTTYPE) {
+		CUSTTYPE = cUSTTYPE;
+	}
+	public String getFCG_SQLY() {
+		return FCG_SQLY;
+	}
+	public void setFCG_SQLY(String fCG_SQLY) {
+		FCG_SQLY = fCG_SQLY;
+	}
+	public String getREQUESTEDBY() {
+		return REQUESTEDBY;
+	}
+	public void setREQUESTEDBY(String rEQUESTEDBY) {
+		REQUESTEDBY = rEQUESTEDBY;
+	}
+	public String getDISPLAYNAME() {
+		return DISPLAYNAME;
+	}
+	public void setDISPLAYNAME(String dISPLAYNAME) {
+		DISPLAYNAME = dISPLAYNAME;
+	}
+	public String getFCG_GJDH() {
+		return FCG_GJDH;
+	}
+	public void setFCG_GJDH(String fCG_GJDH) {
+		FCG_GJDH = fCG_GJDH;
+	}
+	public String getFCG_MEMO() {
+		return FCG_MEMO;
+	}
+	public void setFCG_MEMO(String fCG_MEMO) {
+		FCG_MEMO = fCG_MEMO;
+	}
+	public String getFCG_YGJE() {
+		return FCG_YGJE;
+	}
+	public void setFCG_YGJE(String fCG_YGJE) {
+		FCG_YGJE = fCG_YGJE;
+	}
+	public String getFCG_PURCHASEMODE() {
+		return FCG_PURCHASEMODE;
+	}
+	public void setFCG_PURCHASEMODE(String fCG_PURCHASEMODE) {
+		FCG_PURCHASEMODE = fCG_PURCHASEMODE;
+	}
+	public String getFCG_SWJBR() {
+		return FCG_SWJBR;
+	}
+	public void setFCG_SWJBR(String fCG_SWJBR) {
+		FCG_SWJBR = fCG_SWJBR;
+	}
+	
+	
+
+}

src/com/tohi/common/dto/mt/PrLine.java

+package com.tohi.common.dto.mt;
+
+public class PrLine {
+	private String ITEMNUM;
+	private String DESCRIPTION;
+	private String JSSX;
+	private String CUSTUSD;
+	private String ORDERQTY;
+	private String ORDERUNIT;
+	private String UNITCOST;
+	private String LINECOST;
+	
+	public String getITEMNUM() {
+		return ITEMNUM;
+	}
+	public void setITEMNUM(String iTEMNUM) {
+		ITEMNUM = iTEMNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getJSSX() {
+		return JSSX;
+	}
+	public void setJSSX(String jSSX) {
+		JSSX = jSSX;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getORDERQTY() {
+		return ORDERQTY;
+	}
+	public void setORDERQTY(String oRDERQTY) {
+		ORDERQTY = oRDERQTY;
+	}
+	public String getORDERUNIT() {
+		return ORDERUNIT;
+	}
+	public void setORDERUNIT(String oRDERUNIT) {
+		ORDERUNIT = oRDERUNIT;
+	}
+	public String getUNITCOST() {
+		return UNITCOST;
+	}
+	public void setUNITCOST(String uNITCOST) {
+		UNITCOST = uNITCOST;
+	}
+	public String getLINECOST() {
+		return LINECOST;
+	}
+	public void setLINECOST(String lINECOST) {
+		LINECOST = lINECOST;
+	}
+	
+
+}

src/com/tohi/common/dto/mt/Rfq.java

+package com.tohi.common.dto.mt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Rfq {
+	private Long RFQID;
+	private String RFQNUM;
+	private String DESCRIPTION;
+	private String STATUS;
+	private String REQUIREDDATE;
+	private String FCG_MEMO;
+	private String SHIPTOATTN;
+	private String DISPLAYNAME;
+	private String FCG_PURCHASEMODE;
+	private String FCG_REASON;
+	private String FCG_ZHAOBIAODATE;
+	private String FCG_ZHAOBIAODATE2;
+	private String FCG_JIEBIAODATE;
+	private String FCG_JIEBIAODATE2;
+	private String FCG_DINGBIAODATE;
+	private String FCG_DINGBIAODATE2;
+	
+	
+	List<RfqFCG_RFQ_EXT_LINE> RfqFCG_RFQ_EXT_LINEList=new ArrayList<RfqFCG_RFQ_EXT_LINE>();//合同推荐书
+	List<RfqLine> RfqLineList=new ArrayList<RfqLine>();//询价单行
+	List<RfqVENDOR> RfqVENDORList=new ArrayList<RfqVENDOR>();//推荐供应商信息
+	
+	
+	public List<RfqFCG_RFQ_EXT_LINE> getRfqFCG_RFQ_EXT_LINEList() {
+		return RfqFCG_RFQ_EXT_LINEList;
+	}
+	public void setRfqFCG_RFQ_EXT_LINEList(
+			List<RfqFCG_RFQ_EXT_LINE> rfqFCG_RFQ_EXT_LINEList) {
+		RfqFCG_RFQ_EXT_LINEList = rfqFCG_RFQ_EXT_LINEList;
+	}
+	public List<RfqLine> getRfqLineList() {
+		return RfqLineList;
+	}
+	public void setRfqLineList(List<RfqLine> rfqLineList) {
+		RfqLineList = rfqLineList;
+	}
+	public List<RfqVENDOR> getRfqVENDORList() {
+		return RfqVENDORList;
+	}
+	public void setRfqVENDORList(List<RfqVENDOR> rfqVENDORList) {
+		RfqVENDORList = rfqVENDORList;
+	}
+	public Long getRFQID() {
+		return RFQID;
+	}
+	public void setRFQID(Long rFQID) {
+		RFQID = rFQID;
+	}
+	public String getRFQNUM() {
+		return RFQNUM;
+	}
+	public void setRFQNUM(String rFQNUM) {
+		RFQNUM = rFQNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getSTATUS() {
+		return STATUS;
+	}
+	public void setSTATUS(String sTATUS) {
+		STATUS = sTATUS;
+	}
+	public String getREQUIREDDATE() {
+		return REQUIREDDATE;
+	}
+	public void setREQUIREDDATE(String rEQUIREDDATE) {
+		REQUIREDDATE = rEQUIREDDATE;
+	}
+	public String getFCG_MEMO() {
+		return FCG_MEMO;
+	}
+	public void setFCG_MEMO(String fCG_MEMO) {
+		FCG_MEMO = fCG_MEMO;
+	}
+	public String getSHIPTOATTN() {
+		return SHIPTOATTN;
+	}
+	public void setSHIPTOATTN(String sHIPTOATTN) {
+		SHIPTOATTN = sHIPTOATTN;
+	}
+	public String getDISPLAYNAME() {
+		return DISPLAYNAME;
+	}
+	public void setDISPLAYNAME(String dISPLAYNAME) {
+		DISPLAYNAME = dISPLAYNAME;
+	}
+	public String getFCG_PURCHASEMODE() {
+		return FCG_PURCHASEMODE;
+	}
+	public void setFCG_PURCHASEMODE(String fCG_PURCHASEMODE) {
+		FCG_PURCHASEMODE = fCG_PURCHASEMODE;
+	}
+	public String getFCG_REASON() {
+		return FCG_REASON;
+	}
+	public void setFCG_REASON(String fCG_REASON) {
+		FCG_REASON = fCG_REASON;
+	}
+	public String getFCG_ZHAOBIAODATE() {
+		return FCG_ZHAOBIAODATE;
+	}
+	public void setFCG_ZHAOBIAODATE(String fCG_ZHAOBIAODATE) {
+		FCG_ZHAOBIAODATE = fCG_ZHAOBIAODATE;
+	}
+	public String getFCG_ZHAOBIAODATE2() {
+		return FCG_ZHAOBIAODATE2;
+	}
+	public void setFCG_ZHAOBIAODATE2(String fCG_ZHAOBIAODATE2) {
+		FCG_ZHAOBIAODATE2 = fCG_ZHAOBIAODATE2;
+	}
+	public String getFCG_JIEBIAODATE() {
+		return FCG_JIEBIAODATE;
+	}
+	public void setFCG_JIEBIAODATE(String fCG_JIEBIAODATE) {
+		FCG_JIEBIAODATE = fCG_JIEBIAODATE;
+	}
+	public String getFCG_JIEBIAODATE2() {
+		return FCG_JIEBIAODATE2;
+	}
+	public void setFCG_JIEBIAODATE2(String fCG_JIEBIAODATE2) {
+		FCG_JIEBIAODATE2 = fCG_JIEBIAODATE2;
+	}
+	public String getFCG_DINGBIAODATE() {
+		return FCG_DINGBIAODATE;
+	}
+	public void setFCG_DINGBIAODATE(String fCG_DINGBIAODATE) {
+		FCG_DINGBIAODATE = fCG_DINGBIAODATE;
+	}
+	public String getFCG_DINGBIAODATE2() {
+		return FCG_DINGBIAODATE2;
+	}
+	public void setFCG_DINGBIAODATE2(String fCG_DINGBIAODATE2) {
+		FCG_DINGBIAODATE2 = fCG_DINGBIAODATE2;
+	}
+		
+}

src/com/tohi/common/dto/mt/RfqFCG_RFQ_EXT_LINE.java

+package com.tohi.common.dto.mt;
+
+public class RfqFCG_RFQ_EXT_LINE {
+	private String FCG_TJ_YJ;
+	private String FCG_TJ_TJGYS;
+	private String NAME;
+	private String FCG_DHRQ;
+	private String FCG_TJ_CNJE;
+	private String FCG_TJ_HTJ;
+	public String getFCG_TJ_YJ() {
+		return FCG_TJ_YJ;
+	}
+	public void setFCG_TJ_YJ(String fCG_TJ_YJ) {
+		FCG_TJ_YJ = fCG_TJ_YJ;
+	}
+	public String getFCG_TJ_TJGYS() {
+		return FCG_TJ_TJGYS;
+	}
+	public void setFCG_TJ_TJGYS(String fCG_TJ_TJGYS) {
+		FCG_TJ_TJGYS = fCG_TJ_TJGYS;
+	}
+	public String getNAME() {
+		return NAME;
+	}
+	public void setNAME(String nAME) {
+		NAME = nAME;
+	}
+	public String getFCG_DHRQ() {
+		return FCG_DHRQ;
+	}
+	public void setFCG_DHRQ(String fCG_DHRQ) {
+		FCG_DHRQ = fCG_DHRQ;
+	}
+	public String getFCG_TJ_CNJE() {
+		return FCG_TJ_CNJE;
+	}
+	public void setFCG_TJ_CNJE(String fCG_TJ_CNJE) {
+		FCG_TJ_CNJE = fCG_TJ_CNJE;
+	}
+	public String getFCG_TJ_HTJ() {
+		return FCG_TJ_HTJ;
+	}
+	public void setFCG_TJ_HTJ(String fCG_TJ_HTJ) {
+		FCG_TJ_HTJ = fCG_TJ_HTJ;
+	}
+	
+}

src/com/tohi/common/dto/mt/RfqLine.java

+package com.tohi.common.dto.mt;
+
+public class RfqLine {
+	private String ITEMNUM;
+	private String 	DESCRIPTION;
+	private String 	JSSX;
+	private String CUSTUSD;
+	private String ORDERQTY;
+	private String ORDERUNIT;
+	public String getITEMNUM() {
+		return ITEMNUM;
+	}
+	public void setITEMNUM(String iTEMNUM) {
+		ITEMNUM = iTEMNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getJSSX() {
+		return JSSX;
+	}
+	public void setJSSX(String jSSX) {
+		JSSX = jSSX;
+	}
+	public String getCUSTUSD() {
+		return CUSTUSD;
+	}
+	public void setCUSTUSD(String cUSTUSD) {
+		CUSTUSD = cUSTUSD;
+	}
+	public String getORDERQTY() {
+		return ORDERQTY;
+	}
+	public void setORDERQTY(String oRDERQTY) {
+		ORDERQTY = oRDERQTY;
+	}
+	public String getORDERUNIT() {
+		return ORDERUNIT;
+	}
+	public void setORDERUNIT(String oRDERUNIT) {
+		ORDERUNIT = oRDERUNIT;
+	}
+	
+}

src/com/tohi/common/dto/mt/RfqQuotationlinevendor.java

+package com.tohi.common.dto.mt;
+
+public class RfqQuotationlinevendor {
+	private String RFQLINENUM;
+	private String ITEMNUM;
+	private String DESCRIPTION;
+	private String ORDERQTY;
+	private String ORDERUNIT;
+	private String QUNITCOST;
+	private String 	QL5;
+	private String TAX1CODE;
+	private String UNITCOST;
+	private String FCG_ZQFL;
+	private String ISAWARDED;
+	public String getRFQLINENUM() {
+		return RFQLINENUM;
+	}
+	public void setRFQLINENUM(String rFQLINENUM) {
+		RFQLINENUM = rFQLINENUM;
+	}
+	public String getITEMNUM() {
+		return ITEMNUM;
+	}
+	public void setITEMNUM(String iTEMNUM) {
+		ITEMNUM = iTEMNUM;
+	}
+	public String getDESCRIPTION() {
+		return DESCRIPTION;
+	}
+	public void setDESCRIPTION(String dESCRIPTION) {
+		DESCRIPTION = dESCRIPTION;
+	}
+	public String getORDERQTY() {
+		return ORDERQTY;
+	}
+	public void setORDERQTY(String oRDERQTY) {
+		ORDERQTY = oRDERQTY;
+	}
+	public String getORDERUNIT() {
+		return ORDERUNIT;
+	}
+	public void setORDERUNIT(String oRDERUNIT) {
+		ORDERUNIT = oRDERUNIT;
+	}
+	public String getQUNITCOST() {
+		return QUNITCOST;
+	}
+	public void setQUNITCOST(String qUNITCOST) {
+		QUNITCOST = qUNITCOST;
+	}
+	public String getQL5() {
+		return QL5;
+	}
+	public void setQL5(String qL5) {
+		QL5 = qL5;
+	}
+	public String getTAX1CODE() {
+		return TAX1CODE;
+	}
+	public void setTAX1CODE(String tAX1CODE) {
+		TAX1CODE = tAX1CODE;
+	}
+	public String getUNITCOST() {
+		return UNITCOST;
+	}
+	public void setUNITCOST(String uNITCOST) {
+		UNITCOST = uNITCOST;
+	}
+	public String getFCG_ZQFL() {
+		return FCG_ZQFL;
+	}
+	public void setFCG_ZQFL(String fCG_ZQFL) {
+		FCG_ZQFL = fCG_ZQFL;
+	}
+	public String getISAWARDED() {
+		return ISAWARDED;
+	}
+	public void setISAWARDED(String iSAWARDED) {
+		ISAWARDED = iSAWARDED;
+	}
+	
+}

src/com/tohi/common/dto/mt/RfqVENDOR.java

+package com.tohi.common.dto.mt;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RfqVENDOR {
+	private String VENDOR;
+	private String NAME;
+	
+	List<RfqQuotationlinevendor> RfqQuotationlinevendorList=new ArrayList<RfqQuotationlinevendor>();
+	
+	public List<RfqQuotationlinevendor> getRfqQuotationlinevendorList() {
+		return RfqQuotationlinevendorList;
+	}
+	public void setRfqQuotationlinevendorList(
+			List<RfqQuotationlinevendor> rfqQuotationlinevendorList) {
+		RfqQuotationlinevendorList = rfqQuotationlinevendorList;
+	}
+	//QUOTATIONLINEVENDOR 
+	public String getVENDOR() {
+		return VENDOR;
+	}
+	public void setVENDOR(String vENDOR) {
+		VENDOR = vENDOR;
+	}
+	public String getNAME() {
+		return NAME;
+	}
+	public void setNAME(String nAME) {
+		NAME = nAME;
+	}
+	
+}

src/com/tohi/security/SSOValidate.java

+package com.tohi.security;
+import java.util.Hashtable;
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import psdi.util.MXAccessException;
+
+/**
+ * 域验证
+ * @author ocean
+ *
+ */
+public class SSOValidate {
+	private String serverHost = "";
+	private String domain = "";
+	private String port = "";
+	
+	public static final String ACTIVE_DIRECTORY= "AD";
+
+	private static SSOValidate ssoValidate= null;
+	
+	private SSOValidate() {
+	}
+	
+	public static SSOValidate getInstance(){ 
+		if(ssoValidate==null) {
+			synchronized(SSOValidate.class) {
+				if(ssoValidate==null) {
+					ssoValidate = new SSOValidate();
+				}
+			}
+		}
+		return ssoValidate;
+	}
+	
+    public SSOValidate setADParams(String serverHost,String domain) {
+    	this.serverHost= serverHost;
+    	this.domain = domain;
+    	return this;
+    }
+    
+    public SSOValidate setADParams(String serverHost,String domain,String port) {
+    	this.serverHost= serverHost;
+    	this.domain = domain;
+    	this.port=port;
+    	return this;
+    }
+	
+    public boolean verifySSO(String userName,String passWord,String ssoType) throws Exception{
+    	if(ACTIVE_DIRECTORY.equals(ssoType))
+    		return verifyAdDoMain(userName,passWord);
+    	//其他支持待扩展
+    	return verifyAdDoMain(userName,passWord);
+    }
+	
+	
+	private boolean verifyAdDoMain(String userName, String passWord) throws Exception {
+		boolean checkAdUserPwdResult = false;
+		if (!serverHost.equals("") && !domain.equals("")) {
+//			String url = new String("ldap://" + this.serverHost + ":" + this.port);
+			String url = new String("ldap://" + this.serverHost );
+			String user = userName.indexOf(domain) > 0 ? userName : userName + this.domain;
+			Hashtable<String, String> env = new Hashtable<String, String>();
+			DirContext ctx = null;
+			env.put(Context.SECURITY_AUTHENTICATION, "simple");// LDAP域访问安全级别(none,simple,strong)simple:一般模式
+			env.put(Context.SECURITY_PRINCIPAL, user);
+			env.put(Context.SECURITY_CREDENTIALS, passWord);
+			env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory");// LDAP工厂类
+			env.put(Context.PROVIDER_URL, url);
+			try {
+				ctx = new InitialDirContext(env);// 初始化上下文
+				checkAdUserPwdResult = true;
+			} catch (Exception e) {
+				e.printStackTrace();
+				throw new MXAccessException("access", "域用户或密码验证失败!");
+			} finally {
+				if (null != ctx) {
+					try {
+						ctx.close();
+						ctx = null;
+					} catch (Exception e) {
+						e.printStackTrace();
+					}
+				}
+			}
+		}
+		return checkAdUserPwdResult;
+	}
+}
+

src/com/tohi/security/UDSecurityService.java

+package com.tohi.security;
+
+import java.rmi.RemoteException;
+import java.util.Hashtable;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import javax.naming.AuthenticationException;
+import javax.naming.Context;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.InitialDirContext;
+import com.amazonaws.util.Base64;
+import psdi.mbo.MboRemote;
+import psdi.mbo.MboSetRemote;
+import psdi.mbo.SqlFormat;
+import psdi.security.SecurityService;
+import psdi.security.SecurityServiceRemote;
+import psdi.security.UserInfo;
+import psdi.server.MXServer;
+import psdi.server.Service;
+import psdi.util.MXAccessException;
+import psdi.util.MXException;
+import psdi.util.MaxType;
+import psdi.util.logging.MXLogger;
+import psdi.util.logging.MXLoggerFactory;
+public class UDSecurityService extends SecurityService implements Service, SecurityServiceRemote {
+
+	private boolean adLogin = false;
+	private String serverHost;
+	private String domain;
+	private String port = "389";
+	
+	public UDSecurityService(MXServer mxServer) throws RemoteException {
+		super(mxServer);
+		if(MXServer.getMXServer().getProperty("ssoconfig.serverhost")!=null) {
+    		serverHost= MXServer.getMXServer().getProperty("ssoconfig.serverhost");
+    	}
+    	if(MXServer.getMXServer().getProperty("ssoconfig.domain")!=null) {
+    		domain= MXServer.getMXServer().getProperty("ssoconfig.domain");
+    	}
+    	if(MXServer.getMXServer().getProperty("ssoconfig.port")!=null) {
+    		port= MXServer.getMXServer().getProperty("ssoconfig.port");
+    	}
+	}
+	
+	 public UserInfo authenticateUserM(String[] loginID, String password, Locale locale, TimeZone timeZone, String siteId, String clientHostAddr) throws MXException, RemoteException {	
+		 //checkAdUser((String)null, loginID[0]);
+		 return super.authenticateUserM(loginID, password, locale, timeZone, siteId, clientHostAddr);
+	 }
+
+
+	 /**
+	  * todo:预留方法（Maximo用户与域名不一样情况时处理方法）
+	  * @param userId
+	  * @param loginID
+	  * @return
+	  * @throws RemoteException
+	  * @throws MXException
+	  */
+		public boolean checkAdUser(String userId, String loginID) throws RemoteException, MXException {
+	        boolean checkAdResult =false;
+	        return checkAdResult;
+		}
+	    
+	    @Override
+		protected void verifyUser(String userName, String enteredPassword, MboRemote userMbo) throws Exception {
+	    	if (!userName.equals(userMbo.getString("userid"))) {
+	            throw new MXAccessException("access", "invaliduser");
+	        } else {
+		            byte[] storedPassword = userMbo.getBytes("password");
+		            MaxType storedMT = MaxType.createMaxType((Locale)null, (TimeZone)null, 16);
+		            storedMT.setValue(storedPassword);
+		            byte[] enteredPasswordBytes = this.getMXCipherX().encData(enteredPassword);
+		            MaxType enteredMT = MaxType.createMaxType((Locale)null, (TimeZone)null, 16);
+		            enteredMT.setValue(enteredPasswordBytes);
+		            if (!storedMT.equals(enteredMT)) {	
+		            if(MXServer.getMXServer().getProperty("ssoconfig.type")!=null) {
+		            		String ssoType = MXServer.getMXServer().getProperty("ssoconfig.type");
+		            		if(!SSOValidate
+			            		.getInstance()
+			            		.setADParams(this.serverHost, this.domain, this.port)
+			            		.verifySSO(userName, enteredPassword, ssoType))
+		            		{
+		            			throw new MXAccessException("access", "invaliduser");
+		            		}	
+		            	}else {
+		            		throw new MXAccessException("access", "invaliduser");
+		            	}
+		            }
+	        	}
+	    }
+	    
+		@Override
+		public boolean isUser(UserInfo userinfo, String loginCheck, String passCheck) throws RemoteException, MXException {
+			boolean userIsGood = true;
+			userIsGood = super.isUser(userinfo, loginCheck, passCheck);
+			if(!userIsGood) {
+				//1本地校验不通过，则进行域验证
+	        	try {
+	        		if(MXServer.getMXServer().getProperty("ssoconfig.type")!=null) {
+	            		String ssoType = MXServer.getMXServer().getProperty("ssoconfig.type");
+	            		if(!SSOValidate
+			            		.getInstance()
+			            		.setADParams(this.serverHost, this.domain, this.port)
+			            		.verifySSO(loginCheck, loginCheck, ssoType))
+		            		{
+	            				userIsGood =false;
+		            		}		
+	            	}
+	        	
+				} catch (Exception e) {
+					userIsGood =false;
+					e.printStackTrace();
+				}
+			}
+			return userIsGood;
+		}
+	    
+
+	    
+	
+	    
+}

src/com/tohi/webclient/beans/finexpense/FinexpenseAppBean.java

+package com.tohi.webclient.beans.finexpense;
+
+import java.rmi.RemoteException;
+
+import psdi.util.MXException;
+import psdi.webclient.system.beans.AppBean;
+import psdi.webclient.system.beans.ResultsBean;
+
+public class FinexpenseAppBean extends AppBean{
+
+	public void initializeApp() throws MXException, RemoteException {
+		super.initializeApp();
+	}
+	
+	
+	public int DOWNLOADFILE() throws MXException, RemoteException {
+		app.openURL("http://172.17.16.22:7001/FINEXPENSE/Ԥģ.xls", true);
+		return 1;
+	}
+}

src/com/tohi/webclient/beans/finexpense/UploadBGExcelBean.java

+package com.tohi.webclient.beans.finexpense;
+
+import java.io.File;
+import java.io.IOException;
+import java.rmi.RemoteException;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.TimeZone;
+
+import jxl.CellType;
+import jxl.DateCell;
+import jxl.Sheet;
+import jxl.Workbook;
+import jxl.WorkbookSettings;
+import jxl.read.biff.BiffException;
+import psdi.mbo.MboRemote;
+import psdi.mbo.MboSetRemote;
+import psdi.server.MXServer;
+import psdi.util.MXApplicationException;
+import psdi.util.MXException;
+import psdi.webclient.system.beans.DataBean;
+import psdi.webclient.system.controller.UploadFile;
+import psdi.webclient.system.controller.Utility;
+import psdi.webclient.system.controller.WebClientEvent;
+/**
+ * 费用预算变更批量导入
+ */
+public class UploadBGExcelBean extends DataBean {
+	String UpLoadType;
+	String dirName;
+	int row;
+
+	public UploadBGExcelBean() {
+		this.UpLoadType = "CLP-FCG";
+		this.row = 0;
+		this.dirName = "D:\\UpLoadXLS\\FINEXPENSE";
+	}
+
+	public synchronized int execute() throws MXException, RemoteException {
+		DataBean appBean = Utility.getDataSource(this.sessionContext, this.app.getAppHandler());
+		WebClientEvent event = this.sessionContext.getCurrentEvent();
+		UploadFile df = (UploadFile) this.app.get("doclinkfile");
+		if (df == null) {
+			Utility.showMessageBox(event, "uploadxls", "checkerror", null);
+			this.app.getAppBean().save();
+			return 1;
+		}
+		try {
+			String filename = df.getFileName();
+			String subfilename = filename.substring(filename.indexOf(".") + 1);
+			if (!subfilename.equalsIgnoreCase("XLS")) {
+				Utility.showMessageBox(event, "uploadxls", "checkerror", null);
+				this.app.remove("doclinkfile");
+				return 1;
+			}
+			df.setDirectoryName(this.dirName);
+			df.writeToDisk();
+			String fileNameInServer = df.getFileName();
+			df.save();
+			//上述保存至磁盘中
+			WorkbookSettings ws = new WorkbookSettings();
+			// 去除wookbook的读取excel时数据的有效性
+			ws.setCellValidationDisabled(true);
+			
+			String url=this.dirName + "\\" + fileNameInServer;
+			System.out.println(url+"-------------------");
+			Workbook workbook = Workbook.getWorkbook(new File(url), ws);
+			Sheet sheet = workbook.getSheet(0);
+			int maxrow = sheet.getRows();
+			System.out.println("最大行数为:"+maxrow);
+			if (maxrow<=0) {
+				return 1;
+			}
+			//获取供应商询价行集合
+			System.out.println("获取集合");
+			MboSetRemote FINEXPENSELINESet = MXServer.getMXServer().getMboSet("FINEXPENSELINE",
+					MXServer.getMXServer().getSystemUserInfo());
+			System.out.println("集合中数据长度为:"+FINEXPENSELINESet.count());
+//			long maxID = 0;
+			System.out.println("遍历数据");
+			//遍历所有数据 
+			String lineId="";
+			MboRemote wo =null;
+			for (this.row = 1; this.row < maxrow; this.row++) {
+				if (sheet.getCell(0, this.row).getContents().equals("") ) {
+					System.out.println("进入IF");
+					break;
+				}  
+				String altercost=sheet.getCell(3, row).getContents();
+				System.out.println("altercost---"+altercost);
+				if (!lineId.equals(sheet.getCell(1, row).getContents())) {
+					FINEXPENSELINESet.setWhere("FINEXPENSELINEID='"+sheet.getCell(2, row).getContents()+"'");
+					if (!FINEXPENSELINESet.isEmpty()) {
+						wo = FINEXPENSELINESet.getMbo(0);
+						wo.setValue("ALTERCOST",wo.getDouble("ALTERCOST") + Double.parseDouble(altercost)  , 11L);
+						wo.setValue("ACTUALCOST",wo.getDouble("ALTERCOST") +wo.getDouble("BUDGETCOST") );
+						wo.setValue("NETCOST",wo.getDouble("ACTUALCOST") - wo.getDouble("PROJECTCOST") );
+						System.out.println("ALTERCOST"+wo.getDouble("ALTERCOST"));
+					} 
+				 } 
+				FINEXPENSELINESet.save();
+			}
+			System.out.println("导入完毕!!!");
+			FINEXPENSELINESet.save();
+			FINEXPENSELINESet.close();
+			workbook.close();
+			this.app.getAppBean().save();
+		} catch (MXException e) {
+			Utility.showMessageBox(event, "费用预算变更导入错误", e.getMessage() + " 行--" + this.row, null);
+		} catch (BiffException e) {
+			e.printStackTrace();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}  
+		this.app.remove("doclinkfile");
+		return 1;
+	}
+	
+
+
+	private Date formatStr2Date(String str) throws ParseException {
+		if (str == null || str.trim().equals(""))
+			return null;
+		String par = "yyyy-MM-dd hh:mm:ss";
+		SimpleDateFormat sdf = new SimpleDateFormat(par);
+		Date date = sdf.parse(str);
+		return date;
+	}
+}

src/com/tohi/webclient/beans/finexpense/UploadExcelBean.java

@@ -26,7 +26,6 @@ import psdi.webclient.system.controller.UploadFile;
 import psdi.webclient.system.controller.Utility;
 import psdi.webclient.system.controller.WebClientEvent;
 /**
- * 采购预算批量导入
  *  
  *
  */

src/com/tohi/webclient/beans/invoice/InvoiceClassAppBean.java

@@ -8,6 +8,7 @@ import com.ibm.tivoli.maximo.report.birt.admin.ReportAdminServiceRemote;
 import psdi.mbo.MboRemote;
 import psdi.mbo.MboSetRemote;
 import psdi.server.MXServer;
+import psdi.util.MXApplicationException;
 import psdi.util.MXException;
 import psdi.webclient.beans.invoice.InvoiceAppBean;
 import psdi.webclient.system.controller.WebClientEvent;
@@ -69,6 +70,22 @@ public class InvoiceClassAppBean extends InvoiceAppBean{
 		}
 		return super.RUNAREPORT();
 	}
+
+	@Override
+	public int ROUTEWF() throws MXException, RemoteException {
+		
+		double num = getMbo().getDouble("FCG_BJSF")+getMbo().getDouble("FCG_LJSQJE");
+		double num1=getMbo().getDouble("PO.PURCHVIEW.CUSTMAXVOL");
+		System.out.println(num +"FldFcgBJSF-----"+num1);
+		if (num1!=0) {
+			if(num>num1) {
+				  throw new MXApplicationException("\n提示:", "\n 累计支付申请金额+本次申请付款金额不能大于关联合同最大含税金额!");
+			 }
+		}
+		return super.ROUTEWF();
+	}
+	
+	
 	
 	
 	

src/com/tohi/webclient/beans/rfq/UploadExcelBean.java

@@ -130,19 +130,23 @@ public class UploadExcelBean extends DataBean {
 				String QL5=sheet.getCell(10, row).getContents();
 				wo.setValue("QL5", QUNITCOST, 2L);  
 
+				System.out.println(wo.getDouble("UNITCOST"));
 				double LINECOST=Double.parseDouble(QL5)/(1+(Double.parseDouble(TAX1CODE)*0.01));// 含税单价
 				System.out.println("含税总价==========="+LINECOST);
+
+				System.out.println("UNITCOST-----"+wo.getDouble("UNITCOST")); 
 				wo.setValue("LINECOST",LINECOST, 2L);   
+				System.out.println("UNITCOST111111-----"+wo.getDouble("UNITCOST")); 
 				wo.setValue("MEMO", sheet.getCell(11, row).getContents(), 2L);   
 				wo.setValue("RFQLINENUM", sheet.getCell(12, row).getContents(), 2L);  
-				wo.setValue("TAX2", 0, 11L);    
-				wo.setValue("TAX3", 0, 11L);    
-				wo.setValue("TAX4", 0, 11L);    
-				wo.setValue("TAX5", 0, 11L);     
-				wo.setValue("GLCREDITACCT","9999-#-#", 2L);    
-				wo.setValue("ITEMSETID","FCGITEM", 2L);
-				wo.setValue("COMMODITYGROUP", COMMODITYGROUP, 2L);     
-				System.out.println(COMMODITYGROUP+"------------------------");
+//				wo.setValue("TAX2", 0, 11L);    
+//				wo.setValue("TAX3", 0, 11L);    
+//				wo.setValue("TAX4", 0, 11L);    
+//				wo.setValue("TAX5", 0, 11L);     
+//				wo.setValue("GLCREDITACCT","9999-#-#", 2L);    
+//				wo.setValue("ITEMSETID","FCGITEM", 2L);
+//				wo.setValue("COMMODITYGROUP", COMMODITYGROUP, 2L);     
+
 			}
 			System.out.println("导入完毕!!!");
 			QUOTATIONLINESet.save();

src/com/tohi/webclient/beans/stock/StockAppBean.java

@@ -24,7 +24,7 @@ public class StockAppBean extends AppBean {
 		if (!status.equalsIgnoreCase("WAPPR")) {
 			throw new MXApplicationException("", "当前状态不允许更改状态为盘点中！");
 		}
-		if(mainmbo.getMboSet("STOCKTAKINGLINE1").isEmpty())
+		if(mainmbo.getMboSet("STOCKTAKINGLINE").isEmpty())
 			throw new MXApplicationException("", "请添加盘点物资明细！");
 		mainmbo.setValue("status", "INPRG", 11L);
 		SAVE();
@@ -34,10 +34,10 @@ public class StockAppBean extends AppBean {
 		
 
 		MboRemote mainmbo = getMbo();
-		String status = mainmbo.getString("status");
-		if (!status.equalsIgnoreCase("INPRG")) {
-			throw new MXApplicationException("", "当前状态不允许更改状态为已盘点！");
-		}
+//		String status = mainmbo.getString("status");
+//		if (!status.equalsIgnoreCase("INPRG")) {
+//			throw new MXApplicationException("", "当前状态不允许更改状态为已盘点！");
+//		}
 		if(!mainmbo.getMboSet("STOCKTAKINGLINE1").isEmpty())
 			throw new MXApplicationException("", "存在未盘点完成的物资！");
 		mainmbo.setValue("status", "APPR", 11L);

src/com/tohi/webclient/servlet/MaximoAPPHandler.java

@@ -104,6 +104,16 @@ public class MaximoAPPHandler {
 				getMAXGROUP(request, response);
 			}else if ("getWotrack".equals(method)) {//工单跟踪模块
 				getWotrack(request, response);
+			}else if ("getMtPr".equals(method)) {//煤炭采购申请
+				getMtPr(request, response);
+			}else if ("getMtPo".equals(method)) {//煤炭采购订单
+				getMtPo(request, response);
+			}else if ("getMtRfq".equals(method)) {//煤炭询价单
+				getMtRfq(request, response);
+			}else if ("getMtInvoice".equals(method)) {//煤炭支付申请
+				getMtInvoice(request, response);
+			}else if ("getMtCon".equals(method)) {//煤炭框架
+				getMtCon(request, response);
 			}else {
 				response.getWriter().println(JSONUtil.msg("错误：应用操作不存在！"));
 			}
@@ -117,6 +127,88 @@ public class MaximoAPPHandler {
 
 
 
+	private static void getMtCon(HttpServletRequest request,
+			HttpServletResponse response) throws MXException, IOException{
+		String contractid = request.getParameter("contractid");
+		String contractnum = request.getParameter("contractnum");	
+		String description = request.getParameter("description");
+		String _maxItem = request.getParameter("rscount");
+		String _rsStart = request.getParameter("rsstart");
+		List  list=MaximoUtil.getMtCon(contractid,contractnum,description,_maxItem,_rsStart);
+		JSONArray o = JSONArray.fromObject(list);
+		response.getWriter().println(o.toString());
+	}
+
+
+
+
+
+	private static void getMtInvoice(HttpServletRequest request,
+			HttpServletResponse response) throws MXException, IOException{
+		String invoiceid = request.getParameter("invoiceid");
+		String invoicenum = request.getParameter("invoicenum");	
+		String description = request.getParameter("description");
+		String _maxItem = request.getParameter("rscount");
+		String _rsStart = request.getParameter("rsstart");
+		List  list=MaximoUtil.getMtInvoice(invoiceid,invoicenum,description,_maxItem,_rsStart);
+		JSONArray o = JSONArray.fromObject(list);
+		response.getWriter().println(o.toString());
+	}
+
+
+
+
+
+	private static void getMtRfq(HttpServletRequest request,
+			HttpServletResponse response)throws MXException, IOException {
+		String rfqid = request.getParameter("rfqid");
+		String rfqnum = request.getParameter("rfqnum");	
+		String description = request.getParameter("description");
+		String _maxItem = request.getParameter("rscount");
+		String _rsStart = request.getParameter("rsstart");
+		List  list=MaximoUtil.getMtRfq(rfqid,rfqnum,description,_maxItem,_rsStart);
+		JSONArray o = JSONArray.fromObject(list);
+		response.getWriter().println(o.toString());
+	}
+
+
+
+
+
+	private static void getMtPo(HttpServletRequest request,
+			HttpServletResponse response) throws MXException, IOException{
+		String poid = request.getParameter("poid");
+		String ponum = request.getParameter("ponum");	
+		String description = request.getParameter("description");
+		String _maxItem = request.getParameter("rscount");
+		String _rsStart = request.getParameter("rsstart");
+		List  list=MaximoUtil.getMtPo(poid,ponum,description,_maxItem,_rsStart);
+		JSONArray o = JSONArray.fromObject(list);
+		response.getWriter().println(o.toString());
+	}
+
+
+
+
+
+	//煤炭采购申请
+	private static void getMtPr(HttpServletRequest request,
+			HttpServletResponse response) throws MXException, IOException {
+		String prid = request.getParameter("prid");
+		String prnum = request.getParameter("prnum");	
+		String description = request.getParameter("description");
+		String _maxItem = request.getParameter("rscount");
+		String _rsStart = request.getParameter("rsstart");
+		List  list=MaximoUtil.getMtPr(prid,prnum,description,_maxItem,_rsStart);
+		JSONArray o = JSONArray.fromObject(list);
+		response.getWriter().println(o.toString());
+		
+	}
+
+
+
+
+
 
 	public static void GetLoginMax(HttpServletRequest request, HttpServletResponse response)
 			throws IOException, MXException {

src/fcg/app/contract/CustContractLine.java

@@ -44,7 +44,8 @@ public class CustContractLine
     }
 	if(releasePOLineRemote.isNull("GLCREDITACCT"))
 	    releasePOLineRemote.setValue("GLCREDITACCT", "9999-#-#", 2L);
-    releasePOLineRemote.setValue("CUSTUSD", getBoolean("CUSTUSD"),2L);
+    releasePOLineRemote.setValue("CUSTUSD", getBoolean("CUSTUSD"),2L);//是否美金
+//    releasePOLineRemote.setValue("FCG_LEADTIME", getString("FCG_LEADTIME"),2L);//交货期
     if (releasePOLineRemote.getName().equalsIgnoreCase("PRLINE"))
     {
       releasePOLineRemote.setValue("RL2", getString("fcg_projectid"), 11L);
@@ -80,12 +81,13 @@ public class CustContractLine
     String description = contlines[2];
     String custdept = contlines[3];
     String fcg_projectid = contlines[4];
-    String orderqty = contlines[5];
-    String orderunit = contlines[6];
-    String custunitcost = contlines[7];
-    String custtax1code = contlines[8];
-    String chgqtyonuse = contlines[9];
-    String chgpriceonuse = contlines[10];
+    String fcg_taskid = contlines[5];  //改变此顺序
+    String orderqty = contlines[6];
+    String orderunit = contlines[7];
+    String custunitcost = contlines[8];
+    String custtax1code = contlines[9];
+    String chgqtyonuse = contlines[10];
+    String chgpriceonuse = contlines[11];
     if (orderqty.equals("")) {
       orderqty = "0";
     }
@@ -95,6 +97,7 @@ public class CustContractLine
     try
     {
       setValue("LINETYPE", linetype);
+      setValue("FCG_TASKID", fcg_taskid);
       setValue("COMMODITYGROUP", commoditygroup);
       setValue("DESCRIPTION", description);
       setValue("CUSTDEPT", custdept);

src/fcg/app/contract/CustFldFCG_HTFL.java

@@ -36,33 +36,38 @@ public class CustFldFCG_HTFL extends MboValueAdapter implements MboConstants {
 
 		Mbo mbo = getMboValue().getMbo();
 		SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-		String a = mbo.getString("FCG_HTFL");
-
+//		String a = mbo.getString("FCG_HTFL");
+		String a =getMboValue().getString();
 		Date now = new Date();
 		String now1 = formatter.format(now);
-
 		String dt = now1.substring(0, 4);
-
 		String c = "FCG-" + dt + "-";
-
 		String htbh = c + a + "-";
-
+		
+		System.out.println("htbh============="+htbh);
 		MboSetRemote num_mboset = mbo.getMboSet("$porecord", "CONTRACT", "FCG_HTBH LIKE '" + htbh
 				+ "%' and contractnum<>'" + mbo.getString("contractnum") + "' and STATUS<>'CAN'");
-
-		String num = String.valueOf(num_mboset.count() + 1);
+		num_mboset.setOrderBy("FCG_HTBH desc ");
+		String num ="";
+		if (!num_mboset.isEmpty()) {
+			  num = num_mboset.getMbo(0).getString("FCG_HTBH").substring(12);
+		}else{
+			num ="0";
+		}
+		System.out.println(num);
+		num=String.valueOf(Integer.valueOf(num)+1);
+//		String num = String.valueOf(num);
 
 		int i_long = 3 - num.length();
 
 		if (i_long == 1) {
 			num = "0" + num;
 		}
-
+//
 		if (i_long == 2) {
 			num = "00" + num;
 		}
-
+//
 		if (i_long == 3) {
 			num = "000" + num;
 		}

src/fcg/app/inventory/FCGMatUseTrans.java

+package fcg.app.inventory;
+
+import fcg.util.FCGUtil;
+import java.rmi.RemoteException;
+import psdi.app.inventory.MatUseTrans;
+import psdi.app.inventory.MatUseTransRemote;
+import psdi.mbo.Mbo;
+import psdi.mbo.MboSet;
+import psdi.util.MXException;
+
+public class FCGMatUseTrans
+  extends MatUseTrans
+  implements MatUseTransRemote
+{
+  private static final long serialVersionUID = 1L;
+  
+  public FCGMatUseTrans(MboSet mboset)
+    throws MXException, RemoteException
+  {
+    super(mboset);
+  }
+  
+  public void save()
+    throws MXException, RemoteException
+  {
+    FCGUtil fcgUtil = new FCGUtil();
+    Mbo mboCurrent = this;
+    String strISSUETYPE = getString("ISSUETYPE");
+    String strGLDEBITACCT = "9999-#-#";
+    String strGLCREDITACCT = "220201-#-#";
+    String strCOMMODITYGROUP = getString("COMMODITYGROUP");
+    String linetype = mboCurrent.getString("LINETYPE");
+    String dept = "";
+    String ISPROJECT = "";
+    String custdept = "";
+    String custprojectid = "";
+    String custtaskid = "";
+    String custsystem = "";
+    String strREFID = "";
+    if ((getString("COMMODITYGROUP") != null) && (getString("COMMODITYGROUP") != ""))
+    {
+      if (((linetype.equals("ITEM")) || (linetype.equals("MATERIAL"))) && (!getString("WONUM").equals("")))
+      {
+        dept = mboCurrent.getString("WORKORDER.custlldw.str1");
+        ISPROJECT = mboCurrent.getString("WORKORDER.FCG_TASKID.ISPROJECT");
+        custdept = mboCurrent.getString("WORKORDER.custlldw.str2");
+        custprojectid = mboCurrent.getString("WORKORDER.fcg_projectid");
+        custtaskid = mboCurrent.getString("WORKORDER.fcg_taskid");
+        custsystem = mboCurrent.getString("WORKORDER.FCG_KKS2_2");
+        strREFID = "W" + getString("WONUM");
+      }
+      else if (((linetype.equals("MATERIAL")) || (linetype.equals("SERVICE"))) && (!getString("PONUM").equals("")))
+      {
+        dept = mboCurrent.getString("poline.dept.str1");
+        ISPROJECT = mboCurrent.getString("poline.FCG_TASKID.ISPROJECT");
+        custdept = mboCurrent.getString("poline.dept.str2");
+        custprojectid = mboCurrent.getString("poline.pl2");
+        custtaskid = mboCurrent.getString("poline.pl3");
+        strREFID = "P" + getString("PONUM");
+      }
+      strGLDEBITACCT = fcgUtil.validateGldebitacct1(strGLDEBITACCT, strCOMMODITYGROUP, ISPROJECT, linetype, dept);
+      strGLCREDITACCT = fcgUtil.validateGlcreditacct1(strGLCREDITACCT, strCOMMODITYGROUP, linetype);
+      if ((strISSUETYPE.equalsIgnoreCase("ISSUE")) || (strISSUETYPE.equalsIgnoreCase("INVOICE")))
+      {
+        setValue("GLDEBITACCT", strGLDEBITACCT, 2L);
+        setValue("GLCREDITACCT", strGLCREDITACCT, 2L);
+      }
+      else if (strISSUETYPE.equalsIgnoreCase("RETURN"))
+      {
+        setValue("GLDEBITACCT", strGLCREDITACCT, 2L);
+        setValue("GLCREDITACCT", strGLDEBITACCT, 2L);
+      }
+    }
+    setValue("custdept", custdept, 2L);
+    setValue("custprojectid", custprojectid, 2L);
+    setValue("custtaskid", custtaskid, 2L);
+    setValue("custsystem", custsystem, 2L);
+    setValue("REFID", strREFID, 2L);
+    super.save();
+  }
+}

src/fcg/app/invoice/CustInvoiceVendor.java

@@ -2,7 +2,7 @@ package fcg.app.invoice;
 
 import java.rmi.RemoteException;
 
-import psdi.app.contract.common.FldCommonContractVendor;
+import psdi.app.invoice.FldInvoiceVendor;
 import psdi.mbo.MboRemote;
 import psdi.mbo.MboSetRemote;
 import psdi.mbo.MboValue;
@@ -10,7 +10,7 @@ import psdi.mbo.MboValue;
 import psdi.util.MXException;
 
 public class CustInvoiceVendor
-  extends FldCommonContractVendor
+  extends FldInvoiceVendor
 {
 	MboRemote mbo = null;
   public CustInvoiceVendor(MboValue mbv)

src/fcg/app/workorder/CustFldWOPriority.java

@@ -37,15 +37,15 @@ public class CustFldWOPriority
     throws MXException, RemoteException
   {
     super.validate();
-    MboValue localMboValue = getMboValue();
-    Mbo localMbo = localMboValue.getMbo();
+//    MboValue localMboValue = getMboValue();
+//    Mbo localMbo = localMboValue.getMbo();
 //    if (localMboValue.getString().equalsIgnoreCase("4"))
 //    {
 //      localMbo.setFieldFlag("fcg_priority", 7L, false);
 //    }
 //    else
 //    {
-      localMbo.setValueNull("fcg_priority", 2L);;
+//      localMbo.setValueNull("fcg_priority", 2L);;
 //      localMbo.setFieldFlag("fcg_priority", 7L, true);
 //    }
   }

src/fcg/app/workorder/CustWO2.java

@@ -24,9 +24,7 @@ public class CustWO2 extends WO implements CustWORemote {
 		super(ms);
 	}
 
-	public FldPOReceivedTotalCost(MboValue mbv) throws MXException {
-		super(mbv);
-	}
+	 
 
 	public void init() throws MXException {
 		super.init();

src/fcg/workflow/LLApprAction.java

+package fcg.workflow;
+
+import java.rmi.RemoteException;
+
+import fcg.app.workorder.CustWO;
+import psdi.common.action.ActionCustomClass;
+import psdi.mbo.MboRemote;
+import psdi.util.MXException;
+/**
+ *
+ */
+public class LLApprAction implements ActionCustomClass{
+
+	@Override
+	public void applyCustomAction(MboRemote mbo, Object[] arg1) throws MXException, RemoteException {
+		((CustWO)mbo).AddPendingCost(mbo.getMboSet("SHOWPLANMATERIAL"));
+	}
+
+}

src/fcg/workflow/LLWapprAction.java

+package fcg.workflow;
+
+import java.rmi.RemoteException;
+
+import fcg.app.workorder.CustWO;
+import psdi.common.action.ActionCustomClass;
+import psdi.mbo.MboRemote;
+import psdi.util.MXException;
+/**
+ *
+ */
+public class LLWapprAction implements ActionCustomClass{
+
+	@Override
+	public void applyCustomAction(MboRemote mbo, Object[] arg1) throws MXException, RemoteException {
+		((CustWO)mbo).ReducePendingCost(mbo.getMboSet("SHOWPLANMATERIAL"));
+	}
+
+}

src/test/JDBC更新所有采购预算已用数值信息.java

@@ -22,7 +22,7 @@ public class JDBC
 
   			String sql_2=" select f.FINCNTRLID f1,t.projectid p1,f.FINCNTRLID p2,f.startdate from  "
   					+ "(		select  FINCNTRLID, projectid  from FINCNTRL f1 where  CUSTBUGETTYPE='PURCHASE'  "
-  					+ "and fctype='PROJECT' ) t inner join  FINCNTRL  f  on  f.parentfincntrlid =t.FINCNTRLID  where  f.FINCNTRLID='1100340' ";
+  					+ "and fctype='PROJECT' ) t inner join  FINCNTRL  f  on  f.parentfincntrlid =t.FINCNTRLID   and parentfincntrlid='1101145' ";
  			stat=conn.createStatement();
 			rs=stat.executeQuery(sql_2);
 			 while(rs.next()){
@@ -31,11 +31,11 @@ public class JDBC
 				 entity.setPolineNum(rs.getString("p2"));
 				 entity.setTableId(rs.getString("f1"));
 				 list.add(entity);
-//				 System.out.println(entity.toString());
+				 System.out.println(entity.toString());
 			 }
 			  
 				 
-			 
+//			 
 			  for (int i = 0; i < list.size(); i++) {
 				  Entity e=list.get(i);//获取费用预算ID
 				  
@@ -89,7 +89,7 @@ public class JDBC
 //				        stat1=conn.createStatement();
 //				        stat1.execute(sql);
 			 }
- 
+// 
 			 System.out.println("所有的更新完成");
 			 System.out.println(conn);
 		} catch (ClassNotFoundException | SQLException e) {
@@ -100,5 +100,6 @@ public class JDBC
 	}
     public static void main(String[] args) {
     	getConn();
+    	System.out.println("1111");
 	}
 }

src/test/JDBC更新费用预算领料.java

@@ -36,7 +36,7 @@ public class JDBC
 			 			
  			 for (int i = 0; i < list.size(); i++) {
  				 Entity e= list.get(i);
- 				 String sql_4="	select projectid ,finexpenselineid  from  finexpense fi left join finexpenseline f  on   fi.finexpenseid =f.finexpenseid  where  fi.projectid='"+e.getPolineNum()+"' and f.startdate >='2022-01-01 00:00:00' and f.enddate <='2022-12-31 23:59:59' and finexpenselineid=248 ";
+ 				 String sql_4="	select projectid ,finexpenselineid  from  finexpense fi left join finexpenseline f  on   fi.finexpenseid =f.finexpenseid  where  fi.projectid='"+e.getPolineNum()+"' and f.startdate >='2022-01-01 00:00:00' and f.enddate <='2022-12-31 23:59:59' ";
  				 rs=stat.executeQuery(sql_4);
  				 if(rs.next()){
  					 Entity2 entity2=new Entity2();