From ce076c3df157493a09d8c50607172d6fc0bea57c Mon Sep 17 00:00:00 2001
From: jianghongdong <jianghd@tenwa.com.cn>
Date: Wed, 25 Jul 2018 15:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E8=AF=81=20?=
 =?UTF-8?q?=E9=87=91=E6=94=B6=E5=8F=96=E6=97=B6=E6=8F=90=E4=BA=A4=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=A4=84=E7=90=86=E8=84=9A=E6=9C=ACbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DealerDeposit/DMarginChargeInfo_Temp.jsp  | 14 ++++---
 .../tenwa/flow/CopyDChargeTempToFormal.java   | 38 +++----------------
 2 files changed, 15 insertions(+), 37 deletions(-)

diff --git a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
index 86e3bf924..9870102cf 100644
--- a/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
+++ b/WebContent/DealerDeposit/DMarginChargeInfo_Temp.jsp
@@ -28,6 +28,7 @@
 	
 	if("ReadOnly".equals(rightType)){
 	dwTemp.ReadOnly = "1";//Ö»¶Áģʽ
+	doTemp.setColInnerBtEvent("LOCAL_ACCOUNT,ACCOUNT_INFO", "");
 	}
 	String acc_number = Sqlca.getString("select acc_number from OWN_ACCOUNT limit 0,1");
 	String acc_bank = Sqlca.getString("select acc_bank from OWN_ACCOUNT limit 0,1");
@@ -43,10 +44,13 @@
 %><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
 <script type="text/javascript">
 	window.onload=function(){
-		setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>');
-		setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>');
-		setItemValue(0,0,"ACCOUNT_INFO",'<%=acc%>');
-		setItemValue(0,0,"ACCOUNT",'<%=acco%>');
+		var laccount = getItemValue(0,0,'LOCAL_ACCOUNT');
+		if(!laccount){
+			setItemValue(0,0,"LOCAL_ACCOUNT",'<%=acc_number%>');
+			setItemValue(0,0,"LOCAL_BANK",'<%=acc_bank%>');
+			setItemValue(0,0,"ACCOUNT_INFO",'<%=acc%>');
+			setItemValue(0,0,"ACCOUNT",'<%=acco%>');
+		}
 	}
 
 
@@ -65,7 +69,7 @@
 		as_save("myiframe0","returnList()");
 	}
  	function returnList(){
-		 AsControl.OpenView("/DealerDeposit/DMarginChargeInfo_TempList.jsp", "FlowUnid="+sFlowUnid+"&ProjectName=<%=CurPage.getParameter("ProjectName")%>","_self","");
+ 		parent.selectItem(1);
 	}
 	function selectaccount(){
  		var disno = getItemValue(0, 0, "disno");
diff --git a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
index 99ca6166a..7038800d3 100644
--- a/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
+++ b/calc/com/tenwa/flow/CopyDChargeTempToFormal.java
@@ -4,8 +4,6 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.Map;
 
-import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT;
-import jbo.app.tenwa.customer.DISTRIBUTOR_ACCOUNT_TEMP;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO;
 import jbo.app.tenwa.customer.DISTRIBUTOR_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO;
@@ -13,7 +11,6 @@ import jbo.com.tenwa.entity.comm.flow.D_DEPOSITCHARGE_INFO_TEMP;
 import jbo.com.tenwa.entity.comm.flow.D_DEPOSITRETURN_INFO_TEMP;
 
 import com.amarsoft.are.jbo.BizObject;
-import com.amarsoft.are.jbo.BizObjectManager;
 import com.amarsoft.are.jbo.JBOFactory;
 import com.amarsoft.awe.util.Transaction;
 import com.tenwa.comm.util.jboutil.DataOperatorUtil;
@@ -30,38 +27,15 @@ public class CopyDChargeTempToFormal extends BaseBussiness{
 		Map<String,String> fromCondtion = new HashMap<String,String>();
 		fromCondtion.put("FLOWUNID",flowunid);
 		Map<String,String> otherProperty = new HashMap<String,String>();
-		//otherProperty.put("ID",id);
 		DataOperatorUtil.copySingleJBO(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITCHARGE_INFO.CLASS_NAME, null, otherProperty, Sqlca);		
-		BizObject dibo = JBOFactory.createBizObjectQuery(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
-		BizObject deit = JBOFactory.createBizObjectQuery(D_DEPOSITRETURN_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
-		BigDecimal total = new BigDecimal(dibo.getAttribute(DISTRIBUTOR_INFO_TEMP.TOTAL).getString());
+		BizObject dibo = JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, Sqlca).createQuery("flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
+		BizObject deit = JBOFactory.createBizObjectQuery(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, "flowunid=:flowunid").setParameter("flowunid",flowunid).getSingleResult(false);
+		String num = dibo.getAttribute("TOTAL")==null?"0":dibo.getAttribute("TOTAL").getString();//.getString();
+		BigDecimal total = new BigDecimal(num==""?"0":num);
 		BigDecimal cautionMoney = new BigDecimal(deit.getAttribute(D_DEPOSITRETURN_INFO_TEMP.CAUTION_MONEY).getString());
-		double num = total.add(cautionMoney).doubleValue();
-		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
+		double num1 = total.add(cautionMoney).doubleValue();
+		JBOFactory.getBizObjectManager(DISTRIBUTOR_INFO.CLASS_NAME,Sqlca).createQuery("update o set TOTAL='"+num1+"' where distributor_no='"+DistributorNo+"'").executeUpdate();
 		
 		return "true";
 	}
-	
-	/*@Override
-	public Object run(Transaction Sqlca) throws Exception {
-		this.initBussinessParam(Sqlca);
-		String flowunid = this.getAttribute("ObjectNo").toString();
-		String id = this.getAttribute("ProjectId").toString();
-		Map<String,String> fromCondtion = new HashMap<String,String>();
-		fromCondtion.put("FLOWUNID",flowunid);
-		Map<String,String> otherProperty = new HashMap<String,String>();
-		otherProperty.put("ID",id);
-		
-		BizObject dst= DataOperatorUtil.getSingleJBO(DISTRIBUTOR_INFO_TEMP.CLASS_NAME, fromCondtion, Sqlca);
-		String disStatus = dst.getAttribute("id").toString();
-		BizObjectManager dit = JBOFactory.getBizObjectManager(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME,Sqlca);
-		BizObject deit = dit.createQuery("select * from O where FLOWUNID=:flowUnid").setParameter("flowUnid", flowunid).getSingleResult(true);
-		deit.setAttributeValue("DISTRIBUTOR_ID", disStatus);
-		dit.saveObject(deit);
-		
-		DataOperatorUtil.copySingleJBO(D_DEPOSITCHARGE_INFO_TEMP.CLASS_NAME, fromCondtion, D_DEPOSITCHARGE_INFO.CLASS_NAME, null, otherProperty, Sqlca);	
-		return "true";
-	}*/
-	
-	
 }