Merge remote-tracking branch 'origin/ht' into ht

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_Action.java

@@ -2,6 +2,8 @@ package com.weaver.seconddev.interfaces.workflow.action;
 
 import java.util.HashMap;
 import java.util.Map;
+
+import com.alibaba.fastjson.JSONObject;
 import  com.weaver.seconddev.interfaces.swfa.BillFieldUtil;
 import com.weaver.common.i18n.tool.util.I18nContextUtil;
 import com.weaver.seconddev.interfaces.workflow.util.CommonDevUtil;
@@ -66,8 +68,16 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
                 StringBuilder sb = new StringBuilder();
                 String state = "";
-                if(detailtable.length >0 && "formtable_main_464_dt1".equals( detailtable[0].getTableDBName())){
+                if(detailtable.length >1 || (detailtable.length==1&&"formtable_main_464_dt1".equals(detailtable[0].getTableDBName()))){
-                    DetailTable dtq = detailtable[0];
+                    DetailTable dtq = null;
+                    if(detailtable.length==1) {
+                        dtq = detailtable[0];
+                    }else{
+                        dtq = detailtable[1];
+                    }
+                    logger_78218549.error(dtq.getTableDBName());
+                    logger_78218549.error("workflow_action_ZSRM_PUR_INFO_CheckAction  dtq---->"+ JSONObject.toJSONString(dtq));
+
                     Row[] sq = dtq.getRow();
                     if (sq.length > 0) {
                         logger_78218549.error("sqlength");
@@ -162,7 +172,7 @@ public class ZSRM_PUR_INFO_Action extends BaseBean implements Action, EsbServerl
                 boolean b = rs.executeSql(sql, poolname);
                 logger_78218549.error("b -----"+ b);
             } catch (Exception e) {
-                logger_78218549.error(String.valueOf("ZSRM_PUR_INFO_Action-error-" + requestid + "-[" + e.toString() + "]"));
+                logger_78218549.error("ZSRM_PUR_INFO_Action-error--",e );
                 requestinfo.getRequestManager().setMessagecontent("调用SAP接口同步数据出错：" + e.toString());
                 return  WeaResult.fail(500, "调用SAP接口同步数据出错：" + e, getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager()));
             }

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java

@@ -60,13 +60,14 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                 }
                 logger_9ad0d62b.error("xxjllx -----"+ xxjllx);
                 DetailTable[] detailtable1 = requestinfo.getDetailTableInfo().getDetailTable();
+                logger_9ad0d62b.error("detailtable1 length--"+detailtable1.length+",detailtable1[0].getTableDBName()--"+detailtable1[0].getTableDBName());
                 if(detailtable1.length >1 || (detailtable1.length==1&&"formtable_main_464_dt2".equals(detailtable1[0].getTableDBName()))){
                     DetailTable dtq1 = null;
-                    if(detailtable1.length==1){
+
                     dtq1 = detailtable1[0];
-                    }else {
+                    logger_9ad0d62b.error(dtq1.getTableDBName());
-                        dtq1 = detailtable1[1];
+
-                    }
+                    logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  dtq1---->"+ JSONObject.toJSONString(dtq1));
                     Row[] sq1 = dtq1.getRow();
                     logger_9ad0d62b.error("sq1 -----"+ sq1.toString());
                     if ("4".equals(xxjllx)) {
@@ -104,8 +105,15 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                 }
 
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                if(detailtable.length >0 && "formtable_main_464_dt1".equals( detailtable[0].getTableDBName())){
+                logger_9ad0d62b.error("detailtable1 length--"+detailtable.length+",detailtable1[0].getTableDBName()--"+detailtable[0].getTableDBName());
-                    DetailTable dtq = detailtable[0];
+                if(detailtable.length >1 || (detailtable1.length==1&&"formtable_main_464_dt1".equals(detailtable1[0].getTableDBName()))){
+                    DetailTable dtq = null;
+                    if(detailtable.length==1) {
+                        dtq = detailtable[0];
+                    }else{
+                        dtq = detailtable[1];
+                    }
+                    logger_9ad0d62b.error(dtq.getTableDBName());
                     logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  dtq---->"+ JSONObject.toJSONString(dtq));
                     Row[] sq = dtq.getRow();
                     if (sq.length > 0) {