2024-05-16项目代码归档

v5/apps-customize/pom.xml

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>com.seeyon</groupId>
+        <artifactId>apps-root</artifactId>
+        <version>5371630367615140082-standard-V8.1SP2-release_20220812-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apps-customize</artifactId>
+    <version>${apps.version}</version>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>com.seeyon</groupId>-->
+<!--            <artifactId>cap-core</artifactId>-->
+<!--            <version>${cap.version}</version>-->
+<!--        </dependency>-->
+        <dependency>
+            <groupId>open.seeyon.3rd</groupId>
+            <artifactId>hutool</artifactId>
+            <version>5.5.7</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/hutool-all-5.5.7.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>open.seeyon.3rd</groupId>
+            <artifactId>seeyon-extend</artifactId>
+            <version>3.0</version>
+            <scope>system</scope>
+            <systemPath>${basedir}/src/main/webapp/WEB-INF/lib/seeyon-extend-v3.0.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+
+        <!--        <dependency>-->
+<!--            <groupId>com.seeyon</groupId>-->
+<!--            <artifactId>apps-weixin</artifactId>-->
+<!--            <version>${apps.version}</version>-->
+<!--        </dependency>-->
+
+<!--        <dependency>-->
+<!--            <groupId>com.seeyon</groupId>-->
+<!--            <artifactId>ctp-common</artifactId>-->
+<!--            <version>${ctp.version}</version>-->
+<!--        </dependency>-->
+    </dependencies>
+
+</project>

v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/controller/InterestMeasurementController.java

@@ -4,17 +4,24 @@ import cn.hutool.log.Log;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.seeyon.apps.common.config.ICstConfigApi;
+import com.seeyon.apps.common.plugin.vo.ConfigVo;
+import com.seeyon.apps.src_financing.constants.FinancingConstants;
 import com.seeyon.apps.src_financing.dao.IFinancingContractDao;
 import com.seeyon.apps.src_financing.util.FormExportUtil;
 import com.seeyon.apps.src_financing.util.InterestCalculationUtil;
 import com.seeyon.apps.src_financing.util.NumberUtil;
+import com.seeyon.apps.src_ydctleasebill.constant.YdctLeaseBillConstant;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
+import com.seeyon.cap4.form.api.FormApi4Cap4;
+import com.seeyon.cap4.form.bean.FormBean;
 import com.seeyon.ctp.common.AppContext;
 import com.seeyon.ctp.common.controller.BaseController;
 import com.seeyon.ctp.util.UUIDLong;
 import com.seeyon.ctp.util.json.JSONUtil;
 import com.seeyon.v3x.services.form.FormFactory;
 import com.seeyon.v3x.services.form.bean.FormExport;
+import com.seeyon.v3x.services.form.bean.RecordExport;
 import com.seeyon.v3x.services.form.bean.SubordinateFormExport;
 import com.seeyon.v3x.services.form.bean.ValueExport;
 import nc.vo.jcom.lang.StringUtil;
