From c35bd596a11fc4b4989109c816653f8a86321cca Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Wed, 25 Dec 2024 15:09:28 +0800 Subject: [PATCH] updates --- .../seconddev/interfaces/htjt/util/TransUtil.java | 6 +++--- .../srmoa/VenMatExtHandlerServiceServiceStub.java | 5 +++-- .../workflow/action/OaSrmVendorAdmitAction.java | 4 ++-- .../workflow/action/OaSrmVendorCheckAction.java | 5 +++-- .../workflow/action/OaSrmVendorReapplyAction.java | 6 ++++-- .../workflow/action/OaSrmVendorSyncAction.java | 13 ++++++++----- 6 files changed, 23 insertions(+), 16 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java index 9b628d3..5e44ceb 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/htjt/util/TransUtil.java @@ -46,13 +46,13 @@ public class TransUtil { if ("".equals(selectvalue)) { return selectname; } - String sql = "SELECT c.value_key AS selectvalue\n" + - "FROM form_field a, form_table b, field_option c\n" + + String sql = "SELECT c.name AS selectname\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" + " AND c.field_id = a.id\n" + " AND b.table_name = '"+tableName+"'\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.tenant_key = 't6kj9c07jr'\n" + " AND b.delete_type = 0\n" + diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java index 4f8cf51..361e5b4 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/srmoa/VenMatExtHandlerServiceServiceStub.java @@ -127,8 +127,9 @@ public class VenMatExtHandlerServiceServiceStub extends org.apache.axis2.client. public VenMatExtHandlerServiceServiceStub() throws org.apache.axis2.AxisFault { //TODO config // this(Prop.getPropValue("htsrmoasync","SrmVenMatExtnew") ); - this(configProp.getSrmVenMatExtnew()); - +// this(configProp.getSrmVenMatExtnew()); + this("http://10.6.6.155:8080/srm/services/OaSrmVenMatExtService"); + } /** diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java index 5c69cbe..825d5aa 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorAdmitAction.java @@ -85,8 +85,8 @@ public class OaSrmVendorAdmitAction extends BaseBean implements Action, EsbServe String gh = map.get("GH"); // 申请部门 String sqbm = departmentComInfo.getDepartmentName(map.get("SQBM")); - // 审核人 - String shr = resourcecominfo.getResourcename(requestinfo.getLastoperator()); + // TODO custom 审核人 + String shr = resourcecominfo.getResourcename(String.valueOf(userIdTemp)); // 供应商类型 String gyslx = map.get("GYSLX"); // 测试53251 正式59387 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java index 9214a25..c92d0bd 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorCheckAction.java @@ -60,7 +60,8 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe String requestid = requestinfo.getRequestid(); String workflowid = requestinfo.getWorkflowid(); 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); logger_a864d799.info(String.valueOf("OaSrmVendorCheckAction--start--" + requestid)); try { @@ -102,7 +103,7 @@ public class OaSrmVendorCheckAction extends BaseBean implements Action, EsbServe // 申请部门 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"); // 供应商类型 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java index 079e81b..8ed4b1d 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorReapplyAction.java @@ -55,7 +55,8 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer String requestid = requestinfo.getRequestid(); String workflowid = requestinfo.getWorkflowid(); 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); logger_a5e612ac.info(String.valueOf("OaSrmVendorReapplyAction--start:" + requestid)); try { @@ -70,6 +71,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer String value = Util.null2String(aproperty[i].getValue()); map.put(name, value); } + logger_a5e612ac.info("map--" + map); String ckxz = map.get("CKXZ"); if ("0".equals(ckxz)) { // 是否推送erp @@ -91,7 +93,7 @@ public class OaSrmVendorReapplyAction extends BaseBean implements Action, EsbSer // 申请部门 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"); // 1 原材料货源， 2 OEM货源 diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java index 30c75c6..f669487 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/OaSrmVendorSyncAction.java @@ -55,7 +55,8 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer String requestid = requestinfo.getRequestid(); String workflowid = requestinfo.getWorkflowid(); 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); logger_41a64316.info(String.valueOf("OaSrmVendorSyncAction--start:" + requestid)); try { @@ -89,7 +90,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer // 申请部门 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"); // 1 原材料货源， 2 OEM货源 @@ -139,7 +140,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer oainputvendor.setSyncErp(Integer.valueOf(sftserp)); } 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)); String poolname = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -215,7 +216,7 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer // 当前明细表的所有数据,按行存储 Row[] sq = dtq.getRow(); 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); String poolname_wk = CONN_TYPE.workflow.getType(); // TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源 @@ -307,7 +308,9 @@ public class OaSrmVendorSyncAction extends BaseBean implements Action, EsbServer paramInfo.setResourceType(resourceType); param.setInputTab(paramInfo); // OaSrmVenMatExtService service = new OaSrmVenMatExtService(); - // + // + + logger_41a64316.info("param--" + param + ",requestid--" + requestid); String[] str = service.sendsrm(param, requestid); if ("1".equals(str[0])) { state = "S";