rj
/
ht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
ht
calyrex 3 months ago
parent 14a7130986 ac0b7957f1
commit 2d8844680b
7 changed files with 374 additions and 369 deletions
Show Stats Download Patch File Download Diff File

9
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java
Unescape Escape View File

@ -64,16 +64,13 @@ public class TransUtil {
public Map<String,String> getDTtripMt(String workcode){ public Map<String,String> getDTtripMt(String workcode){
RecordSet rs = I18nContextUtil.getBean(RecordSet.class); 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<>(); Map<String,String> map = new HashMap<>();
if("".equals(workcode)){ if("".equals(workcode)){
return map; 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); rs.executeSql(sql, poolname);
if(rs.next()){ if(rs.next()){
map.put("account",Util.null2String(rs.getString("zh"))); map.put("account",Util.null2String(rs.getString("zh")));

263
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java
Unescape Escape View File

@ -283,146 +283,149 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
logger_a864d799.error(String.valueOf(requestid + "申请转正供应商为线下供应商")); logger_a864d799.error(String.valueOf(requestid + "申请转正供应商为线下供应商"));
} }
DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
// 指定明细表 if(detailtable.length > 1){
DetailTable dtq = null; // 指定明细表
if(dtq != null){ DetailTable dtq = null;
dtq = detailtable[1]; if(dtq != null){
} dtq = detailtable[1];
// 当前明细表的所有数据,按行存储 }
Row[] sq = null; // 当前明细表的所有数据,按行存储
if(dtq != null){sq = dtq.getRow();} Row[] sq = null;
if (sq != null && sq.length > 0 && "S".equals(state)) { if(dtq != null){sq = dtq.getRow();}
Set<String> set = new HashSet<String>(); if (sq != null && sq.length > 0 && "S".equals(state)) {
Set<String> wlhset = new HashSet<String>(); Set<String> set = new HashSet<String>();
List<String> list = new ArrayList<String>(); Set<String> wlhset = new HashSet<String>();
StringBuilder sb = new StringBuilder(); List<String> list = new ArrayList<String>();
int dtcount = 0; StringBuilder sb = new StringBuilder();
String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid; int dtcount = 0;
logger_a864d799.error("sql-->" + sql); String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid;
String poolname_4c = CONN_TYPE.workflow.getType(); logger_a864d799.error("sql-->" + sql);
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String poolname_4c = CONN_TYPE.workflow.getType();
boolean b = rs.executeSql(sql, poolname_4c); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
logger_a864d799.error(String.valueOf("b--" + b)); boolean b = rs.executeSql(sql, poolname_4c);
dtcount = rs.getCounts(); logger_a864d799.error(String.valueOf("b--" + b));
logger_a864d799.error(String.valueOf(requestid + " dt2count:" + dtcount)); dtcount = rs.getCounts();
if ( sq != null && sq.length <= 300) { logger_a864d799.error(String.valueOf(requestid + " dt2count:" + dtcount));
SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); if ( sq != null && sq.length <= 300) {
VenMatExtResultIn paramInfo = new VenMatExtResultIn(); SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; VenMatExtResultIn paramInfo = new VenMatExtResultIn();
String wlhs = ""; VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount];
String flagwl = ""; String wlhs = "";
int itemnum = 0; String flagwl = "";
for (int j = 0; j < sq.length; j++) { int itemnum = 0;
// 指定行 for (int j = 0; j < sq.length; j++) {
Row rq = sq[j]; // 指定行
Cell[] cq = rq.getCell(); Row rq = sq[j];
VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); Cell[] cq = rq.getCell();
String isexists = "0"; VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn();
logger_a864d799.error(String.valueOf(requestid + " wlhs:" + wlhs)); String isexists = "0";
for (int k = 0; k < cq.length; k++) { logger_a864d799.error(String.valueOf(requestid + " wlhs:" + wlhs));
// 指定列 for (int k = 0; k < cq.length; k++) {
Cell cq1 = cq[k]; // 指定列
// 明细字段名称 Cell cq1 = cq[k];
String nameq = cq1.getName().toLowerCase(); // 明细字段名称
// 明细字段的值 String nameq = cq1.getName().toLowerCase();
String valueq = Util.null2String(cq1.getValue()); // 明细字段的值
if ("cgzzbm".equals(nameq)) { String valueq = Util.null2String(cq1.getValue());
set.add(valueq); if ("cgzzbm".equals(nameq)) {
} set.add(valueq);
if ("wlh".equals(nameq)) { }
if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { if ("wlh".equals(nameq)) {
logger_a864d799.error(String.valueOf(requestid + " 物料号重复:" + valueq)); if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) {
isexists = "1"; logger_a864d799.error(String.valueOf(requestid + " 物料号重复:" + valueq));
continue; isexists = "1";
continue;
}
itemIn.setMaterialCode(valueq);
list.add(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_a864d799.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
}
if ("clfl".equals(nameq)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436
// 测试53290 正式59436
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
itemIn.setMaterialCode(valueq);
list.add(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_a864d799.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
} }
if ("clfl".equals(nameq)) { if ("1".equals(isexists)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 logger_a864d799.error(String.valueOf(requestid + " 物料号重复:跳过"));
// 测试53290 正式59436 continue;
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
item[itemnum] = itemIn;
itemnum++;
} }
if ("1".equals(isexists)) { if (list.size() > 0) {
logger_a864d799.error(String.valueOf(requestid + " 物料号重复:跳过")); // for(String s:list){
continue; // boolean flag = wlhset.add(s);
} // if(!flag){
item[itemnum] = itemIn; // sb.append("物料号-"+s+"-存在重复；");
itemnum++; // }
} // }
if (list.size() > 0) { if (sb != null && sb.length() > 0) {
// for(String s:list){
// boolean flag = wlhset.add(s);
// if(!flag){
// sb.append("物料号-"+s+"-存在重复；");
// }
// }
if (sb != null && sb.length() > 0) {
state = "E";
message = sb.toString();
logger_a864d799.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} else {
// if(set.size()==1){
String purOrgCodes = "";
String flag = "";
Iterator it = set.iterator();
while (it.hasNext()) {
purOrgCodes = purOrgCodes + flag + it.next();
flag = ";";
}
logger_a864d799.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes));
paramInfo.setApplyUser(gh);
paramInfo.setCheckUser(shr);
paramInfo.setCompanyCode(sqdwbm);
paramInfo.setCompanyName(sqdw);
paramInfo.setVendorCode(gysbm);
paramInfo.setVendorName(gysmc);
paramInfo.setHandleType("0");
paramInfo.setRequestId("GY103/" + requestid);
paramInfo.setStartDate(map.get("SQRQ"));
paramInfo.setEndDate("2099-12-31");
paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setItems(item);
paramInfo.setFreezeReason("");
logger_a864d799.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setResourceType(resourceType);
param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService();
String[] str = service.sendsrm(param, requestid);
if ("1".equals(str[0])) {
state = "S";
} else {
state = "E"; state = "E";
message = sb.toString();
logger_a864d799.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} else {
// if(set.size()==1){
String purOrgCodes = "";
String flag = "";
Iterator it = set.iterator();
while (it.hasNext()) {
purOrgCodes = purOrgCodes + flag + it.next();
flag = ";";
}
logger_a864d799.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes));
paramInfo.setApplyUser(gh);
paramInfo.setCheckUser(shr);
paramInfo.setCompanyCode(sqdwbm);
paramInfo.setCompanyName(sqdw);
paramInfo.setVendorCode(gysbm);
paramInfo.setVendorName(gysmc);
paramInfo.setHandleType("0");
paramInfo.setRequestId("GY103/" + requestid);
paramInfo.setStartDate(map.get("SQRQ"));
paramInfo.setEndDate("2099-12-31");
paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setItems(item);
paramInfo.setFreezeReason("");
logger_a864d799.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setResourceType(resourceType);
param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService();
String[] str = service.sendsrm(param, requestid);
if ("1".equals(str[0])) {
state = "S";
} else {
state = "E";
}
message = str[1];
logger_a864d799.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message));
// }else{
// state = "E";
// message = "一次只能申请一个采购组织的";
// writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message);
// }
} }
message = str[1];
logger_a864d799.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message));
// }else{
// state = "E";
// message = "一次只能申请一个采购组织的";
// writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message);
// }
} }
} else {
state = "E";
message = "明细表明细行不能超过300行，请分开申请！";
logger_a864d799.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} }
} else {
state = "E";
message = "明细表明细行不能超过300行，请分开申请！";
logger_a864d799.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} }
} }
} }
if (!"S".equals(state)) { if (!"S".equals(state)) {
requestinfo.getRequestManager().setMessageid("error"); requestinfo.getRequestManager().setMessageid("error");

248
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java
Unescape Escape View File

@ -233,137 +233,139 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
// 指定明细表 // 指定明细表
DetailTable dtq = detailtable[1]; if(detailtable.length > 1 ){
// 当前明细表的所有数据,按行存储 DetailTable dtq = detailtable[1];
Row[] sq = dtq.getRow(); // 当前明细表的所有数据,按行存储
int dtcount = 0; Row[] sq = dtq.getRow();
String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid; int dtcount = 0;
logger_a5e612ac.error("sql-->" + sql); String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id=" + requestid;
String poolname_uh = CONN_TYPE.workflow.getType(); logger_a5e612ac.error("sql-->" + sql);
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String poolname_uh = CONN_TYPE.workflow.getType();
boolean b = rs.executeSql(sql, poolname_uh); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
logger_a5e612ac.error(String.valueOf(requestid + "调用查询接口返回：" + b)); boolean b = rs.executeSql(sql, poolname_uh);
dtcount = rs.getCounts(); logger_a5e612ac.error(String.valueOf(requestid + "调用查询接口返回：" + b));
logger_a5e612ac.error(String.valueOf(requestid + " dt2count:" + dtcount)); dtcount = rs.getCounts();
if (sq.length <= 300) { logger_a5e612ac.error(String.valueOf(requestid + " dt2count:" + dtcount));
SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); if (sq.length <= 300) {
VenMatExtResultIn paramInfo = new VenMatExtResultIn(); SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; VenMatExtResultIn paramInfo = new VenMatExtResultIn();
String wlhs = ""; VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount];
String flagwl = ""; String wlhs = "";
int itemnum = 0; String flagwl = "";
for (int j = 0; j < sq.length; j++) { int itemnum = 0;
// 指定行 for (int j = 0; j < sq.length; j++) {
Row rq = sq[j]; // 指定行
Cell[] cq = rq.getCell(); Row rq = sq[j];
VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); Cell[] cq = rq.getCell();
String isexists = "0"; VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn();
logger_a5e612ac.error(String.valueOf(requestid + " wlhs:" + wlhs)); String isexists = "0";
for (int k = 0; k < cq.length; k++) { logger_a5e612ac.error(String.valueOf(requestid + " wlhs:" + wlhs));
// 指定列 for (int k = 0; k < cq.length; k++) {
Cell cq1 = cq[k]; // 指定列
// 明细字段名称 Cell cq1 = cq[k];
String nameq = cq1.getName().toLowerCase(); // 明细字段名称
// 明细字段的值 String nameq = cq1.getName().toLowerCase();
String valueq = Util.null2String(cq1.getValue()); // 明细字段的值
if ("cgzzbm".equals(nameq)) { String valueq = Util.null2String(cq1.getValue());
set.add(valueq); if ("cgzzbm".equals(nameq)) {
} set.add(valueq);
if ("wlh".equals(nameq)) { }
if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { if ("wlh".equals(nameq)) {
logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:" + valueq)); if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) {
isexists = "1"; logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:" + valueq));
continue; isexists = "1";
continue;
}
itemIn.setMaterialCode(valueq);
list.add(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
// String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
// itemIn.setMaterialName(wlms);
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_a5e612ac.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
}
if ("clfl".equals(nameq)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436
// 测试53290 正式59436
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
itemIn.setMaterialCode(valueq);
list.add(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
// String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
// itemIn.setMaterialName(wlms);
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_a5e612ac.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
} }
if ("clfl".equals(nameq)) { if ("1".equals(isexists)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:跳过"));
// 测试53290 正式59436 continue;
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
item[itemnum] = itemIn;
itemnum++;
} }
if ("1".equals(isexists)) { if (list.size() > 0) {
logger_a5e612ac.error(String.valueOf(requestid + " 物料号重复:跳过")); // for(String s:list){
continue; // boolean flag = wlhset.add(s);
} // if(!flag){
item[itemnum] = itemIn; // sb.append("物料号-"+s+"-存在重复；");
itemnum++; // }
} // }
if (list.size() > 0) { if (sb != null && sb.length() > 0) {
// for(String s:list){
// boolean flag = wlhset.add(s);
// if(!flag){
// sb.append("物料号-"+s+"-存在重复；");
// }
// }
if (sb != null && sb.length() > 0) {
state = "E";
message = sb.toString();
logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} else {
// if(set.size()==1){
String purOrgCodes = "";
String flag = "";
Iterator it = set.iterator();
while (it.hasNext()) {
purOrgCodes = purOrgCodes + flag + it.next();
flag = ";";
}
logger_a5e612ac.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes));
paramInfo.setApplyUser(gh);
paramInfo.setCheckUser(shr);
paramInfo.setCompanyCode(sqdwbm);
paramInfo.setCompanyName(sqdw);
paramInfo.setVendorCode(gysbm);
paramInfo.setVendorName(gysmc);
paramInfo.setHandleType("0");
paramInfo.setRequestId("GY103/" + requestid);
paramInfo.setStartDate(map.get("SQRQ"));
paramInfo.setEndDate("2099-12-31");
paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setItems(item);
paramInfo.setFreezeReason("");
logger_a5e612ac.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setResourceType(resourceType);
param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService();
//
String[] str = service.sendsrm(param, requestid);
if ("1".equals(str[0])) {
state = "S";
} else {
state = "E"; state = "E";
message = sb.toString();
logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} else {
// if(set.size()==1){
String purOrgCodes = "";
String flag = "";
Iterator it = set.iterator();
while (it.hasNext()) {
purOrgCodes = purOrgCodes + flag + it.next();
flag = ";";
}
logger_a5e612ac.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes));
paramInfo.setApplyUser(gh);
paramInfo.setCheckUser(shr);
paramInfo.setCompanyCode(sqdwbm);
paramInfo.setCompanyName(sqdw);
paramInfo.setVendorCode(gysbm);
paramInfo.setVendorName(gysmc);
paramInfo.setHandleType("0");
paramInfo.setRequestId("GY103/" + requestid);
paramInfo.setStartDate(map.get("SQRQ"));
paramInfo.setEndDate("2099-12-31");
paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setItems(item);
paramInfo.setFreezeReason("");
logger_a5e612ac.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setResourceType(resourceType);
param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService();
//
String[] str = service.sendsrm(param, requestid);
if ("1".equals(str[0])) {
state = "S";
} else {
state = "E";
}
message = str[1];
logger_a5e612ac.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message));
// }else{
// state = "E";
// message = "一次只能申请一个采购组织的";
// writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message);
// }
} }
message = str[1];
logger_a5e612ac.error(String.valueOf(requestid + "调用货源关系接口校验数据返回值" + message));
// }else{
// state = "E";
// message = "一次只能申请一个采购组织的";
// writeLog(requestid+" 用户申请货源关系转正数据不符合要求："+message);
// }
} }
} else {
state = "E";
message = "明细表明细行不能超过300行，请分开申请！";
logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} }
} else {
state = "E";
message = "明细表明细行不能超过300行，请分开申请！";
logger_a5e612ac.error(String.valueOf(requestid + " 用户申请货源关系转正数据不符合要求：" + message));
} }
} }
if (!"S".equals(state)) { if (!"S".equals(state)) {

212
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java
Unescape Escape View File

@ -228,119 +228,121 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
if ("S".equals(state)) { if ("S".equals(state)) {
Set<String> set = new HashSet<String>(); Set<String> set = new HashSet<String>();
DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable(); DetailTable[] detailtable = requestinfo.getDetailTableInfo().getDetailTable();
// 指定明细表 if(detailtable.length > 1){
DetailTable dtq = null; // 指定明细表
if(dtq != null){ DetailTable dtq = null;
dtq = detailtable[1]; if(dtq != null){
} dtq = detailtable[1];
// 当前明细表的所有数据,按行存储 }
Row[] sq = null; // 当前明细表的所有数据,按行存储
if(dtq != null){sq = dtq.getRow();} Row[] sq = null;
int dtcount = 0; if(dtq != null){sq = dtq.getRow();}
String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id =" + requestid; int dtcount = 0;
logger_41a64316.error("sql-->" + sql); String sql = "select distinct wlh from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt2 b where a.form_data_id=b.form_data_id and a.id =" + requestid;
String poolname_wk = CONN_TYPE.workflow.getType(); logger_41a64316.error("sql-->" + sql);
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 String poolname_wk = CONN_TYPE.workflow.getType();
boolean b = rs.executeSql(sql, poolname_wk); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
logger_41a64316.error(String.valueOf("b-->" + b)); boolean b = rs.executeSql(sql, poolname_wk);
dtcount = rs.getCounts(); logger_41a64316.error(String.valueOf("b-->" + b));
logger_41a64316.error(String.valueOf(requestid + " dt2count:" + dtcount)); dtcount = rs.getCounts();
if (sq != null && sq.length <= 300 && sq.length > 0) { logger_41a64316.error(String.valueOf(requestid + " dt2count:" + dtcount));
SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT(); if (sq != null && sq.length <= 300 && sq.length > 0) {
VenMatExtResultIn paramInfo = new VenMatExtResultIn(); SRM_OA_VENMATEXT_RESULT param = new SRM_OA_VENMATEXT_RESULT();
VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount]; VenMatExtResultIn paramInfo = new VenMatExtResultIn();
String wlhs = ""; VenMatExtResultItemIn[] item = new VenMatExtResultItemIn[dtcount];
String flagwl = ""; String wlhs = "";
int itemnum = 0; String flagwl = "";
for (int j = 0; j < sq.length; j++) { int itemnum = 0;
// 指定行 for (int j = 0; j < sq.length; j++) {
Row rq = sq[j]; // 指定行
Cell[] cq = rq.getCell(); Row rq = sq[j];
VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn(); Cell[] cq = rq.getCell();
String isexists = "0"; VenMatExtResultItemIn itemIn = new VenMatExtResultItemIn();
logger_41a64316.error(String.valueOf(requestid + " wlhs:" + wlhs)); String isexists = "0";
for (int k = 0; k < cq.length; k++) { logger_41a64316.error(String.valueOf(requestid + " wlhs:" + wlhs));
// 指定列 for (int k = 0; k < cq.length; k++) {
Cell cq1 = cq[k]; // 指定列
// 明细字段名称 Cell cq1 = cq[k];
String nameq = cq1.getName().toLowerCase(); // 明细字段名称
// 明细字段的值 String nameq = cq1.getName().toLowerCase();
String valueq = Util.null2String(cq1.getValue()); // 明细字段的值
if ("cgzzbm".equals(nameq)) { String valueq = Util.null2String(cq1.getValue());
set.add(valueq); if ("cgzzbm".equals(nameq)) {
} set.add(valueq);
if ("wlh".equals(nameq)) { }
if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) { if ("wlh".equals(nameq)) {
logger_41a64316.error(String.valueOf(requestid + " 物料号重复:" + valueq)); if (("," + wlhs + ",").indexOf("," + valueq + ",") >= 0) {
isexists = "1"; logger_41a64316.error(String.valueOf(requestid + " 物料号重复:" + valueq));
continue; isexists = "1";
continue;
}
itemIn.setMaterialCode(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
// String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
// itemIn.setMaterialName(wlms);
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_41a64316.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
}
if ("clfl".equals(nameq)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436
// 测试53290 正式59436
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
itemIn.setMaterialCode(valueq);
wlhs = wlhs + flagwl + valueq;
flagwl = ",";
}
if ("wlms".equals(nameq)) {
// String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
// itemIn.setMaterialName(wlms);
String wlms = StringEscapeUtils.unescapeHtml(valueq.trim());
logger_41a64316.error(String.valueOf("wlms:" + wlms));
// String wlms_half = full2HalfWidth(wlms);
// writeLog("wlms_half:"+wlms_half);
itemIn.setMaterialName(wlms);
}
if ("xjxzb".equals(nameq)) {
itemIn.setWeight(valueq);
} }
if ("clfl".equals(nameq)) { if ("1".equals(isexists)) {
// String clfl = BillFieldUtil.getselectName(valueq,"59436");//测试53290 正式59436 logger_41a64316.error(String.valueOf(requestid + " 物料号重复:跳过"));
// 测试53290 正式59436 continue;
String clfl = tu.getSelectName(tablename, "clfl", valueq);
itemIn.setMatLevel(clfl);
} }
item[itemnum] = itemIn;
itemnum++;
} }
if ("1".equals(isexists)) { String purOrgCodes = "";
logger_41a64316.error(String.valueOf(requestid + " 物料号重复:跳过")); String flag = "";
continue; Iterator it = set.iterator();
while (it.hasNext()) {
purOrgCodes = purOrgCodes + flag + it.next();
flag = ";";
} }
item[itemnum] = itemIn; logger_41a64316.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes));
itemnum++; paramInfo.setApplyUser(gh);
} paramInfo.setCheckUser(shr);
String purOrgCodes = ""; paramInfo.setCompanyCode(sqdwbm);
String flag = ""; paramInfo.setCompanyName(sqdw);
Iterator it = set.iterator(); paramInfo.setVendorCode(gysbm);
while (it.hasNext()) { paramInfo.setVendorName(gysmc);
purOrgCodes = purOrgCodes + flag + it.next(); paramInfo.setHandleType("6");
flag = ";"; paramInfo.setRequestId("GY103/" + requestid);
} paramInfo.setStartDate(map.get("SQRQ"));
logger_41a64316.error(String.valueOf(requestid + " purOrgCodes：" + purOrgCodes)); paramInfo.setEndDate("2099-12-31");
paramInfo.setApplyUser(gh); paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setCheckUser(shr); paramInfo.setItems(item);
paramInfo.setCompanyCode(sqdwbm); paramInfo.setFreezeReason("");
paramInfo.setCompanyName(sqdw); logger_41a64316.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setVendorCode(gysbm); paramInfo.setResourceType(resourceType);
paramInfo.setVendorName(gysmc); param.setInputTab(paramInfo);
paramInfo.setHandleType("6");
paramInfo.setRequestId("GY103/" + requestid);
paramInfo.setStartDate(map.get("SQRQ"));
paramInfo.setEndDate("2099-12-31");
paramInfo.setPurOrgCode(purOrgCodes);
paramInfo.setItems(item);
paramInfo.setFreezeReason("");
logger_41a64316.error(String.valueOf(requestid + " resourceType:" + resourceType));
paramInfo.setResourceType(resourceType);
param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService(); // OaSrmVenMatExtService service = new OaSrmVenMatExtService();
// //
logger_41a64316.error("param--" + param + ",requestid--" + requestid); logger_41a64316.error("param--" + param + ",requestid--" + requestid);
String[] str = service.sendsrm(param, requestid); String[] str = service.sendsrm(param, requestid);
if ("1".equals(str[0])) { if ("1".equals(str[0])) {
state = "S"; state = "S";
} else { } else {
state = "E"; state = "E";
}
message = str[1];
logger_41a64316.error(String.valueOf(requestid + "调用货源关系接口同步数据返回值" + message));
} }
message = str[1];
logger_41a64316.error(String.valueOf(requestid + "调用货源关系接口同步数据返回值" + message));
} }
} }
if (!"S".equals(state)) { if (!"S".equals(state)) {

1
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZOA_SD_CREDIT_HANDLE_APPROVALAction.java
Unescape Escape View File

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

8
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_CheckAction.java
Unescape Escape View File

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

2
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ZSRM_PUR_INFO_GY132_CheckAction.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save