diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
index 9ce83e2..6fa10e8 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToBuyingreqAction.java
@@ -109,11 +109,17 @@ public class PickmToBuyingreqAction implements ICommonAction {
                 PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class);
                 if (items != null) {
                     for (PickmItemVO child : items) {
+                        //只合并项目专用料数据
+                        if(child.getBprojectmaterial().booleanValue()){
+                            mergedChildren.add(child);
+                        }
                         // CircularlyAccessibleValueObject 实现了 ISuperVO
-                        mergedChildren.add(child);
                     }
                 }
             }
+            if(mergedChildren.size() == 0){
+                continue;
+            }
 
             AggPickmVO newVO = new AggPickmVO();
             newVO.setParent(group.get(0).getParentVO());
diff --git a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
index 8c4418f..3083d6e 100644
--- a/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
+++ b/mmpac/src/client/nccloud/web/mmpac/pickm/action/PickmToPmo.java
@@ -115,11 +115,17 @@ public class PickmToPmo implements ICommonAction {
                 PickmItemVO[] items = (PickmItemVO[]) vo.getChildren(PickmItemVO.class);
                 if (items != null) {
                     for (PickmItemVO child : items) {
+                        //只合并项目专用料数据
+                        if(child.getBprojectmaterial().booleanValue()){
+                            mergedChildren.add(child);
+                        }
                         // CircularlyAccessibleValueObject 实现了 ISuperVO
-                        mergedChildren.add(child);
                     }
                 }
             }
+            if(mergedChildren.size() == 0){
+                continue;
+            }
 
             AggPickmVO newVO = new AggPickmVO();
             newVO.setParent(group.get(0).getParentVO());
diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java
index 9e27632..809b4dc 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/util/SyncEpicMesUtil.java
@@ -11,6 +11,8 @@ import nc.bs.uapbd.util.MyHelper;
 import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
 import nc.jdbc.framework.processor.MapListProcessor;
 import nc.jdbc.framework.processor.MapProcessor;
+import nc.pub.billcode.impl.BillCodeManageImpl;
+import nc.pub.billcode.itf.IBillcodeManage;
 import nc.vo.bc.pmpub.project.ProjectHeadVO;
 import nc.vo.bd.bom.bom0202.entity.BomVO;
 import nc.vo.bd.material.MaterialVO;
@@ -76,19 +78,22 @@ public class SyncEpicMesUtil {
             }
             if ("N".equals(auditCode)) {
                 JSONObject data = buildSyncData(aggVO);
-                pushData(pmoUrl, data);
+//                pushData(pmoUrl, data);
             } else {
                 JSONObject data = buildSyncData(aggVO);
-                pushData(pmoUrl, data);
+//                pushData(pmoUrl, data);
 
                 JSONObject buildSyncData = buildSyncCodeData(aggVO);
                 jsonArray.add(buildSyncData);
             }
         }
         if (!jsonArray.isEmpty()) {
-            pushData(codeUrl, jsonArray);
+//            pushData(codeUrl, jsonArray);
         }
 
+
+
+
         logDl.info("��������ͬ��������MESϵͳ������ɡ�");
 
     }
@@ -315,8 +320,9 @@ public class SyncEpicMesUtil {
         for (PMOItemVO item : vo.getChildrenVO()) {
             HYPubBO hybo = new HYPubBO();
             Object materialtype = hybo.findColValue("bd_material_v", "materialtype", "pk_source = '" + item.getCmaterialid() + "' ");
-
-            String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + "0001";
+            IBillcodeManage billcodeManage=new BillCodeManageImpl();
+            String code= billcodeManage.getPreBillCode_RequiresNew("xxxxx-code-rule",hvo.getPk_group(),hvo.getPk_org());
+            String detailItem = materialtype + hvo.getDbilldate().toStdString().substring(0, 3) + hvo.getDbilldate().toStdString().substring(5, 6) + code;
             jsonArray.add(detailItem);
         }
         obj.put("releaseNo", jsonArray);