diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java index 1a3610d3..4e15723a 100644 --- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java +++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterApproveRuleHighpressureMes.java @@ -80,13 +80,7 @@ public class AfterApproveRuleHighpressureMes implements IRule { if (checkIfOrg(orgCode, configParams)) { continue; } - // 备料计划单据类型是整单委外的备料计划不需要推送mes - String billtypesql = " select pk_billtypecode from bd_billtype where pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'"; - Map sourcebilltype = (Map) baseDAO.executeQuery(billtypesql, new MapProcessor()); - if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) { - continue; - } - // 期初类型的单据不推MES,其余类型推MES + // 期初、整单委外类型的单据不推MES,其余类型推MES String billType = pickmHeadVO.getVbusitype(); if (checkBillType(billType, configParams)) { continue; diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java index 586f9147..f2f1328e 100644 --- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java +++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPickmRuleHighpressureRule.java @@ -115,13 +115,7 @@ public class AfterPickmRuleHighpressureRule implements IRule { if (checkIfOrg(orgCode, configParams)) { continue; } - // 备料计划单据类型是整单委外的备料计划不需要推送mes - String billtypesql = " select pk_billtypecode from bd_billtype where pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'"; - Map sourcebilltype = (Map) baseDAO.executeQuery(billtypesql, new MapProcessor()); - if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) { - continue; - } - // 期初类型的单据不推MES,其余类型推MES + // 期初、整单委外类型的单据不推MES,其余类型推MES String billType = pickmHeadVO.getVbusitype(); if (checkBillType(billType, configParams)) { continue; diff --git a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java index 492af9bd..675def2b 100644 --- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java +++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java @@ -73,13 +73,7 @@ public class SyncGyMesPickmUtil { if (checkIfOrg(orgCode, configParams)) { continue; } - // 备料计划单据类型是整单委外的备料计划不需要推送mes - String billtypesql = " select pk_billtypecode from bd_billtype where pk_billtypeid='" + pickmHeadVO.getVbusitypeid() + "'"; - Map sourcebilltype = (Map) baseDAO.executeQuery(billtypesql, new MapProcessor()); - if ("55A3-0002".equals(sourcebilltype.get("pk_billtypecode"))) { - continue; - } - // 期初类型的单据不推MES,其余类型推MES + // 期初、整单委外的单据不推MES,其余类型推MES String billType = pickmHeadVO.getVbusitype(); if (checkBillType(billType, configParams)) { continue;