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

updates

Browse Source
webservice
calyrex 5 months ago
parent 28df091d4d
commit c35bd596a1
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -46,13 +46,13 @@ public class TransUtil {
if ("".equals(selectvalue)) { if ("".equals(selectvalue)) {
return selectname; return selectname;
} }
String sql = "SELECT c.value_key AS selectvalue\n" + String sql = "SELECT c.name AS selectname\n" +
"FROM form_field a, form_table b, field_option c\n" + "FROM e10_core_business.dbo.form_field a, e10_core_business.dbo.form_table b, e10_core_business.dbo.field_option c\n" +
"WHERE a.form_id = b.form_id\n" + "WHERE a.form_id = b.form_id\n" +
" AND c.field_id = a.id\n" + " AND c.field_id = a.id\n" +
" AND b.table_name = '"+tableName+"'\n" + " AND b.table_name = '"+tableName+"'\n" +
" AND a.data_key = '"+filedname+"'\n" + " AND a.data_key = '"+filedname+"'\n" +
" AND c.name = '"+selectname+"'\n" + " AND c.value_key = '"+selectvalue+"'\n" +
" AND a.delete_type = 0\n" + " AND a.delete_type = 0\n" +
" AND a.tenant_key = 't6kj9c07jr'\n" + " AND a.tenant_key = 't6kj9c07jr'\n" +
" AND b.delete_type = 0\n" + " AND b.delete_type = 0\n" +

3
secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java
Unescape Escape View File

@ -127,7 +127,8 @@ public class VenMatExtHandlerServiceServiceStub extends org.apache.axis2.client.
public VenMatExtHandlerServiceServiceStub() throws org.apache.axis2.AxisFault { public VenMatExtHandlerServiceServiceStub() throws org.apache.axis2.AxisFault {
//TODO config //TODO config
// this(Prop.getPropValue("htsrmoasync","SrmVenMatExtnew") ); // this(Prop.getPropValue("htsrmoasync","SrmVenMatExtnew") );
this(configProp.getSrmVenMatExtnew()); // this(configProp.getSrmVenMatExtnew());
this("http://10.6.6.155:8080/srm/services/OaSrmVenMatExtService");
} }

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

@ -85,8 +85,8 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe
String gh = map.get("GH"); String gh = map.get("GH");
// 申请部门 // 申请部门
String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM")); String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM"));
// 审核人 // TODO custom 审核人
String shr = resourcecominfo.getResourcename(requestinfo.getLastoperator()); String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp));
// 供应商类型 // 供应商类型
String gyslx = map.get("GYSLX"); String gyslx = map.get("GYSLX");
// 测试53251 正式59387 // 测试53251 正式59387

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

@ -60,7 +60,8 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
String requestid = requestinfo.getRequestid(); String requestid = requestinfo.getRequestid();
String workflowid = requestinfo.getWorkflowid(); String workflowid = requestinfo.getWorkflowid();
TransUtil tu = new TransUtil(); TransUtil tu = new TransUtil();
String tablename = tu.getTableName(workflowid); // String tablename = tu.getTableName(workflowid);
String tablename = requestinfo.getRequestManager().getBillTableName();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
logger_a864d799.info(String.valueOf("OaSrmVendorCheckAction--start--" + requestid)); logger_a864d799.info(String.valueOf("OaSrmVendorCheckAction--start--" + requestid));
try { try {
@ -102,7 +103,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe
// 申请部门 // 申请部门
String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM")); String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM"));
// 审核人 // 审核人
String shr = resourcecominfo.getResourcename(requestinfo.getLastoperator()); String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp));
// 申请类型 // 申请类型
String sqlx = map.get("SQLX"); String sqlx = map.get("SQLX");
// 供应商类型 // 供应商类型

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

