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

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

@@ -73,15 +73,13 @@ public class SAPConn {
 //            hostname = "10.6.6.80";
 //            systemnumber = "00";
 
-            String currentTenantKey = TenantContext.getCurrentTenantKey();
+
 
             RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
             String poolname ="E10JTZH";
             String sql = "select sapclient, yh,mm,hostname, systemnumber from e10_common.dbo.uf_sapclient where delete_type = 0 and sfqy = 1";
             logger_cb5e740f.error("sql = " + sql);
             logger_cb5e740f.error("poolname = " + poolname);
-            logger_cb5e740f.error("currentTenantKey = " + currentTenantKey);
-            rs.setTenantKey(currentTenantKey);
             rs.executeSql(sql,poolname);
 
             if (rs.next()){

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

@@ -6,6 +6,8 @@ import java.util.Map;
 import java.util.Set;
 import java.lang.*;
 import java.util.*;
+
+import com.alibaba.fastjson.JSONObject;
 import com.weaver.verupgrade.workflow.request.RequestManager;
 import com.weaver.esb.api.rpc.EsbServerlessRpcRemoteInterface;
 import com.weaver.common.base.entity.result.WeaResult;
@@ -95,8 +97,9 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                     }
                 }
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                logger_9ad0d62b.error("dtq -----"+ Arrays.deepToString(detailtable));
+                logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  detailtable---->"+ JSONObject.toJSONString(detailtable));
-                DetailTable dtq = detailtable[1];
+                DetailTable dtq = detailtable[0];
+                logger_9ad0d62b.error("workflow_action_ZSRM_PUR_INFO_CheckAction  dtq---->"+ JSONObject.toJSONString(dtq));
                 Row[] sq = dtq.getRow();
                 if (sq.length > 0) {
                     String[][] str = new String[sq.length][21];

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

@@ -61,6 +61,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS
                         sync = value;
                     }
                 }
+                logger_8fd2ca4a.error("sync -----"+ sync);
                 if ("0".equals(sync)) {
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
                     DetailTable dtq = detailtable[1];
@@ -111,7 +112,7 @@ public class ZSRM_PUR_INFO_GY132_Action extends BaseBean implements Action, EsbS
                     }
                 }
             } catch (Exception e) {
-                logger_8fd2ca4a.error(String.valueOf("ZSRM_PUR_INFO_GY132_Action-error-" + requestid + "-[" + e.toString() + "]"));
+                logger_8fd2ca4a.error( "ZSRM_PUR_INFO_GY132_Action-error-" ,e);
                 requestinfo.getRequestManager().setMessageid("ERROR");
                 requestinfo.getRequestManager().setMessagecontent("调用SAP接口校验数据出错：" + e.toString());
                 String sql = "update e10_core_business.dbo." + tablename + " set state='E',message='" + e.toString() + "' where id=" + requestid;