From 1ce83c1abffdb4527ed1558fa20690a4512333e4 Mon Sep 17 00:00:00 2001
From: linxiaoping <12345678>
Date: Sun, 24 Jun 2018 23:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerDeposit/DDepositReturn_TempInfo.jsp | 10 ++-
 .../DealerDeposit/DMarginChargeInfo_Temp.jsp  |  1 -
 .../CLMSDistributorList.jsp                   |  4 +-
 .../Tenwa/Comm/CustomerDoc/CustomerList.jsp   |  4 +-
 .../tenwa/flow/action/comm/SelectBalance.java | 66 +++++++++++++++++++
 5 files changed, 77 insertions(+), 8 deletions(-)
 create mode 100644 src_sys/com/tenwa/flow/action/comm/SelectBalance.java

diff --git a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
index 1a5812c45..1ebfd1de5 100644
--- a/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
+++ b/WebContent/DealerDeposit/DDepositReturn_TempInfo.jsp
@@ -9,7 +9,8 @@
 	String sPrevUrl = CurPage.getParameter("ID");
 	String ProjectName = CurPage.getParameter("ProjectName");
 	/* if(sPrevUrl == null) sPrevUrl = ""; */
-
+	BizObject flow=JBOFactory.createBizObjectQuery("jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT","flow_unid=:flowunid").setParameter("flowunid", sFlowUnid).getSingleResult(false);
+    String DISTRIBUTOR_NO=flow.getAttribute("Flow_Key").getString();
 	String sTempletNo = "DDepositReturn_TempInfo";//--模板号--
 	ASObjectModel doTemp = new ASObjectModel(sTempletNo);
 	/* doTemp.setColTips("", "测试"); */
@@ -45,8 +46,11 @@
 		 AsControl.OpenView("/DealerDeposit/DDepositReturn_TempList.jsp", "FlowUnid="+sFlowUnid,"_self","");
 	}
 	function selectBalance(){
-		AsControl.RunJavaMethod(ClassName,MethodName, Args);
-
+		//var distributor_id = getItemValue(0,getRow(),'distributor_id'); 
+		//var CAUTION_MONEY = getItemValue(0,getRow(),'CAUTION_MONEY');
+		var sReturn=AsControl.RunJavaMethodTrans("com.tenwa.flow.action.comm.SelectBalance","runs","distributor_no=<%=DISTRIBUTOR_NO%>");<%-- "distributor_no=<%=DISTRIBUTOR_NO%>" --%>/* +"&CAUTION_MONEY="+CAUTION_MONEY */
+		setItemValue(0,0,"ACCOUNT_BALANCE",sReturn);
+		
 	}
 </script>
 <%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 7f07a77a0..293eb400f 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -27,7 +27,6 @@
 <script type="text/javascript">
 	var sFlowUnid = "<%=sFlowUnid%>";
 	setItemValue(0,0,"MONEY_TYPE","保证金收款");
-	setItemValue(0,0,"MONEY_TYPE","收款");
 	setItemValue(0,0,"DISTRIBUTOR_ID","<%=DISTRIBUTOR_NO%>");
 	setItemValue(0,0,"PAYER","<%=CurPage.getParameter("ProjectName")%>");
 	setItemValue(0,0,"InputUserID","<%=CurUser.getUserName()%>");
diff --git a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
index 05043a721..652bc4c54 100644
--- a/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
+++ b/WebContent/Tenwa/ChannelPortal/DistributorManage/DistributorRegister/CLMSDistributorList.jsp
@@ -69,7 +69,7 @@ function teamingSuspend(){
 			return;
 		}
 		
