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 77b82446..1fc0e40f 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
@@ -93,10 +93,10 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
                 singleObj.put("materialPreparationPlanNumber", pickmHeadVO.getVbillcode());// 备料计划单号
                 singleObj.put("bipId", pickmHeadVO.getCpickmid());// 主键ID
                 // 生产部门
-                String deptsql = " select name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
+                String deptsql = " select code,name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
                 Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
                 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
-                singleObj.put("bipDeptId", pickmHeadVO.getCdeptid()); // 生产部门Id
+                singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
 
                 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
                 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
@@ -172,10 +172,10 @@ public class AfterApproveRuleHighpressureMes implements IRule<AggPickmVO> {
                 singleObj.put("materialPreparationPlanNumber", pickmHeadVO.getVbillcode());// 备料计划单号
                 singleObj.put("bipId", pickmHeadVO.getCpickmid());// 主键ID
                 // 生产部门
-                String deptsql = " select name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
+                String deptsql = " select code,name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
                 Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
                 singleObj.put("bipDeptName", dept.get("name")); // 生产部门
-                singleObj.put("bipDeptId", pickmHeadVO.getCdeptid()); // 生产部门Id
+                singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
 
                 singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
                 singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterQtyUpdRuleHighpressureMes.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterQtyUpdRuleHighpressureMes.java
index f74be5a0..6e846163 100644
--- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterQtyUpdRuleHighpressureMes.java
+++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/rule/AfterQtyUpdRuleHighpressureMes.java
@@ -86,10 +86,10 @@ public class AfterQtyUpdRuleHighpressureMes implements IRule<AggPickmVO> {
             singleObj.put("materialPreparationPlanNumber", pickmHeadVO.getVbillcode());// 备料计划单号
             singleObj.put("bipId", pickmHeadVO.getCpickmid());// 主键ID
             // 生产部门
-            String deptsql = " select name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
+            String deptsql = " select code,name from org_dept  where  pk_dept='" + pickmHeadVO.getCdeptid() + "' and  dr=0 ";
             Map<String, Object> dept = (Map<String, Object>) baseDAO.executeQuery(deptsql, new MapProcessor());
             singleObj.put("bipDeptName", dept.get("name")); // 生产部门
-            singleObj.put("bipDeptId", pickmHeadVO.getCdeptid()); // 生产部门Id
+            singleObj.put("bipDeptId", dept.get("code")); // 生产部门编码
 
             singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
             singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号