diff --git a/WebContent/Tenwa/Apzl/productCar/LmProductToCompanyInfo.jsp b/WebContent/Tenwa/Apzl/productCar/LmProductToCompanyInfo.jsp
index bd5270f32..8331fc5de 100644
--- a/WebContent/Tenwa/Apzl/productCar/LmProductToCompanyInfo.jsp
+++ b/WebContent/Tenwa/Apzl/productCar/LmProductToCompanyInfo.jsp
@@ -77,6 +77,7 @@
function saveRecord(){
as_save("myiframe0","parent.AsDialog.ClosePage()");
}
+
var province="";
// 选择省份
function selectProvinceCode(){
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/companyLoan.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoan.jsp
similarity index 68%
rename from WebContent/Tenwa/Lease/Flow/CollectionAudit/companyLoan.jsp
rename to WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoan.jsp
index 923f08590..9a3cbb67e 100644
--- a/WebContent/Tenwa/Lease/Flow/CollectionAudit/companyLoan.jsp
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoan.jsp
@@ -2,48 +2,48 @@
<%@ include file="/Frame/resources/include/include_begin_list.jspf"%>
<%
+ String flag = "false";
+ String flagReadOnly = "1";
+ if(CurUser.hasRole("800R00000034")){
+ flag = "true";
+ flagReadOnly = "0";
+ }
ASObjectModel doTemp = new ASObjectModel("CompanyLoanList");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ ASDataObject ado = dwTemp.getDataObject();
dwTemp.Style="1"; //--设置为Grid风格--
dwTemp.MultiSelect = true; //多选
- dwTemp.ReadOnly = "0"; //只读模式
+ dwTemp.ReadOnly = flagReadOnly; //只读模式
// dwTemp.ShowSummary = "1"; //显示小计
dwTemp.setPageSize(10);
dwTemp.genHTMLObjectWindow("");
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
String sButtons[][] = {
- {"true","All","Button","保存","保存批次号","as_save(0)","","","","",""},
- {"true","All","Button","上传","上传","upload('')","","","","","btn_icon_up"},
+ {flag,"All","Button","保存","保存批次号","as_save(0)","","","","",""},
+ {flag,"All","Button","批量修改","批量修改","batch_edit()","","","","",""},
+ {"true","All","Button","批量上传","批量上传","upload('')","","","","",""},
+
};
%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoanBactchEdit.jsp b/WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoanBactchEdit.jsp
new file mode 100644
index 000000000..90844d55a
--- /dev/null
+++ b/WebContent/Tenwa/Lease/Flow/CollectionAudit/CompanyLoanBactchEdit.jsp
@@ -0,0 +1,41 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_info.jspf"%><%
+ /*
+ Author: undefined 2020-08-16
+ Content: 示例详情页面
+ History Log:
+ */
+ String sPrevUrl = CurPage.getParameter("PrevUrl");
+ if(sPrevUrl == null) sPrevUrl = "";
+
+ String sTempletNo = "CompanyLoanBatchInfo";//--模板号--
+ ASObjectModel doTemp = new ASObjectModel(sTempletNo);
+ doTemp.setColTips("", "测试");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request);
+ dwTemp.Style = "2";//freeform
+ //dwTemp.ReadOnly = "-2";//只读模式
+ dwTemp.genHTMLObjectWindow(CurPage.getParameter("SerialNo"));
+
+ String sButtons[][] = {
+ {"true","All","Button","保存","保存所有修改","save()","","","",""},
+ {String.valueOf(!com.amarsoft.are.lang.StringX.isSpace(sPrevUrl)),"All","Button","返回","返回列表","returnList()","","","",""}
+ };
+ sButtonPosition = "south";
+%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index f3618bdb1..6620e1c5a 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -1640,6 +1640,7 @@
+
@@ -1710,6 +1711,7 @@
+
diff --git a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
index 79ce8a9c7..70b0b1ebe 100644
--- a/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
+++ b/src_cmb/com/tenwa/sdk/controller/CmbToPayController.java
@@ -1,571 +1,589 @@
-package com.tenwa.sdk.controller;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import com.amarsoft.are.jbo.BizObject;
-import com.amarsoft.are.jbo.BizObjectManager;
-import com.amarsoft.are.jbo.BizObjectQuery;
-import com.amarsoft.are.jbo.JBOFactory;
-import com.amarsoft.are.jbo.JBOTransaction;
-import com.amarsoft.awe.Configure;
-import com.tenwa.comm.util.jboutil.DataOperatorUtil;
-import com.tenwa.flow.action.comm.BaseFlowStartAction;
-import com.tenwa.sdk.VO.SDKDcPayReqxVO;
-import com.tenwa.sdk.VO.SDKInfoVO;
-import com.tenwa.sdk.VO.SDKPayCallBackVO;
-import com.tenwa.sdk.VO.SDKPayCallDetail;
-import com.tenwa.sdk.VO.SDKPayRqxVO;
-import com.tenwa.sdk.VO.SDKToPayVO;
-import com.tenwa.sdk.utils.HttpRequest;
-import com.tenwa.sdk.utils.XMLStream;
-import com.thoughtworks.xstream.XStream;
-
-import jbo.app.tenwa.calc.LC_FUND_INCOME_TEMP;
-import jbo.com.tenwa.entity.comm.own.OWN_ACCOUNT;
-import jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_DETAIL_TEMP;
-import jbo.com.tenwa.lease.comm.LC_FUND_INCOME_CALLBACK_INFO_TEMP;
-import jbo.com.tenwa.lease.comm.LC_FUND_INCOME_PAY_DETAIL_TEMP;
-import jbo.com.tenwa.lease.comm.LC_FUND_INCOME_PAY_INFO_TEMP;
-import jbo.sys.CODE_LIBRARY;
-import net.sf.json.JSONObject;
-
-public class CmbToPayController extends BaseFlowStartAction {
- private String distributor_ids; //获取选择的 经销商ID
- private String contract_ids; //获取选择的合同ID
- private String FLOWUNID ; //流程号、
-
-
- public String getContract_ids() {
- return contract_ids;
- }
-
- public void setContract_ids(String contract_ids) {
- this.contract_ids = contract_ids;
- }
-
- public String getFLOWUNID() {
- return FLOWUNID;
- }
-
- public void setFLOWUNID(String fLOWUNID) {
- FLOWUNID = fLOWUNID;
- }
-
- public String getDistributor_ids() {
- return distributor_ids;
- }
-
- public void setDistributor_ids(String distributor_ids) {
- this.distributor_ids = distributor_ids;
- }
-
- @SuppressWarnings({ "unchecked", "unused" })
- public synchronized String action(JBOTransaction tx) throws Exception {
- /*
- * 定义返回参数
- */
- Map map = new HashMap();
- map.put("code", "0") ;
- map.put("msg", "") ;
-
- /*
- * 基本参数检查######开始
- */
- if(FLOWUNID==null || "".equals(FLOWUNID)) {
- map.put("code", "1") ;
- map.put("msg", "流程编号不能为空,请检查") ;
- JSONObject jsonObj = JSONObject.fromObject(map);
- return jsonObj.toString();
- }
- //按经销商改为按合同
- /*List distributor_id_list = java.util.Arrays.asList(distributor_ids.split("@"));
- if(distributor_id_list==null || distributor_id_list.size()<=0) {
- map.put("code", "1") ;
- map.put("msg", "尚未选择经销商,请检查") ;
- JSONObject jsonObj = JSONObject.fromObject(map);
- return jsonObj.toString();
- }*/
- List contract_id_list = java.util.Arrays.asList(contract_ids.split("@"));
- if(contract_id_list==null || contract_id_list.size()<=0) {
- map.put("code", "1") ;
- map.put("msg", "尚未选择合同,请检查") ;
- JSONObject jsonObj = JSONObject.fromObject(map);
- return jsonObj.toString();
- }
- //校验本次发起付款是否为同一个主体
- String contractIds = contract_ids.replaceAll("@", "','");
- String subjectSql = "SELECT subjectId AS subjectuid FROM lb_contract_info WHERE id IN ('"+contractIds+"') GROUP BY subjectId ";
- List