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

secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java

@@ -64,16 +64,13 @@ public class TransUtil {
 
 	public Map<String,String> getDTtripMt(String workcode){
 		RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
-//		String poolname = CONN_TYPE.ebuilder.getType();
+		String poolname = "E10JTZH";
-//		rs.setTenantKey("t6kj9c07jr");//集团租户key
+//		rs.setTenantKey(tenantKey);
-		String poolname ="E10JTZH";
 		Map<String,String> map = new HashMap<>();
 		if("".equals(workcode)){
 			return map;
 		}
-		Map<String,String> rymap = getResourceInfoByworkcode(workcode);
+		String sql = "select a.* from e10_common.dbo.uf_tcdjmt a,eteams.dbo.employee b,eteams.dbo.department c  where  b.DEPARTMENT =c.id and c.subcompanyid =a.gs and b.job_num ='"+workcode+"' and a.delete_type=0";
-		String subcompanyid1 = rymap.get("subcompanyid1");
-		String sql = "select a.* from e10_common.dbo.uf_tcdjmt a where a.gs ='"+subcompanyid1+"' and a.delete_type=0";
 		rs.executeSql(sql, poolname);
 		if(rs.next()){
 			map.put("account",Util.null2String(rs.getString("zh")));

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

@@ -283,6 +283,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
                         logger_a864d799.error(String.valueOf(requestid + "申请转正供应商为线下供应商"));
                     }
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
+                    if(detailtable.length > 1){
                         // 指定明细表
                         DetailTable dtq = null;
                         if(dtq != null){
@@ -424,6 +425,8 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
                             }
                         }
                     }
+
+                }
                 if (!"S".equals(state)) {
                     requestinfo.getRequestManager().setMessageid("error");
                     requestinfo.getRequestManager().setMessagecontent(message);

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

@@ -233,6 +233,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
                         StringBuilder sb = new StringBuilder();
                         DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
                         // 指定明细表
+                        if(detailtable.length > 1 ){
                             DetailTable dtq = detailtable[1];
                             // 当前明细表的所有数据,按行存储
                             Row[] sq = dtq.getRow();
@@ -366,6 +367,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
                                 logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
                             }
                         }
+                    }
                     if (!"S".equals(state)) {
                         requestinfo.getRequestManager().setMessageid("error");
                         requestinfo.getRequestManager().setMessagecontent(message);

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

@@ -228,6 +228,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                 if ("S".equals(state)) {
                     Set<String> set = new HashSet<String>();
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
+                    if(detailtable.length > 1){
                         // 指定明细表
                         DetailTable dtq = null;
                         if(dtq != null){
@@ -343,6 +344,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
                             logger_41a64316.error(String.valueOf(requestid + "调用货源关系接口同步数据返回值" + message));
                         }
                     }
+                }
                 if (!"S".equals(state)) {
                     requestinfo.getRequestManager().setMessagecontent(message);
                     return  WeaResult.fail(500, "OaSrmVendorSyncAction message"+ message, getResultMapForAction(weaverResultMap, "result",message, requestinfo.getRequestManager()));

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

@@ -140,6 +140,7 @@ public class ZOA_SD_CREDIT_HANDLE_APPROVALAction extends BaseBean implements Act
                 if (!sta.equals("S")) {
                     request.getRequestManager().setMessageid("100001");
                     request.getRequestManager().setMessagecontent(meg);
+
                 } else {
                     try {
                         CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes times = new CRM_SyncUnFreezeTimesStub.CRM_OA_SyncUnFreezeTimes();

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

@@ -50,7 +50,7 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                 for (int j = 0; j < aproperty.length; j++) {
                     String name = aproperty[j].getName().toUpperCase();
                     String value = Util.null2String(aproperty[j].getValue());
-                    if ("XXJLLX".equals(name)) {
+                    if ("xxjllx".equals(name)) {
                         xxjllx = value;
                     }
                 }
@@ -65,7 +65,7 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                     if (sq1.length == 0) {
                         requestinfo.getRequestManager().setMessageid("ERROR");
                         requestinfo.getRequestManager().setMessagecontent("请填写黄金实际价信息明细！");
-                        return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
+                        return  WeaResult.fail(500, "请填写黄金实际价信息明细！", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager()));
                     }
                     Set<String> set = new HashSet<String>();
                     for (int k = 0; k < sq1.length; k++) {
@@ -83,13 +83,13 @@ public class ZSRM_PUR_INFO_CheckAction extends BaseBean implements Action, EsbSe
                     if (set.size() > 1) {
                         requestinfo.getRequestManager().setMessageid("ERROR");
                         requestinfo.getRequestManager().setMessagecontent("黄金实际价信息多行明细里的公司代码要保持一致！");
-                        return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
+                        return  WeaResult.fail(500, "黄金实际价信息多行明细里的公司代码要保持一致！", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager()));
                     }
                 } else {
                     if (sq1.length > 0) {
                         requestinfo.getRequestManager().setMessageid("ERROR");
                         requestinfo.getRequestManager().setMessagecontent("信息记录类型不是黄金实际价时，不需要填写黄金实际价信息明细！");
-                        return WeaResult.success(getResultMapForAction(weaverResultMap, "result", Action.SUCCESS, requestinfo.getRequestManager()));
+                        return  WeaResult.fail(500, "信息记录类型不是黄金实际价时，不需要填写黄金实际价信息明细！", getResultMapForAction(weaverResultMap, "result", "", requestinfo.getRequestManager()));
                     }
                 }
                 DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();

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

@@ -55,7 +55,7 @@ public class ZSRM_PUR_INFO_GY132_CheckAction extends BaseBean implements Action,
                 logger_69d789ca.error("sync -----" + sync);
                 if ("0".equals(sync)) {
                     DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
-                    DetailTable dtq = detailtable[1];
+                    DetailTable dtq = detailtable[2];
                     Row[] sq = dtq.getRow();
                     if (sq.length > 0) {
                         String[][] str = new String[sq.length][21];