diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java index a523015..5239ad5 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncPLMRule.java @@ -81,14 +81,14 @@ public class AfterApproveSyncPLMRule implements IRule { } // 推送到思普PLM系统 - pushToRZMOM(filteredOrders); + pushToSpPlm(filteredOrders); } catch (Exception e) { logDl.error("同步生产订单到SPPLM系统失败: " + e.getMessage()); ExceptionUtils.wrappException(e); } } - private void pushToRZMOM(List array) throws BusinessException, IOException { + private void pushToSpPlm(List array) throws BusinessException, IOException { List> resultList = new ArrayList<>(); if (array == null || array.size() == 0) { return; @@ -119,14 +119,17 @@ public class AfterApproveSyncPLMRule implements IRule { Object no = hybo.findColValue("bd_material", "code", "pk_material = '" + itemVO.getCmaterialvid() + "' "); Object name = hybo.findColValue("bd_material", "name", "pk_material = '" + itemVO.getCmaterialvid() + "' "); - Object projectName = hybo.findColValue("bd_project", "project_name", " pk_project = '" + itemVO.getCprojectid() + "' "); Object GSDM = hybo.findColValue("org_factory", "code", " pk_factory = '" + parentVO.getPk_org() + "' "); - + Map projectMap = MyHelper.getMapValByCondition("bd_project", "project_code,project_name", + "pk_project = '" + itemVO.getCprojectid() + "' "); request.put("no", no); request.put("name", name); - request.put("asuser34", projectName); + if (!projectMap.isEmpty()) { + request.put("aa003", projectMap.get("project_code")); + request.put("asuser34", projectMap.get("project_name")); + } request.put("asuser28", itemVO.getVfirstcode()); request.put("ab012", itemVO.getNastnum()); @@ -185,9 +188,11 @@ public class AfterApproveSyncPLMRule implements IRule { if (MyHelper.checkIfDldzOrg(orgCode, configParams)) { continue; } + String ctrantypeid = pmoAggVO.getParentVO().getCtrantypeid(); + String groupId = InvocationInfoProxy.getInstance().getGroupId(); Object pk_billtypecode = hybo.findColValue("bd_billtype", "pk_billtypecode", " istransaction = 'Y' and nvl ( islock, 'N' ) = 'N' and parentbilltype = '55A2' and pk_group = '" - + InvocationInfoProxy.getInstance().getGroupId() + "' and pk_billtypeid = '" + pmoAggVO.getParentVO().getCtrantypeid() + "' "); - if (pk_billtypecode.equals("55A2-Cxx-08")) { + + groupId + "' and pk_billtypeid = '" + ctrantypeid + "' "); + if ("55A2-Cxx-08".equals(pk_billtypecode)) { filteredOrders.add(pmoAggVO); } }