@@ -33,6 +40,8 @@ public class InterestMeasurementController extends BaseController {
     private static Log log = Log.get(InterestMeasurementController.class);
     private FormFactory formFactory;
 
+    protected ICstConfigApi cstConfigApi = (ICstConfigApi) AppContext.getBean("cstConfigApi");
+
     public FormFactory getFormFactory() {
         if (formFactory == null) {
             formFactory = (FormFactory) AppContext.getBean("formFactory");
@@ -57,13 +66,31 @@ public class InterestMeasurementController extends BaseController {
         this.financingContractDao = financingContractDao;
     }
 
+    private FormApi4Cap4 formApi4Cap4;
+
+    public FormApi4Cap4 getFormApi4Cap4() {
+        if (this.formApi4Cap4 == null) {
+            this.formApi4Cap4 = (FormApi4Cap4)AppContext.getBean("formApi4Cap4");
+        }
+
+        return this.formApi4Cap4;
+    }
+    public ConfigVo getFinancingConfig() {
+        return cstConfigApi.getConfig(getPluginId());
+    }
+
+    public String getPluginId() {
+        return FinancingConstants.getPluginId();
+    }
 
 
         public ModelAndView index(HttpServletRequest request, HttpServletResponse response) throws Exception {
             log.info("进入ajax方法");
+            ConfigVo configVo = getFinancingConfig();
             //            设置返回值对象
             Map<String, Object> res = new HashMap<>();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             InterestCalculationUtil rentCalculationUtil = new InterestCalculationUtil();
             request.setCharacterEncoding("UTF-8");
             response.setCharacterEncoding("UTF-8");
@@ -156,17 +183,17 @@ public class InterestMeasurementController extends BaseController {
 
 //            数据生成前根据合同编号清楚所有的辅助表信息
                 String contractCode =  jsonObject.getString("contractCode");
-            if(!StringUtil.isEmpty(contractCode)){
+//            if(!StringUtil.isEmpty(contractCode)){
-//                删除明细表辅助数据
+////                删除明细表辅助数据
-                int daleteFZFinancingSubnum = getLeaseContractDao().daleteFZFinancingSub(contractCode);
+//                int daleteFZFinancingSubnum = getLeaseContractDao().daleteFZFinancingSub(contractCode);
-//                删除主表辅助数据
+////                删除主表辅助数据
-                int daleteFZFinancingnum = getLeaseContractDao().daleteFZFinancing(contractCode);
+//                int daleteFZFinancingnum = getLeaseContractDao().daleteFZFinancing(contractCode);
-                if(daleteFZFinancingSubnum!=0 &&daleteFZFinancingnum!=0){
+//                if(daleteFZFinancingSubnum!=0 &&daleteFZFinancingnum!=0){
-                    System.out.println("存在辅助表数据，删除成功，主表删除"+daleteFZFinancingnum+"条数据，明细表删除"+daleteFZFinancingSubnum+"条数据");
+//                    System.out.println("存在辅助表数据，删除成功，主表删除"+daleteFZFinancingnum+"条数据，明细表删除"+daleteFZFinancingSubnum+"条数据");
-                }else{
+//                }else{
-                    System.out.println("删除失败，主表"+daleteFZFinancingSubnum+"明细表"+daleteFZFinancingnum+"合同编码"+contractCode);
+//                    System.out.println("删除失败，主表"+daleteFZFinancingSubnum+"明细表"+daleteFZFinancingnum+"合同编码"+contractCode);
-                }
+//                }
-            }
+//            }
             log.info("删除历史生成的数据");
 //            创建保存利息明细信息
             List<Map<String,Object>> sublist = new ArrayList<Map<String,Object>>();
@@ -207,18 +234,165 @@ public class InterestMeasurementController extends BaseController {
 //            计算利息信息保存利息明细对象
             sublist = rentCalculationUtil.detailedHandle(jsonObject,type);
             log.info("生成完成所有利息");
-            Map<String,Object> mainmap = new HashMap<String,Object>();
+
-            mainmap.put("合同编号", contractCode);
+            log.info("创建档案");
-            mainmap.put("触发文本更新", contractCode+codenum);
+            List<String> contractIds = getLeaseContractDao().getFZinancingid(contractCode);
+            FormExport[] formExports = getFormFactory().exportBusinessFormData("LXCSMX",
+                    "2024-11-01 00:00:00",simpleDateFormat.format(new Date()),new String[]{});
             FormExportUtil formExportUtil = new FormExportUtil();
             FormExport formExport = new FormExport();
-            List<SubordinateFormExport> subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
+            for(FormExport formExportold :formExports){
-            List<ValueExport> valueExports = formExportUtil.setFormValue(mainmap);
+                for(ValueExport valueExport : formExportold.getValues()){
-            formExport.setSubordinateForms(subordinateFormExports);
+                    if("合同编号".equals(valueExport.getDisplayName())){
-            formExport.setValues(valueExports);
+                        if(contractCode.equals(valueExport.getValue())){
-            log.info("创建档案");
+                            formExport = formExportold;
-            getFormFactory().importBusinessFormData("shenxian", "LXCSMX",
+                        }
+                    }
+                }
+            }
+            if(contractIds.size()==0){
+                Map<String,Object> mainmap = new HashMap<String,Object>();
+                mainmap.put("合同编号", contractCode);
+                mainmap.put("触发文本更新", contractCode+codenum);
+
+                List<SubordinateFormExport> subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
+                List<ValueExport> valueExports = formExportUtil.setFormValue(mainmap);
+                formExport.setSubordinateForms(subordinateFormExports);
+                formExport.setValues(valueExports);
+
+                log.info("创建档案");
+                String loginName = configVo.getParamVal(FinancingConstants.loginName.name());
+            getFormFactory().importBusinessFormData(loginName, "LXCSMX",
                     formExport, new String[] {});
+            }else{
+//                查询需要修改的ID
+                String contractId = contractIds.get(0);
+//                修改主表信息
+                int issuccessform = getLeaseContractDao().updateLXFinancingbyId(contractCode+codenum,contractId);
+//                修改从表信息
+                //		获取明细表对象列表
+                List<SubordinateFormExport> subordinateFormExports = formExport.getSubordinateForms();
+//		获取第一个明细表对象
+                SubordinateFormExport subordinateFormExport =subordinateFormExports.get(0);
+//		获取明细行对象
+                List<RecordExport> recordExports = subordinateFormExport.getValues();
+//		判断明细行与当前明细行是否匹配
+                int differ = recordExports.size()-sublist.size();
+                if(differ==0){
+                    for(int i = 0 ; i < recordExports.size() ;i++){
+//                        替换原本数据信息
+                        Map<String ,String> paramMap = new HashMap<>();
+                        RecordExport recordExport = recordExports.get(i);
+                        Map<String,Object> map = sublist.get(i);
+                        List<ValueExport> valueExports = recordExport.getRecord();
+                        for(int n = 0 ; n < valueExports.size();n ++){
+                            ValueExport subValueExport = valueExports.get(n);
+                            if("序号1".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0001",subValueExport.getValue());
+                            }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0004",subValueExport.getValue());
+                            }
+                        }
+                        paramMap.put("field0005","-4351865301164799504");
+                        paramMap.put("formmainId",contractId);
+                        paramMap.put("field0006",map.get("计划还款日期").toString());
+                        paramMap.put("field0007",map.get("计划还款金额").toString());
+                        paramMap.put("field0008","");
+//                        查询出来基础数据
+                        int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+                        System.out.println("替换"+issuccessform);
+                    }
+                }else if (differ>0){
+                    for(int i = 0 ; i < sublist.size() ;i++){
+//                        替换原有数据库数据
+                        Map<String ,String> paramMap = new HashMap<>();
+                        RecordExport recordExport = recordExports.get(i);
+                        Map<String,Object> map = sublist.get(i);
+                        List<ValueExport> valueExports = recordExport.getRecord();
+                        for(int n = 0 ; n < valueExports.size();n ++){
+                            ValueExport subValueExport = valueExports.get(n);
+                            if("序号1".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0001",subValueExport.getValue());
+                            }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0004",subValueExport.getValue());
+                            }
+                        }
+                        paramMap.put("field0005","-4351865301164799504");
+                        paramMap.put("formmainId",contractId);
+                        paramMap.put("field0006",map.get("计划还款日期").toString());
+                        paramMap.put("field0007",map.get("计划还款金额").toString());
+                        paramMap.put("field0008","");
+//                        查询出来基础数据
+                        int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+                        System.out.println("替换"+issuccessSub);
+                    }
+//                    删除多余明细行数据
+                    int isdeleteSub = getLeaseContractDao().deleteLXFinancingSubbyFormId(sublist.size()+"",contractId );
+                    System.out.println("删除"+isdeleteSub);
+                }else if (differ<0){
+                    for(int i = 0 ; i < recordExports.size() ;i++){
+//                        替换原本数据信息
+                        Map<String ,String> paramMap = new HashMap<>();
+                        RecordExport recordExport = recordExports.get(i);
+                        Map<String,Object> map = sublist.get(i);
+                        List<ValueExport> valueExports = recordExport.getRecord();
+                        for(int n = 0 ; n < valueExports.size();n ++){
+                            ValueExport subValueExport = valueExports.get(n);
+                            if("序号1".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0001",subValueExport.getValue());
+                            }if("计划利息还款明细编号".equals(subValueExport.getDisplayName())){
+                                paramMap.put("field0004",subValueExport.getValue());
+                            }
+                        }
+                        paramMap.put("field0005","-4351865301164799504");
+                        paramMap.put("formmainId",contractId);
+                        paramMap.put("field0006",map.get("计划还款日期").toString());
+                        paramMap.put("field0007",map.get("计划还款金额").toString());
+                        paramMap.put("field0008","");
+//                        查询出来基础数据
+                        int issuccessSub = getLeaseContractDao().updateLXFinancingSubbyFormId(paramMap);
+                        System.out.println("替换"+issuccessSub);
+                    }
+                    for(int i = 0 ; i<(differ*-1) ; i++){
+//                        添加明细表
+                        Map<String,Object> map = sublist.get(recordExports.size()+i);
+                        Map<String ,String> paramMap = new HashMap<>();
+                        long l = UUIDLong.longUUID();
+                        paramMap.put("id",l+"");
+                        paramMap.put("formmainId",contractId);
+                        paramMap.put("field0001",recordExports.size()+i+1+"");
+                        paramMap.put("field0004",contractCode+(recordExports.size()+i+1));
+                        paramMap.put("field0005","-4351865301164799504");
+                        paramMap.put("field0006",map.get("计划还款日期").toString());
+                        paramMap.put("field0007",map.get("计划还款金额").toString());
+                        int isAddSub = getLeaseContractDao().addLXFinancingSubbyFormId(paramMap);
+                        System.out.println("新增"+isAddSub);
+                    }
+                }
+
+//                Map<String,Object> mainmap = new HashMap<String,Object>();
+//                mainmap.put("触发文本更新", contractCode+codenum);
+//                formExport = formExportUtil.updateFormValue(formExport,mainmap);
+//                formExport = formExportUtil.updateSubordinateFormValue(formExport,sublist);
+//                long updateId = getFormFactory().updateBusinessFormData(Long.parseLong(contractCodes.get(0)),
+//                        "shenxian", "LXCSMX",formExport);
+//                System.out.println(updateId);
+            }
+
+//            Map<String,Object> mainmap = new HashMap<String,Object>();
+//            mainmap.put("合同编号", contractCode);
+//            mainmap.put("触发文本更新", contractCode+codenum);
+//
+//            List<SubordinateFormExport> subordinateFormExports = formExportUtil.setSubordinateFormValue(sublist);
+//            List<ValueExport> valueExports = formExportUtil.setFormValue(mainmap);
+//            formExport.setSubordinateForms(subordinateFormExports);
+//            formExport.setValues(valueExports);
+//            FormBean cap4FormBean = getFormApi4Cap4().getFormByFormCode("LXCSMX");
+
+
+//            getFormFactory().updateBusinessFormData(1l,"shenxian", "LXCSMX",formExport);
+//            getFormFactory().importBusinessFormData("admin1", "LXCSMX",
+//                    formExport, new String[] {});
 //            getFormFactory().importBusinessFormData("admin1", "LXCSMX",
 //                    formExport, new String[] {});
 //            getFormFactory().importBusinessFormData("demo2", "LXCSMX",
@@ -228,51 +402,51 @@ public class InterestMeasurementController extends BaseController {
             res.put("s", "");
             res.put("num", contractCode+codenum);
 
-            JSONObject patchData = new JSONObject();
+//            JSONObject patchData = new JSONObject();
-            patchData.put("code",0);
+//            patchData.put("code",0);
-            JSONObject jsonData = new JSONObject();
+//            JSONObject jsonData = new JSONObject();
-            jsonData.put("success",1);
+//            jsonData.put("success",1);
-            jsonData.put("code","200");
+//            jsonData.put("code","200");
-            jsonData.put("message","操作成功!");
+//            jsonData.put("message","操作成功!");
-            JSONObject formData = new JSONObject();
+//            JSONObject formData = new JSONObject();
-            JSONObject tableData = new JSONObject();
+//            JSONObject tableData = new JSONObject();
-            JSONObject formmain_0087 = new JSONObject();
+//            JSONObject formmain_0087 = new JSONObject();
-            JSONObject formupdate0087 = new JSONObject();
+//            JSONObject formupdate0087 = new JSONObject();
-            JSONObject field0215 = new JSONObject();
+//            JSONObject field0215 = new JSONObject();
-            field0215.put("value","1");
+//            field0215.put("value","1");
-            field0215.put("showValue","1");
+//            field0215.put("showValue","1");
-            field0215.put("showValue2","1");
+//            field0215.put("showValue2","1");
-            formupdate0087.put("field0215",field0215);
+//            formupdate0087.put("field0215",field0215);
-            formmain_0087.put("update",formupdate0087);
+//            formmain_0087.put("update",formupdate0087);
-            formmain_0087.put("empty",false);
+//            formmain_0087.put("empty",false);
-            tableData.put("formmain_0087",formmain_0087);
+//            tableData.put("formmain_0087",formmain_0087);
-            JSONObject formson_0091 = new JSONObject();
+//            JSONObject formson_0091 = new JSONObject();
-            JSONArray formadds0091 = new JSONArray();
+//            JSONArray formadds0091 = new JSONArray();
-                        sublist.size();
+//                        sublist.size();
-            for(int i = 0 ; i < sublist.size() ; i ++){
+//            for(int i = 0 ; i < sublist.size() ; i ++){
-                JSONObject recordId = new JSONObject();
+//                JSONObject recordId = new JSONObject();
-                recordId.put("recordId", UUIDLong.longUUID());
+//                recordId.put("recordId", UUIDLong.longUUID());
-                formadds0091.add(recordId);
+//                formadds0091.add(recordId);
-            }
+//            }
-            formson_0091.put("add",formadds0091);
+//            formson_0091.put("add",formadds0091);
-            List<String> lxFinancingSubId = getLeaseContractDao().getLXFinancingSubId(contractCode);
+//            List<String> lxFinancingSubId = getLeaseContractDao().getLXFinancingSubId(contractCode);
-            String[] deletes0091 =lxFinancingSubId.stream().toArray(String[]::new);
+//            String[] deletes0091 =lxFinancingSubId.stream().toArray(String[]::new);
-            formson_0091.put("delete",deletes0091);
+//            formson_0091.put("delete",deletes0091);
-            formson_0091.put("empty",false);
+//            formson_0091.put("empty",false);
-            tableData.put("formson_0091",formson_0091);
+//            tableData.put("formson_0091",formson_0091);
-            formData.put("tableData",tableData);
+//            formData.put("tableData",tableData);
-            JSONObject extend = new JSONObject();
+//            JSONObject extend = new JSONObject();
-            formData.put("extend",extend);
+//            formData.put("extend",extend);
-            jsonData.put("data",formData);
+//            jsonData.put("data",formData);
-            patchData.put("data",jsonData);
+//            patchData.put("data",jsonData);
-            patchData.put("message","");
+//            patchData.put("message","");
 
 //            String sss = "{\"code\":0,\"data\":{\"code\":\"2000\",\"data\":{\"tableData\":{\"formson_0091\":{\"update\":{\""+lxFinancingSubId.get(0)+"\":{\"field0193\":{\"showValue\":\"11\",\"showValue2\":\"11\",\"value\":\"11\"}}}}}},\"message\":\"the operation is success!!!\"},\"message\":\"\"}";
 
 //            JSONObject jsonnnn = JSON.parseObject(sss);
 
-            res.put("data",patchData);
+//            res.put("data",patchData);
-            log.info(patchData.toString());
+//            log.info(patchData.toString());
             render(response, JSONUtil.toJSONString(res));
         return null;
     }

v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/FinancingContractDaoImpl.java

@@ -12,15 +12,31 @@ import java.util.Map;
 public class FinancingContractDaoImpl implements IFinancingContractDao {
 
 //	本地
-	private String daleteFZFinancing = "delete from formmain_0097 WHERE field0002 = ?";
+//	private String daleteFZFinancing = "delete from formmain_0097 WHERE field0002 = ?";
-	private String daleteFZFinancingSub = "delete from formson_0098 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0097 WHERE field0002 = ? )";
+//	private String daleteFZFinancingSub = "delete from formson_0098 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0097 WHERE field0002 = ? )";
-	private String getLXFinancingSub = "select id from formson_0091 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0087 WHERE field0001 = ? )";
+//	private String getFZinancingid = "SELECT ID FROM formmain_0097 WHERE field0002 = ?";
-//	测试
+//	private String getLXFinancingSub = "select id from formson_0091 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0087 WHERE field0001 = ? )";
+//	private String updateLXFinancingbyId = "update formmain_0097 set field0009 = ? where id = ?";
+//	private String updateLXFinancingSubbyFormId =
+//			"update formson_0098 set field0004 = ?,field0005= ? ,field0006= ? ,field0007= ? ,field0008= ? where formmain_id = ? and field0001 = ?";
+//	private String addLXFinancingSubbyFormId =
+//			"INSERT INTO formson_0098 (id, formmain_id, sort,field0001,field0004,field0005,field0006,field0007) VALUES (?,?,?,?,?,?,?,?)";
+//	private String deleteLXFinancingSubbyFormId ="delete from formson_0098 where field0001>? and formmain_id = ?";
+
+	//	测试
 //	private String daleteFZFinancing = "delete from formmain_0019 WHERE field0002 = ?";
 //	private String daleteFZFinancingSub = "delete from formson_0020 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0019 WHERE field0002 = ? )";
 //	正式
-//	private String daleteFZFinancing = "delete from formmain_0760 WHERE field0002 = ?";
+	private String daleteFZFinancing = "delete from formmain_0760 WHERE field0002 = ?";
-//	private String daleteFZFinancingSub = "delete from formson_0761 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0760 WHERE field0002 = ? )";
+	private String daleteFZFinancingSub = "delete from formson_0761 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0760 WHERE field0002 = ? )";
+	private String getFZinancingid = "SELECT ID FROM formmain_0760 WHERE field0002 = ?";
+	private String getLXFinancingSub = "select id from formson_0744 WHERE FORMMAIN_ID in (SELECT ID FROM formmain_0725 WHERE field0001 = ? )";
+	private String updateLXFinancingbyId = "update formmain_0760 set field0009 = ? where id = ?";
+	private String updateLXFinancingSubbyFormId =
+			"update formson_0761 set field0004 = ?,field0005= ? ,field0006= ? ,field0007= ? ,field0008= ? where formmain_id = ? and field0001 = ?";
+	private String addLXFinancingSubbyFormId =
+			"INSERT INTO formson_0761 (id, formmain_id, sort,field0001,field0004,field0005,field0006,field0007) VALUES (?,?,?,?,?,?,?,?)";
+	private String deleteLXFinancingSubbyFormId ="delete from formson_0761 where field0001>? and formmain_id = ?";
 
 
 
@@ -42,6 +58,89 @@ public class FinancingContractDaoImpl implements IFinancingContractDao {
 		return i;
 	}
 
+	@Override
+	public int updateLXFinancingbyId(String contractCodenum,String id) throws BusinessException, SQLException {
+		int i = 0 ;
+		JDBCAgent agent = new JDBCAgent();
+		try {
+			StringBuilder sql = new StringBuilder(updateLXFinancingbyId);
+			List<Object> p = new ArrayList<Object>();
+			p.add(contractCodenum);
+			p.add(id);
+			i=agent.execute(sql.toString(), p);
+		}finally {
+			if (agent != null) {
+				agent.close();
+			}
+		}
+		return i;
+	}
+
+	@Override
+	public int updateLXFinancingSubbyFormId(Map<String,String> map) throws BusinessException, SQLException {
+		int i = 0 ;
+		JDBCAgent agent = new JDBCAgent();
+		try {
+			StringBuilder sql = new StringBuilder(updateLXFinancingSubbyFormId);
+			List<Object> p = new ArrayList<Object>();
+			p.add(map.get("field0004"));
+			p.add(map.get("field0005"));
+			p.add(map.get("field0006"));
+			p.add(map.get("field0007"));
+			p.add(map.get("field0008"));
+			p.add(map.get("formmainId"));
+			p.add(map.get("field0001"));
+			i=agent.execute(sql.toString(), p);
+		}finally {
+			if (agent != null) {
+				agent.close();
+			}
+		}
+		return i;
+	}
+
+	@Override
+	public int addLXFinancingSubbyFormId(Map<String,String> map) throws BusinessException, SQLException {
+		int i = 0 ;
+		JDBCAgent agent = new JDBCAgent();
+		try {
+			StringBuilder sql = new StringBuilder(addLXFinancingSubbyFormId);
+			List<Object> p = new ArrayList<Object>();
+			p.add(map.get("id"));
+			p.add(map.get("formmainId"));
+			p.add(map.get("field0001"));
+			p.add(map.get("field0001"));
+			p.add(map.get("field0004"));
+			p.add(map.get("field0005"));
+			p.add(map.get("field0006"));
+			p.add(map.get("field0007"));
+			i=agent.execute(sql.toString(), p);
+		}finally {
+			if (agent != null) {
+				agent.close();
+			}
+		}
+		return i;
+	}
+
+	@Override
+	public int deleteLXFinancingSubbyFormId(String num, String formmainId) throws BusinessException, SQLException {
+		int i = 0 ;
+		JDBCAgent agent = new JDBCAgent();
+		try {
+			StringBuilder sql = new StringBuilder(deleteLXFinancingSubbyFormId);
+			List<Object> p = new ArrayList<Object>();
+			p.add(num);
+			p.add(formmainId);
+			i=agent.execute(sql.toString(), p);
+		}finally {
+			if (agent != null) {
+				agent.close();
+			}
+		}
+		return i;
+	}
+
 
 	@Override
 	public int daleteFZFinancingSub(String contractCode) throws BusinessException, SQLException {
@@ -86,5 +185,30 @@ public class FinancingContractDaoImpl implements IFinancingContractDao {
 		return lists;
 	}
 
+	@Override
+	public List<String> getFZinancingid(String contractCode) throws BusinessException, SQLException {
+		List<String> lists = new ArrayList<String>();
+		JDBCAgent agent = new JDBCAgent();
+		try {
+			StringBuilder sql = new StringBuilder(getFZinancingid);
+			List<Object> p = new ArrayList<Object>();
+			p.add(contractCode);
+			agent.execute(sql.toString(), p);
+			List<Map> list = agent.resultSetToList();
+			if (list != null && list.size() > 0) {
+				for(int i = 0 ; i < list.size() ; i++) {
+					Map map = list.get(i);
+					Object object = map.get("id");
+					lists.add(object.toString());
+				}
+			}
+		}finally {
+			if (agent != null) {
+				agent.close();
+			}
+		}
+		return lists;
+	}
+
 
 }

v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/dao/IFinancingContractDao.java

@@ -26,6 +26,42 @@ public interface IFinancingContractDao {
 	 */
 	public int daleteFZFinancingSub(String contractCode) throws BusinessException, SQLException;
 
+	/**
+	 * 修改主表触发文本信息计算表数据
+	 * @param id
+	 * @return
+	 * @throws SQLException
+	 * @throws BusinessException
+	 */
+	public int updateLXFinancingbyId(String contractCodenum,String id) throws BusinessException, SQLException;
+
+	/**
+	 * 修改从表信息计算表数据
+	 * @param map
+	 * @return
+	 * @throws SQLException
+	 * @throws BusinessException
+	 */
+	public int updateLXFinancingSubbyFormId(Map<String,String> map) throws BusinessException, SQLException;
+
+	/**
+	 * 新增从表信息计算表数据
+	 * @param map
+	 * @return
+	 * @throws SQLException
+	 * @throws BusinessException
+	 */
+	public int addLXFinancingSubbyFormId(Map<String,String> map) throws BusinessException, SQLException;
+	/**
+	 * 新增从表信息计算表数据
+	 * @param num
+	 * @param formmain_id
+	 * @return
+	 * @throws SQLException
+	 * @throws BusinessException
+	 */
+	public int deleteLXFinancingSubbyFormId(String num,String formmain_id) throws BusinessException, SQLException;
+
 	/**
 	 * 查询融资合同档案中利息明细信息
 	 * @param contractCode
@@ -34,5 +70,14 @@ public interface IFinancingContractDao {
 	 * @throws BusinessException
 	 */
 	public List<String> getLXFinancingSubId(String contractCode) throws BusinessException, SQLException;
+
+	/**
+	 * 查询融资合同档案ID
+	 * @param contractCode
+	 * @return
+	 * @throws SQLException
+	 * @throws BusinessException
+	 */
+	public List<String> getFZinancingid(String contractCode) throws BusinessException, SQLException;
 	
 }

v5/apps-customize/src/main/java/com/seeyon/apps/src_financing/util/FormExportUtil.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.src_financing.util;
 
+import com.seeyon.v3x.services.form.bean.FormExport;
 import com.seeyon.v3x.services.form.bean.RecordExport;
 import com.seeyon.v3x.services.form.bean.SubordinateFormExport;
 import com.seeyon.v3x.services.form.bean.ValueExport;
@@ -37,7 +38,7 @@ public class FormExportUtil {
 	
 	/**
 	 * 设置从表信息
-	 * @param map 设置主表字段。List<Map<显示名称,数据值>>
+	 * @param lists 设置主表字段。List<Map<显示名称,数据值>>
 	 */
 	public List<SubordinateFormExport> setSubordinateFormValue(List<Map<String, Object>> lists){
 		List<SubordinateFormExport> subordinateFormExports = new ArrayList<SubordinateFormExport>();
@@ -56,6 +57,132 @@ public class FormExportUtil {
 	
     	return subordinateFormExports;
 	}
+
+	/**
+	 * 修改从表信息
+	 * @param lists 设置主表字段。List<Map<显示名称,数据值>>
+	 */
+	public FormExport updateSubordinateFormValue(FormExport formExport,List<Map<String, Object>> lists){
+//		获取明细表对象列表
+		List<SubordinateFormExport> subordinateFormExports = formExport.getSubordinateForms();
+//		获取第一个明细表对象
+		SubordinateFormExport subordinateFormExport =subordinateFormExports.get(0);
+//		获取明细行对象
+		List<RecordExport> recordExports = subordinateFormExport.getValues();
+//		判断明细行与当前明细行是否匹配
+		int differ = recordExports.size()-lists.size();
+		if(differ==0){
+			for(int i = 0 ; i < recordExports.size() ;i++){
+				RecordExport recordExport = recordExports.get(i);
+				List<ValueExport> records = recordExport.getRecord();
+				Map<String, Object> map = lists.get(i);
+					for(int n = 0 ; n < records.size();n++){
+					ValueExport record = records.get(n);
+					if(map.containsKey(record.getDisplayName())){
+						record.setValue(map.get(record.getDisplayName()).toString());
+						records.set(n,record);
+					}
+				}
+			}
+		}else if (differ<0){
+			for(int i = 0 ; i < recordExports.size() ;i++){
+				RecordExport recordExport = recordExports.get(i);
+				List<ValueExport> records = recordExport.getRecord();
+				Map<String, Object> map = lists.get(i);
+//				for(ValueExport record : records){
+				for(int n = 0 ; n < records.size(); n++){
+					ValueExport record = records.get(n);
+					if(map.containsKey(record.getDisplayName())){
+						record.setValue(map.get(record.getDisplayName()).toString());
+						records.set(n,record);
+					}
+				}
+				recordExport.setRecord(records);
+				recordExports.set(i,recordExport);
+			}
+		}else if (differ>0){
+			for(int i = 0 ; i < recordExports.size() ;i++){
+				RecordExport recordExport = recordExports.get(i);
+				List<ValueExport> records = recordExport.getRecord();
+				if(i<lists.size()){
+					Map<String, Object> map = lists.get(i);
+//					for(ValueExport record : records){
+					for(int n = 0 ;n< records.size() ; n++){
+						ValueExport record = records.get(n);
+						if(map.containsKey(record.getDisplayName())){
+							record.setValue(map.get(record.getDisplayName()).toString());
+							records.set(n,record);
+						}
+					}
+					recordExport.setRecord(records);
+					recordExports.set(i,recordExport);
+				}else{
+					recordExports.remove(i);
+				}
+			}
+			List<ValueExport> valueExports ;
+			for(int i = 0 ; i<differ ; i++){
+				RecordExport recordExport = new RecordExport();
+        		valueExports = setFormValue(lists.get(i));
+        		recordExport.setRecord(valueExports);
+        		recordExports.add(recordExport);
+			}
+		}
+		subordinateFormExport.setValues(recordExports);
+		subordinateFormExports.set(0,subordinateFormExport);
+		formExport.setSubordinateForms(subordinateFormExports);
+//		List<SubordinateFormExport> subordinateFormExports = new ArrayList<SubordinateFormExport>();
+//    	SubordinateFormExport subordinateFormExport = new SubordinateFormExport();
+//    	List<RecordExport> recordExports = new ArrayList<RecordExport>();
+//    	List<ValueExport> valueExports;
+//    	RecordExport recordExport;
+//    	for(int i = 0 ; i < lists.size() ; i++) {
+//    		recordExport = new RecordExport();
+//        	valueExports = setFormValue(lists.get(i));
+//        	recordExport.setRecord(valueExports);
+//        	recordExports.add(recordExport);
+//    	}
+//    	subordinateFormExport.setValues(recordExports);
+//    	subordinateFormExports.add(subordinateFormExport);
+//
+//    	return subordinateFormExports;
+		return formExport;
+	}
+
+
+
+	/**
+	 * 	修改主表信息
+	 * @param map 设置主表字段。Map<主表显示名称,主表数据>
+	 * @return
+	 */
+	public FormExport updateFormValue(FormExport formExport, Map<String, Object> map){
+		List<ValueExport> valueExports = formExport.getValues();
+		for(int i = 0 ; i < valueExports.size();i++){
+			ValueExport valueExport = valueExports.get(i);
+			if(map.containsKey(valueExport.getDisplayName()) ){
+				valueExport.setValue(map.get(valueExport.getDisplayName()).toString());
+				valueExports.set(i,valueExport);
+			}
+		}
+		formExport.setValues(valueExports);
+////		创建返回值对象
+////		List<ValueExport> valueExports = new ArrayList<ValueExport>();
+//		ValueExport valueExport ;
+////		获取参数信息（显示名称）
+//		Set<String> keys = map.keySet();
+//		if(keys.size()>0) {
+////			对控件赋值
+//			for (String key : keys) {
+//				valueExport = new ValueExport();
+//				valueExport.setDisplayName(key);
+//				valueExport.setValue(map.get(key).toString());
+//				valueExports.add(valueExport);
+//			}
+//		}
+		return formExport;
+	}
+
 	
 	
 	

v5/apps-customize/src/main/java/com/seeyon/apps/src_ydctleasebill/controller/YdctLeaseBillController.java

@@ -113,7 +113,6 @@ public class YdctLeaseBillController extends BaseController {
                     leaseBillDao.deleteBillById(ids.get(i));
                 }
             }
-
             String code = bdidValue;
 //            开始日期
             String startDateStr = jsonObject.getString("startDate");

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCashCommonNode.java

@@ -0,0 +1,247 @@
+package com.seeyon.apps.ydctu8c;
+
+import cn.hutool.log.Log;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.seeyon.apps.common.config.ICstConfigApi;
+import com.seeyon.apps.common.plugin.vo.ConfigVo;
+import com.seeyon.apps.common.workflow.constants.WorkFlowType;
+import com.seeyon.apps.common.workflow.node.ACommonSuperNode;
+import com.seeyon.apps.ext.workflow.vo.FieldDataVo;
+import com.seeyon.apps.ext.workflow.vo.FormDataVo;
+import com.seeyon.apps.ext.workflow.vo.SuperNodeContext;
+import com.seeyon.apps.ydctu8c.constants.U8cConstants;
+import com.seeyon.apps.ydctu8c.util.Cap4ReturnUtil;
+import com.seeyon.apps.ydctu8c.util.ParamUtil;
+import com.seeyon.apps.ydctu8c.util.U8cHttpUtil;
+import com.seeyon.apps.ydctu8c.vo.U8cResponse;
+import com.seeyon.cap4.form.api.FormDataApi4Cap4;
+import com.seeyon.cap4.form.bean.FormDataMasterBean;
+import com.seeyon.ctp.common.AppContext;
+
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
+
+
+/**
+ * 功能描述:<br>
+ * <pre>
+ *
+ * </pre>
+ *
+ * @Author: HuangZhengguo
+ * @Date: 2024/4/28
+ */
+public abstract class U8CCashCommonNode extends ACommonSuperNode {
+
+//    private static Log log = LogFactory.getLog(U8CCommonNode.class);
+    private static Log log = Log.get(U8CCashCommonNode.class);
+    protected ICstConfigApi cstConfigApi = (ICstConfigApi) AppContext.getBean("cstConfigApi");
+
+    @Override
+    public String getPluginId() {
+        return U8cConstants.getPluginId();
+    }
+
+    @Override
+    public String getFormParse() {
+        return "json";
+    }
+
+    @Override
+    public WorkFlowType[] getTypes() {
+        return new WorkFlowType[] {WorkFlowType.superNode};
+    }
+
+    public ConfigVo getU8cConfig() {
+        return cstConfigApi.getConfig(getPluginId());
+    }
+
+    protected FormDataApi4Cap4 formDataApi4Cap4;
+
+    public void setFormDataApi4Cap4(FormDataApi4Cap4 formDataApi4Cap4) {
+        this.formDataApi4Cap4 = formDataApi4Cap4;
+    }
+
+
+    @Override
+    public SuperNodeContext proceed(String request, FormDataVo formDataVo, FormDataMasterBean formDataMasterBean) throws Exception {
+        SuperNodeContext context = new SuperNodeContext();
+        log.info("开始处理结算单据"+getNodeId());
+        ParamUtil paramUtil = new ParamUtil();
+        String param = paramUtil.param(request,getMethod(),formDataVo);
+        Cap4ReturnUtil cap4ReturnUtil = new Cap4ReturnUtil();
+        try {
+            if("/u8cloud/api/cmp/sj/audit".equals(getMethod())){
+                FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果收");
+                String value = fhjg.getStringValue();
+                if(value.startsWith("推送U8C成功")) {
+                        return context.success("跳过：" + value);
+                }
+            }
+        } catch (Exception e) {
+            context.setException(true);
+            context.back("处理异常:OA跳过处理异常：" + e.getMessage());
+            formDataVo.getNewFieldDataMap().put("U8C-返回结果", "处理异常:OA跳过处理异常：" + e.getMessage());
+        }
+        ConfigVo configVo = getU8cConfig();
+        context.setNeedSave(true);
+        String url = configVo.getParamVal(U8cConstants.u8cUrl.name());
+        url += getMethod();
+        context.setRequest(param);
+        context.setUrl(url);
+        try {
+            String u8cSystem = configVo.getParamVal(U8cConstants.u8cSystem.name());
+            String u8cUsercode = configVo.getParamVal(U8cConstants.u8cUsercode.name());
+            String u8cPassword = configVo.getParamVal(U8cConstants.u8cPassword.name());
+            String u8cContentType = configVo.getParamVal(U8cConstants.u8cContentType.name());
+            String u8cConnection = configVo.getParamVal(U8cConstants.u8cConnection.name());
+            log.info(param);
+            String response = U8cHttpUtil.doPost(url, param,u8cSystem,u8cUsercode,u8cPassword,u8cConnection,u8cContentType);
+            log.info(response);
+            U8cResponse u8cResponse = U8cHttpUtil.parseResponse(response);
+//          生成单据成功
+            if(u8cResponse.isSuccess()) {
+//                设置审核单参数
+                JSONObject auditObject = new JSONObject();
+                JSONArray bills = new JSONArray();
+                JSONObject bill = new JSONObject();
+//                设置的单据编号
+                String data = u8cResponse.getData();
+                JSONArray jsonArray = (JSONArray) JSON.parse(data);
+                JSONObject jsonObject = jsonArray.getJSONObject(0);
+                JSONObject parentvo = jsonObject.getJSONObject("parentvo");
+                log.info("单据编号："+parentvo);
+                bill.put("djbh",parentvo.getString("djbh"));
+//                设置公司编码
+                JSONObject paramJSON =JSON.parseObject(param);
+                log.info("请求参数"+paramJSON);
+                JSONArray billvoparams = paramJSON.getJSONArray("billvo");
+                JSONObject billvoparam = billvoparams.getJSONObject(0);
+                JSONObject parentvoparam = billvoparam.getJSONObject("parentvo");
+                bill.put("dwbm",parentvoparam.getString("dwbm"));
+//                设置审核人编码
+                FieldDataVo shrbm = formDataVo.getFieldData("U8C-审核人编码");
+                bill.put("operatorid",shrbm.getStringValue());
+                bills.add(bill);
+                auditObject.put("bills",bills);
+                log.info("审核请求参数："+auditObject.toString());
+//                调用审核单接口
+                String auditUrl =  configVo.getParamVal(U8cConstants.u8cUrl.name());
+                if("/u8cloud/api/cmp/fj/insert".equals(getMethod())){
+                    auditUrl = auditUrl+"/u8cloud/api/cmp/fj/audit";
+                }else if ("/u8cloud/api/cmp/sj/insert".equals(getMethod())){
+                    auditUrl = auditUrl+"/u8cloud/api/cmp/sj/audit";
+                }else if("/u8cloud/api/cmp/hj/insert".equals(getMethod())){
+                    auditUrl = auditUrl+"/u8cloud/api/cmp/hj/audit";
+                }
+                log.info("审核请求地址"+auditUrl);
+                String auditResponse = "";
+                try{
+                    auditResponse = U8cHttpUtil.doPost(auditUrl, auditObject.toString(),u8cSystem,u8cUsercode,u8cPassword,u8cConnection,u8cContentType);
+//                处理审核单返回接口
+                log.info("审核返回："+auditResponse);
+                }catch (Exception e){
+//                    审核异常调用删除接口删除生成数据
+                    JSONObject deleteObject = new JSONObject();
+                    JSONObject deleteinfo = new JSONObject();
+                    deleteinfo.put("coperator",parentvo.getString("lrr"));
+                    deleteObject.put("deleteinfo",deleteinfo);
+                    JSONObject queryinfo = new JSONObject();
+                    queryinfo.put("djrq_from",parentvo.getString("djrq"));
+                    queryinfo.put("djrq_to",parentvo.getString("djrq"));
+                    queryinfo.put("dwbm",parentvoparam.getString("dwbm"));
+                    queryinfo.put("djbh_from",parentvo.getString("djbh"));
+                    queryinfo.put("djbh_to",parentvo.getString("djbh"));
+                    deleteObject.put("queryinfo",queryinfo);
+//                    单据审核失败删除单据
+                    String deleteUrl =  configVo.getParamVal(U8cConstants.u8cUrl.name());;
+                    if("/u8cloud/api/cmp/fj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/fj/delete";
+                    }else if ("/u8cloud/api/cmp/sj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/sj/delete";
+                    }else if("/u8cloud/api/cmp/hj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/hj/delete";
+                    }
+                    String deletejson = U8cHttpUtil.doPost(deleteUrl, deleteObject.toString(),u8cSystem,u8cUsercode,u8cPassword,u8cConnection,u8cContentType);
+                    log.info("审核异常删除已保存单据返回结果"+deletejson);
+                    context.setResponse("OA单据审核处理异常："+e.toString());
+                    context.setErrMsg(auditResponse);
+                    context.back("推送U8C失败：" + auditResponse+"OA异常："+e.toString());
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败：" + auditResponse+"OA异常："+e.toString());
+                    return context;
+                }
+                U8cResponse auditU8cResponse = U8cHttpUtil.parseResponse(auditResponse);
+                if(auditU8cResponse.isSuccess()) {
+                    log.info("审核参数处理完成"+auditU8cResponse);
+                    log.info("审核数据"+u8cResponse.getData());
+                    log.info("审核推送成功显示"+u8cResponse.getStatus());
+                    cap4ReturnUtil.setParamReturn(getMethod(),u8cResponse,formDataVo,getNodeId());
+                    log.info("参数处理完成"+u8cResponse);
+                    log.info(u8cResponse.getData());
+                    log.info("推送成功显示"+u8cResponse.getStatus());
+                    context.setResponse(auditResponse);
+                    context.success("推送U8C成功:" + u8cResponse.getStatus(), false);
+                    if("DiaoBoYdctCollectionNode".equals(getNodeId())){
+                        formDataVo.getNewFieldDataMap().put("U8C-返回结果收", "推送U8C成功:" + u8cResponse.getStatus());
+                    }else if ("DiaoBoYdctPaymentNode".equals(getNodeId())){
+                        formDataVo.getNewFieldDataMap().put("U8C-返回结果付", "推送U8C成功:" + u8cResponse.getStatus());
+                    }else if ("DiaoBoYdctRemittanceNode".equals(getNodeId())){
+                        formDataVo.getNewFieldDataMap().put("U8C-返回结果付", "推送U8C成功:" + u8cResponse.getStatus());
+                        formDataVo.getNewFieldDataMap().put("U8C-返回结果收", "推送U8C成功:" + u8cResponse.getStatus());
+                    }else if ("ExamineYdctCollectionNode".equals(getNodeId())){
+                    }else if ("ExamineYdctPaymentNode".equals(getNodeId())){
+                    }else if ("ZiJindiaoboExamineYdctCollectionNode".equals(getNodeId())){
+                    }else if ("ZiJindiaoboExamineYdctPaymentNode".equals(getNodeId())){
+                    }else{
+                        formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C成功:" + u8cResponse.getStatus());
+                    }
+                } else {
+//                    设置单据删除参数
+                    //                设置审核单参数
+                    JSONObject deleteObject = new JSONObject();
+                    JSONObject deleteinfo = new JSONObject();
+                    deleteinfo.put("coperator",parentvo.getString("lrr"));
+                    deleteObject.put("deleteinfo",deleteinfo);
+                    JSONObject queryinfo = new JSONObject();
+                    queryinfo.put("djrq_from",parentvo.getString("djrq"));
+                    queryinfo.put("djrq_to",parentvo.getString("djrq"));
+                    queryinfo.put("dwbm",parentvoparam.getString("dwbm"));
+                    queryinfo.put("djbh_from",parentvo.getString("djbh"));
+                    queryinfo.put("djbh_to",parentvo.getString("djbh"));
+                    deleteObject.put("queryinfo",queryinfo);
+                    log.info("删除单据请求参数"+deleteObject);
+//                    单据审核失败删除单据
+                    String deleteUrl =  configVo.getParamVal(U8cConstants.u8cUrl.name());;
+                    if("/u8cloud/api/cmp/fj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/fj/delete";
+                    }else if ("/u8cloud/api/cmp/sj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/sj/delete";
+                    }else if("/u8cloud/api/cmp/hj/insert".equals(getMethod())){
+                        deleteUrl = deleteUrl+"/u8cloud/api/cmp/hj/delete";
+                    }
+                    log.info("删除单据请求URL"+deleteUrl);
+                    String deletejson = U8cHttpUtil.doPost(deleteUrl, deleteObject.toString(),u8cSystem,u8cUsercode,u8cPassword,u8cConnection,u8cContentType);
+                    log.info("审核报错删除已保存单据返回结果"+deletejson);
+                    context.setResponse(auditResponse);
+                    context.setErrMsg(auditU8cResponse.getMsg());
+                    context.back("推送U8C失败：" + auditU8cResponse.getMsg());
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:" + auditU8cResponse.getMsg());
+                }
+            } else {
+                context.setResponse(response);
+                context.setErrMsg(u8cResponse.getMsg());
+                context.back("推送U8C失败：" + u8cResponse.getMsg());
+                formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:" + u8cResponse.getMsg());
+            }
+        } catch (Exception e) {
+            context.back("推送U8C失败：OA处理异常：" + e.getMessage());
+            formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:OA处理异常" + e.getMessage());
+        }
+        return context;
+    }
+
+
+    public abstract String getMethod();
+}

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/U8CCommonNode.java

@@ -71,13 +71,34 @@ public abstract class U8CCommonNode extends ACommonSuperNode {
         String param = paramUtil.param(request,getMethod(),formDataVo);
         Cap4ReturnUtil cap4ReturnUtil = new Cap4ReturnUtil();
         try {
-            FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果");
+            if(!("/u8cloud/api/cmp/sj/audit".equals(getMethod())||
-            String value = fhjg.getStringValue();
+                    "/u8cloud/api/cmp/fj/audit".equals(getMethod())||
-            if(value.startsWith("推送BIP成功")) {
+                    "/u8cloud/api/uapbd/custdoc/assign".equals(getMethod()))){
-                return context.success("跳过：" + value);
+                if("DiaoBoYdctCollectionNode".equals(getNodeId())){
+                    FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果收");
+                    String value = fhjg.getStringValue();
+                    if(value.startsWith("推送U8C成功")) {
+                        return context.success("跳过：" + value);
+                    }
+                }else if("DiaoBoYdctPaymentNode".equals(getNodeId())){
+                    FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果付");
+                    String value = fhjg.getStringValue();
+                    if(value.startsWith("推送U8C成功")) {
+                        return context.success("跳过：" + value);
+                    }
+                }else{
+                    FieldDataVo fhjg = formDataVo.getFieldData("U8C-返回结果");
+                    String value = fhjg.getStringValue();
+                    if(value.startsWith("推送U8C成功")) {
+                        return context.success("跳过：" + value);
+                    }
+                }
             }
         } catch (Exception e) {
-
+            e.printStackTrace();
+            context.setException(true);
+            context.back("处理异常:OA跳过处理异常：" + e.getMessage());
+            formDataVo.getNewFieldDataMap().put("U8C-返回结果", "处理异常:OA跳过处理异常：" + e.getMessage());
         }
         ConfigVo configVo = getU8cConfig();
         context.setNeedSave(true);
@@ -106,19 +127,31 @@ public abstract class U8CCommonNode extends ACommonSuperNode {
                     formDataVo.getNewFieldDataMap().put("U8C-返回结果收", "推送U8C成功:" + u8cResponse.getStatus());
                 }else if ("DiaoBoYdctPaymentNode".equals(getNodeId())){
                     formDataVo.getNewFieldDataMap().put("U8C-返回结果付", "推送U8C成功:" + u8cResponse.getStatus());
+                }else if ("DiaoBoYdctRemittanceNode".equals(getNodeId())){
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果付", "推送U8C成功:" + u8cResponse.getStatus());
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果收", "推送U8C成功:" + u8cResponse.getStatus());
+                }else if ("ExamineYdctCollectionNode".equals(getNodeId())){
+                }else if ("ExamineYdctPaymentNode".equals(getNodeId())){
+                }else if ("ZiJindiaoboExamineYdctCollectionNode".equals(getNodeId())){
+                }else if ("ZiJindiaoboExamineYdctPaymentNode".equals(getNodeId())){
                 }else{
                     formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C成功:" + u8cResponse.getStatus());
                 }
-
             } else {
-                context.setErrMsg(u8cResponse.getMsg());
+                if(u8cResponse.getMsg().contains("单据已经签字确认")){
-                context.setException(true);
+                    context.success("推送U8C成功:" + u8cResponse.getStatus(), false);
-                context.back("推送U8C失败：" + u8cResponse.getMsg());
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C成功:" + u8cResponse.getStatus());
-                formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:" + u8cResponse.getMsg());
+                }else{
+                    context.setErrMsg(u8cResponse.getMsg());
+                    context.setException(true);
+                    context.back("推送U8C失败：" + u8cResponse.getMsg());
+                    formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:" + u8cResponse.getMsg());
+                }
             }
         } catch (Exception e) {
+            e.printStackTrace();
             context.setException(true);
-            context.back("推送BIP失败：OA处理异常：" + e.getMessage());
+            context.back("推送U8C失败：OA处理异常：" + e.getMessage());
             formDataVo.getNewFieldDataMap().put("U8C-返回结果", "推送U8C失败:OA处理异常" + e.getMessage());
         }
         return context;

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/CaiLiaocaigouYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class CaiLiaocaigouYdctPaymentNode extends U8CCommonNode {
+public class CaiLiaocaigouYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ChaiLvbaoxiaoYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class ChaiLvbaoxiaoYdctPaymentNode extends U8CCommonNode {
+public class ChaiLvbaoxiaoYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/DiaoBoYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class DiaoBoYdctCollectionNode extends U8CCommonNode {
+public class DiaoBoYdctCollectionNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/DiaoBoYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class DiaoBoYdctPaymentNode extends U8CCommonNode {
+public class DiaoBoYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/DiaoBoYdctRemittanceNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class DiaoBoYdctRemittanceNode extends U8CCommonNode {
+public class DiaoBoYdctRemittanceNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ExamineYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ExamineYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/FeiYongbaoxiaoYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class FeiYongbaoxiaoYdctPaymentNode extends U8CCommonNode {
+public class FeiYongbaoxiaoYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/GongHuibaoxiaoYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class GongHuibaoxiaoYdctPaymentNode extends U8CCommonNode {
+public class GongHuibaoxiaoYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/HeTongfukuanYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class HeTongfukuanYdctPaymentNode extends U8CCommonNode {
+public class HeTongfukuanYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/HeTongshoukuanYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class HeTongshoukuanYdctCollectionNode extends U8CCommonNode {
+public class HeTongshoukuanYdctCollectionNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/JieZhiYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class JieZhiYdctPaymentNode extends U8CCommonNode {
+public class JieZhiYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/RongZihuankuanYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class RongZihuankuanYdctPaymentNode extends U8CCommonNode {
+public class RongZihuankuanYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/RongZijiekuanYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class RongZijiekuanYdctCollectionNode extends U8CCommonNode {
+public class RongZijiekuanYdctCollectionNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ShouKuanYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class ShouKuanYdctCollectionNode extends U8CCommonNode {
+public class ShouKuanYdctCollectionNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/TingCheshoukanYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class TingCheshoukanYdctCollectionNode extends U8CCommonNode {
+public class TingCheshoukanYdctCollectionNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/TongYongzhifuYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class TongYongzhifuYdctPaymentNode extends U8CCommonNode {
+public class TongYongzhifuYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/XiangMubofuYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class XiangMubofuYdctPaymentNode extends U8CCommonNode {
+public class XiangMubofuYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/XiangMuzhifuYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class XiangMuzhifuYdctPaymentNode extends U8CCommonNode {
+public class XiangMuzhifuYdctPaymentNode extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZiChanFuKuanYdctPaymentNode.java

@@ -1,8 +1,9 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
-public class ZuLinFuKuanYdctPaymentNode  extends U8CCommonNode {
+public class ZiChanFuKuanYdctPaymentNode  extends U8CCashCommonNode {
     @Override
     public String getMethod() {
         return "/u8cloud/api/cmp/fj/insert";
@@ -10,11 +11,11 @@ public class ZuLinFuKuanYdctPaymentNode  extends U8CCommonNode {
 
     @Override
     public String getNodeId() {
-        return "ZongHeYdctPaymentNode";
+        return "ZiChanFuKuanYdctPaymentNode";
     }
 
     @Override
     public String getNodeName() {
-        return "YDCT租赁财务付款结算推送U8C付款结算单";
+        return "YDCT资产财务付款结算推送U8C付款结算单";
     }
 }

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZiChanShouKuanYdctCollectionNode.java

@@ -1,8 +1,9 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
-public class ZuLinShouKuanYdctCollectionNode  extends U8CCommonNode {
+public class ZiChanShouKuanYdctCollectionNode  extends U8CCashCommonNode {
     @Override
     public String getMethod() {
         return "/u8cloud/api/cmp/sj/insert";
@@ -10,11 +11,11 @@ public class ZuLinShouKuanYdctCollectionNode  extends U8CCommonNode {
 
     @Override
     public String getNodeId() {
-        return "ZuLinShouKuanYdctCollectionNode";
+        return "ZiChanShouKuanYdctCollectionNode";
     }
 
     @Override
     public String getNodeName() {
-        return "YDCT租赁财务收款结算推送U8C收款结算单";
+        return "YDCT资产财务收款结算推送U8C收款结算单";
     }
 }

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZiJindiaoboExamineYdctCollectionNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZiJindiaoboExamineYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZiJindiaoboExamineYdctRemittanceNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZongHeYdctExamineNode.java

@@ -0,0 +1,30 @@
+package com.seeyon.apps.ydctu8c.cash.node;
+
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
+
+/**
+ * 功能描述:<br>
+ * <pre>
+ *
+ * </pre>
+ *
+ * @Author: HuangZhengguo
+ * @Date: 2024/9/19
+ */
+public class ZongHeYdctExamineNode extends U8CCashCommonNode {
+
+    @Override
+    public String getMethod() {
+        return "/u8cloud/api/cmp/sj/insert";
+    }
+
+    @Override
+    public String getNodeId() {
+        return "ZongHeYdctExamineNode";
+    }
+
+    @Override
+    public String getNodeName() {
+        return "YDCT综合合同收款审批推送U8C付款结算单";
+    }
+}

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/cash/node/ZongHeYdctPaymentNode.java

@@ -1,5 +1,6 @@
 package com.seeyon.apps.ydctu8c.cash.node;
 
+import com.seeyon.apps.ydctu8c.U8CCashCommonNode;
 import com.seeyon.apps.ydctu8c.U8CCommonNode;
 
 /**
@@ -11,7 +12,7 @@ import com.seeyon.apps.ydctu8c.U8CCommonNode;
  * @Author: HuangZhengguo
  * @Date: 2024/9/19
  */
-public class ZongHeYdctPaymentNode  extends U8CCommonNode {
+public class ZongHeYdctPaymentNode  extends U8CCashCommonNode {
 
     @Override
     public String getMethod() {

v5/apps-customize/src/main/java/com/seeyon/apps/ydctu8c/util/ParamUtil.java

@@ -134,7 +134,7 @@ public class ParamUtil {
         JSONObject billvo = jsonObject.getJSONObject("billvo");
         JSONArray childrens = new JSONArray();
         Map<String, List<FormDataVo>> map =  formDataVo.getSubFormMap();
-        List<FormDataVo> formDataVos = map.get("结算明细付");
+        List<FormDataVo> formDataVos = map.get("U8C-结算明细付");
         for(int i = 0 ; i < formDataVos.size() ; i++){
             FormDataVo subformDataVo = formDataVos.get(i);
             FieldDataVo zy = subformDataVo.getFieldData("U8C-摘要明细表付");

v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/src_ydctdatasync/spring/spring.xml

@@ -6,9 +6,9 @@
 		<property name="config">
 			<bean class="com.seeyon.apps.src_ydctdatasync.config.DataSourceConfig">
 				<property name="driver" value="com.mysql.jdbc.Driver"/>
-				<property name="url" value="jdbc:mysql://127.0.0.1:3306/ydzb_oa?serverTimezone=Asia/Shanghai&amp;useSSL=false&amp;allowPublicKeyRetrieval=true"/>
+				<property name="url" value="jdbc:mysql://10.13.24.40:3316/ydzb_oa?serverTimezone=Asia/Shanghai&amp;useSSL=false&amp;allowPublicKeyRetrieval=true"/>
 				<property name="username" value="root"/>
-				<property name="password" value="123456"/>
+				<property name="password" value="Ydzb!@#123"/>
 			</bean>
 		</property>
 	</bean>

v5/apps-customize/src/main/webapp/WEB-INF/cfgHome/plugin/ydctu8c/spring/spring-node.xml

@@ -26,6 +26,7 @@
     <bean id="shouKuanYdctCollectionNode" class="com.seeyon.apps.ydctu8c.cash.node.ShouKuanYdctCollectionNode" />
     <bean id="xiangMuzhifuYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.XiangMuzhifuYdctPaymentNode" />
     <bean id="zongHeYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.ZongHeYdctPaymentNode" />
+    <bean id="zongHeYdctExamineNode" class="com.seeyon.apps.ydctu8c.cash.node.ZongHeYdctExamineNode" />
     <bean id="xiangMubofuYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.XiangMubofuYdctPaymentNode" />
     <bean id="tingCheshoukanYdctCollectionNode" class="com.seeyon.apps.ydctu8c.cash.node.TingCheshoukanYdctCollectionNode" />
     <bean id="examineYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.ExamineYdctPaymentNode" />
@@ -35,8 +36,8 @@
     <bean id="tongYongzhifuYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.TongYongzhifuYdctPaymentNode" />
     <bean id="ziJindiaoboExamineYdctRemittanceNode" class="com.seeyon.apps.ydctu8c.cash.node.ZiJindiaoboExamineYdctRemittanceNode" />
     <bean id="diaoBoYdctRemittanceNode" class="com.seeyon.apps.ydctu8c.cash.node.DiaoBoYdctRemittanceNode" />
-    <bean id="zuLinShouKuanYdctCollectionNode" class="com.seeyon.apps.ydctu8c.cash.node.ZuLinShouKuanYdctCollectionNode" />
+    <bean id="ziChanShouKuanYdctCollectionNode" class="com.seeyon.apps.ydctu8c.cash.node.ZiChanShouKuanYdctCollectionNode" />
-    <bean id="zuLinFuKuanYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.ZuLinFuKuanYdctPaymentNode" />
+    <bean id="ziChanFuKuanYdctPaymentNode" class="com.seeyon.apps.ydctu8c.cash.node.ZiChanFuKuanYdctPaymentNode" />
 
 </beans>
 

v5/apps-customize/src/main/webapp/apps_res/cap/customCtrlResources/interestMeasurementResources/js/openUnflow.js

@@ -136,18 +136,18 @@
                                         display: res.num+'' //字段渲染在页面上的显示值，通常是经过format后的值
                                     }
                                 };
-                                // csdk.core.setFieldData(data);
+                                csdk.core.setFieldData(data);
-                                // var data1 = {
+                                var data1 = {
-                                //     fieldId: 'field0215',
+                                    fieldId: 'field0215',
-                                //     fieldData: {
+                                    fieldData: {
-                                //         value: randomNum+'', //数据值，存入数据库中的value值
+                                        value: randomNum+'', //数据值，存入数据库中的value值
-                                //         display: randomNum+'' //字段渲染在页面上的显示值，通常是经过format后的值
+                                        display: randomNum+'' //字段渲染在页面上的显示值，通常是经过format后的值
-                                //     }
+                                    }
-                                // };
+                                };
-                                // csdk.core.setFieldData(data1);
+                                csdk.core.setFieldData(data1);
 
 
-                                csdk.core.patchData(res.data.data.data.tableData);
+                                // csdk.core.patchData(res.data.data.data.tableData);
                                 // csdk.core.preSave(function(err, data){
                                 //     if (err) {
                                 //         //调用失败