@ -55,7 +55,8 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
String requestid = requestinfo.getRequestid(); String requestid = requestinfo.getRequestid();
String workflowid = requestinfo.getWorkflowid(); String workflowid = requestinfo.getWorkflowid();
TransUtil tu = new TransUtil(); TransUtil tu = new TransUtil();
String tablename = tu.getTableName(workflowid); // String tablename = tu.getTableName(workflowid);
String tablename = requestinfo.getRequestManager().getBillTableName();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
logger_a5e612ac.info(String.valueOf("OaSrmVendorReapplyAction--start:" + requestid)); logger_a5e612ac.info(String.valueOf("OaSrmVendorReapplyAction--start:" + requestid));
try { try {
@ -70,6 +71,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
String value = Util.null2String(aproperty[i].getValue()); String value = Util.null2String(aproperty[i].getValue());
map.put(name, value); map.put(name, value);
} }
logger_a5e612ac.info("map--" + map);
String ckxz = map.get("CKXZ"); String ckxz = map.get("CKXZ");
if ("0".equals(ckxz)) { if ("0".equals(ckxz)) {
// 是否推送erp // 是否推送erp
@ -91,7 +93,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer
// 申请部门 // 申请部门
String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM")); String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM"));
// 审核人 // 审核人
String shr = resourcecominfo.getResourcename(requestinfo.getLastoperator()); String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp));
// 供应商类型 // 供应商类型
String gyslx = map.get("GYSLX"); String gyslx = map.get("GYSLX");
// 1 原材料货源， 2 OEM货源 // 1 原材料货源， 2 OEM货源

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

@ -55,7 +55,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
String requestid = requestinfo.getRequestid(); String requestid = requestinfo.getRequestid();
String workflowid = requestinfo.getWorkflowid(); String workflowid = requestinfo.getWorkflowid();
TransUtil tu = new TransUtil(); TransUtil tu = new TransUtil();
String tablename = tu.getTableName(workflowid); // String tablename = tu.getTableName(workflowid);
String tablename = requestinfo.getRequestManager().getBillTableName();
RecordSet rs = I18nContextUtil.getBean(RecordSet.class); RecordSet rs = I18nContextUtil.getBean(RecordSet.class);
logger_41a64316.info(String.valueOf("OaSrmVendorSyncAction--start:" + requestid)); logger_41a64316.info(String.valueOf("OaSrmVendorSyncAction--start:" + requestid));
try { try {
@ -89,7 +90,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
// 申请部门 // 申请部门
String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM")); String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM"));
// 审核人 // 审核人
String shr = resourcecominfo.getResourcename(requestinfo.getLastoperator()); String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp));
// 供应商类型 // 供应商类型
String gyslx = map.get("GYSLX"); String gyslx = map.get("GYSLX");
// 1 原材料货源， 2 OEM货源 // 1 原材料货源， 2 OEM货源
@ -139,7 +140,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
oainputvendor.setSyncErp(Integer.valueOf(sftserp)); oainputvendor.setSyncErp(Integer.valueOf(sftserp));
} }
int dtcount = 0; int dtcount = 0;
String sql = "select b.* from " + tablename + " a," + tablename + "_dt3 b where a.id=b.mainid and a.requestid=" + requestid; String sql = "select b.* from e10_core_business.dbo." + tablename + " a,e10_core_business.dbo." + tablename + "_dt3 b where a.form_data_id=b.form_data_id and a.id=" + requestid;
logger_41a64316.info(String.valueOf("sql-->" + sql)); logger_41a64316.info(String.valueOf("sql-->" + sql));
String poolname = CONN_TYPE.workflow.getType(); String poolname = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
@ -215,7 +216,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
// 当前明细表的所有数据,按行存储 // 当前明细表的所有数据,按行存储
Row[] sq = dtq.getRow(); Row[] sq = dtq.getRow();
int dtcount = 0; int dtcount = 0;
String sql = "select distinct wlh from " + tablename + " a," + tablename + "_dt2 b where a.id=b.mainid and a.requestid=" + requestid; 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;
logger_41a64316.info("sql-->" + sql); logger_41a64316.info("sql-->" + sql);
String poolname_wk = CONN_TYPE.workflow.getType(); String poolname_wk = CONN_TYPE.workflow.getType();
// TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源
@ -308,6 +309,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer
param.setInputTab(paramInfo); param.setInputTab(paramInfo);
// OaSrmVenMatExtService service = new OaSrmVenMatExtService(); // OaSrmVenMatExtService service = new OaSrmVenMatExtService();
// //
logger_41a64316.info("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";

Write Preview
Loading…
Cancel
Save