diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java
index 87b6b49d..67e8b368 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterApproveSyncHighpressureMesRule.java
@@ -96,7 +96,10 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
                     Object contractNum = hybo.findColValue("bd_defdoc", "code", " (pk_defdoclist = '" + o + "' and pk_defdoc='" + item.getVdef1() + "') ");
 
                     itemObj.put("contractNum", contractNum); // 合同编号
-                    itemObj.put("cwarehouseid", item.getAttributeValue("vbdef35")); // 合同编号
+
+                Object cwarehouseid = hybo.findColValue("bd_stordoc", "code", " (pk_stordoc = '" + item.getAttributeValue("vbdef35") + "') ");
+
+                itemObj.put("cwarehouseid", cwarehouseid); // 合同编号
                     Object pk_project = hybo.findColValue("bd_project", "project_name", " pk_project = '" + item.getCprojectid() + "' ");
 
                     itemObj.put("entryName", pk_project); // 项目名称
@@ -121,8 +124,8 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
                     Map<String, Object> mrl = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
                     itemObj.put("materialCode", mrl.get("code")); // 物料编码
                     itemObj.put("materialName", mrl.get("name")); // 物料名称
-//                itemObj.put("drawingNumber", mrl.get("graphid")); // 图号编码 graphid
-                    itemObj.put("drawingNumber", "1234");
+                    itemObj.put("drawingNumber", mrl.get("graphid")); // 图号编码 graphid
+//                    itemObj.put("drawingNumber", "1234");
                     Object unit = hybo.findColValue("bd_measdoc", "code", " pk_measdoc = '" + mrl.get("pk_measdoc") + "' ");
 
                     itemObj.put("unit", unit); // 单位 pk_measdoc
@@ -177,7 +180,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
                     itemObj.put("bipOriginProcessProductionOrderRowNum", "");
 
                     // 物料信息
-                    String mrlsql = "select code,name,graphid,pk_measdoc,materialspec from bd_material where pk_material = '" + item.getCmaterialvid() + "' ";
+                    String mrlsql = "select code,name,graphid,pk_measdoc,materialtype from bd_material where pk_material = '" + item.getCmaterialvid() + "' ";
                     Map<String, Object> mrl = (Map<String, Object>) baseDAO.executeQuery(mrlsql, new MapProcessor());
                     itemObj.put("materialCode", mrl.get("code")); // 物料编码
                     itemObj.put("materialName", mrl.get("name")); // 物料名称
@@ -188,7 +191,7 @@ public class AfterApproveSyncHighpressureMesRule implements IRule<PMOAggVO> {
                     itemObj.put("unit", unit); // 单位 pk_measdoc
 
                     // 生产信息
-                    itemObj.put("intervalModel", mrl.get("materialspec")); // 产品类型
+                    itemObj.put("intervalModel", mrl.get("materialtype")); // 产品类型
 //                itemObj.put("processCode", item.getProcedures()); // 工序编码
                     itemObj.put("lineNumber", String.valueOf(item.getVrowno())); // 行号
 
diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java
index ac4cbdf4..8b4a0bb0 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/AfterPmoSyncJmQMSRule.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import nc.bs.dao.BaseDAO;
+import nc.bs.dao.DAOException;
 import nc.bs.logging.Log;
 import nc.bs.uapbd.util.MyHelper;
 import nc.bs.uapbd.util.ThirdPartyPostRequestUtil;
@@ -69,6 +70,12 @@ public class AfterPmoSyncJmQMSRule implements IRule<PMOAggVO> {
             if (checkIfOrg(orgCode, configParams)) {
                 continue;
             }
+
+            if(vo.getChildrenVO().length >=0 ){
+                if(vo.getChildrenVO()[0].getAttributeValue("vdef32").equals("Y")){
+                    continue;
+                }
+            }
             // 组装数据
             JSONObject singleObj = new JSONObject();
             PMOHeadVO pmoHeadVO = vo.getParentVO();
@@ -138,6 +145,7 @@ public class AfterPmoSyncJmQMSRule implements IRule<PMOAggVO> {
 
             singleObj.put("Content", contentArray);
             pushData(singleObj);
+            updatePmo(vo.getParentVO().getCpmohid());
         }
     }
 
@@ -167,7 +175,7 @@ public class AfterPmoSyncJmQMSRule implements IRule<PMOAggVO> {
     }
 
     private boolean checkIfOrg(String code, Map<String, String> configParams) throws BusinessException {
-        String targetCode = configParams.get("jmOrg");
+        String targetCode = configParams.get("xbOrg");
         if (targetCode == null || nc.vo.am.common.util.StringUtils.isEmpty(targetCode)) {
             throw new BusinessException("未配置组织参数");
         }
@@ -179,6 +187,12 @@ public class AfterPmoSyncJmQMSRule implements IRule<PMOAggVO> {
         }
         return true;
     }
+    private void updatePmo(String cpmohid) throws DAOException {
+        BaseDAO dao = new BaseDAO();
+        String sql = "update mm_mo set vdef32='Y' where cpmohid='"
+                + cpmohid + "'";
+        dao.executeUpdate(sql);
+    }
 
 
 }
diff --git a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java
index 945447cf..4307baee 100644
--- a/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java
+++ b/mmpac/src/private/nc/bs/mmpac/pmo/pac0002/bp/rule/WithUpdatePickmRule.java
@@ -92,7 +92,7 @@ public class WithUpdatePickmRule implements IRule<PMOAggVO> {
         BaseDAO dao = new BaseDAO();
         for (Map<String, Object> updateMap : updateList) {
 //            String sql = " update  mm_pickm_b set vbdef16 = TO_CHAR(TO_NUMBER(vbdef16) -"+updateMap.get("num")+")  where mm_pickm_b.cpickm_bid ='" + updateMap.get("pk") + "'";
-            String sql = " update  mm_pickm_b set vbdef16 =  TO_CHAR(TO_NUMBER(vbdef16) -TO_NUMBER('"+((UFDouble)updateMap.get("num")).toString()+"'))  where mm_pickm_b.cpickm_bid ='" + updateMap.get("pk") + "'";
+            String sql = " update  mm_pickm_b set vbdef16 =  TO_CHAR(TO_NUMBER(CASE WHEN vbdef16 IS NULL OR vbdef16 = '~' OR vbdef16 = '~' THEN '0'  ELSE vbdef16 END) -TO_NUMBER('"+((UFDouble)updateMap.get("num")).toString()+"'))  where mm_pickm_b.cpickm_bid ='" + updateMap.get("pk") + "'";
 
             dao.executeUpdate(sql);
         }