diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
index 08fb504c..d05f5728 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
@@ -137,9 +137,10 @@ public class MaterialToGyMesListener implements IBusinessListener {
             singleObj.put("materialCategory", pk_marbasclass); // 物料分类
             singleObj.put("specification", vo.getMaterialspec()); // 规格
             singleObj.put("model", vo.getMaterialtype()); // 型号文字
-//            singleObj.put("intervalModel", ""); // 产品类型 例如35-KV-断路器（物料自定义字段）
-            singleObj.put("primaryUnit", unitMap.get("unitname")); // 主单位
-//            singleObj.put("materialUnit", unitMap.get("deputy_unitname")); // 单位
+            singleObj.put("intervalModel", "（物料自定义字段）"); // 产品类型 例如35-KV-断路器（物料自定义字段）
+            singleObj.put("primaryUnit", unitMap.get("measrate").toString().split("/")[0]);
+            // 主单位
+            singleObj.put("materialUnit", unitMap.get("measrate").toString().split("/")[1]); // 单位
             singleObj.put("drawingNumber", vo.getGraphid()); // 图号编码
             singleObj.put("enableStatus", enablestate - 1); // 启用状态 0 未启动 1 已启动 2 已停用
             singleObj.put("materialType", stockMap.get("martype")); // 物料类型编码
@@ -231,8 +232,8 @@ public class MaterialToGyMesListener implements IBusinessListener {
     }
 
     private Map getStockInfo(String pkMaterial) throws BusinessException {
-        String sql = " select martype, wholemanaflag, outpriority, pk_stordoc, remain" +
-                " from bd_materialstock " +
+        String sql = " select martype, wholemanaflag, outpriority, remain,bd_stordoc.code as pk_stordoc" +
+                " from bd_materialstock  left join bd_stordoc on bd_stordoc.pk_stordoc = bd_materialstock.pk_stordoc " +
                 " where pk_material = '" + pkMaterial + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;