-		if(confirm("确定合同暂停?")){
+		if(confirm("确定合作暂停?")){
 	var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","setDistributorStatusS","id="+id+",distributor_status="+distributor_status);
 		alert("暂停成功");
 		reloadSelf();
@@ -92,7 +92,7 @@ function teamingStop(){
 			//AsDebug.showMessage("提示:","该经销商已是合同终止，不能修改！", "", "", true);
 			return;
 		}
-		if(confirm("确定合同终止?")){
+		if(confirm("确定合作终止?")){
 			var result = AsControl.RunJavaMethodTrans("com.tenwa.customer.distributor.DeleteDistributor","setDistributorStatusE","id="+id+",distributor_status="+distributor_status);
 			alert("终止成功");
 			reloadSelf();
diff --git a/WebContent/Tenwa/Comm/CustomerDoc/CustomerList.jsp b/WebContent/Tenwa/Comm/CustomerDoc/CustomerList.jsp
index b3c233b32..6fcc6113e 100644
--- a/WebContent/Tenwa/Comm/CustomerDoc/CustomerList.jsp
+++ b/WebContent/Tenwa/Comm/CustomerDoc/CustomerList.jsp
@@ -49,9 +49,9 @@
 	String sButtons[][] =null;
 	
 		sButtons=new String[][]{
-				{"true","All","Button","新增","新增","newRecord()","","","",""},
+				/* {"true","All","Button","新增","新增","newRecord()","","","",""},
 				{"true","All","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit"},
-				{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""},
+				{"true","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0)","","","","btn_icon_delete",""}, */
 		};
 	
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
diff --git a/src_sys/com/tenwa/flow/action/comm/SelectBalance.java b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
new file mode 100644
index 000000000..91d42aedb
--- /dev/null
+++ b/src_sys/com/tenwa/flow/action/comm/SelectBalance.java
@@ -0,0 +1,66 @@
+package com.tenwa.flow.action.comm;
+
+
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO;
+import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOException;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.comm.util.jboutil.DataOperatorUtil;
+
+public class SelectBalance {
+	private String distributor_no;
+	private String CAUTION_MONEY;
+	public String getDistributor_no() {
+		return distributor_no;
+	}
+	public void setDistributor_no(String distributor_no) {
+		this.distributor_no = distributor_no;
+	}
+	
+	public String getCAUTION_MONEY() {
+		return CAUTION_MONEY;
+	}
+	public void setCAUTION_MONEY(String cAUTION_MONEY) {
+		CAUTION_MONEY = cAUTION_MONEY;
+	}
+
+
+	public String runs(JBOTransaction tx) throws Exception{
+		Transaction scql=Transaction.createTransaction(tx);
+		String money="";
+		Map<String,String> params= new HashMap<String,String>();
+		params.put("distributor_id", distributor_no);
+		String sql="SELECT O.distributor_id,SUM(CASE WHEN O.money_type='收款' THEN O.caution_money ELSE -O.caution_money END) AS money "
+				+ "FROM D_DEPOSITCHARGE_INFO O   WHERE "
+				+ "O.distributor_id=:distributor_id GROUP BY O.distributor_id";
+		List<Map<String,String>> getSql = DataOperatorUtil.getDataBySql(scql, sql, params);
+		//if(aaa.size()>0){
+			money=getSql.get(0).get("money");
+		//}	
+		return money;
+			
+			
+		/*BizObjectManager ddi = JBOFactory.getBizObjectManager(D_DEPOSITCHARGE_INFO.CLASS_NAME,tx);
+		BizObject dd = ddi.createQuery("select * from O where distributor_id=:distributorid").setParameter("distributor_id", distributor_no).getSingleResult(false);
+		String money = dd.getAttribute("caution_money").toString();
+		Integer mon=new Integer(money);
+		
+		BizObjectManager ddi2 = JBOFactory.getBizObjectManager(D_DEPOSITRETURN_INFO.CLASS_NAME,tx);
+		BizObject dd2 = ddi2.createQuery("select caution_money from O where distributor_id=:distributorid").setParameter("distributor_id", distributor_no).getSingleResult(false);
+		String money2 = dd2.getAttribute("caution_money").toString();
+		Integer mon2=new Integer(money2);
+		double m = mon-mon2;
+		return "m="+m;*/
+	}
+}
+	
\ No newline at end of file