diff --git a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
index b61d9cab..e41207a8 100644
--- a/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nc/impl/bd/material/baseinfo/MaterialToGyMesListener.java
@@ -114,11 +114,13 @@ public class MaterialToGyMesListener implements IBusinessListener {
             singleObj.put("mainWarehouse", stockMap.get("pk_stordoc")); // 主仓库
             singleObj.put("reservation", stockMap.get("remain")); // 预留
             singleObj.put("virtualItem", isvirtual.toString()); // 虚项
-            singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
-            singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
-            singleObj.put("issuance", prodMap.get("issend")); // 发料
-            singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
-            singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
+            if (prodMap != null && !prodMap.isEmpty()) {
+                singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
+                singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
+                singleObj.put("issuance", prodMap.get("issend")); // 发料
+                singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
+                singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
+            }
             singleObj.put("bipCreateBy", creatorName); // 创建人
             dataArr.add(singleObj);
             /**
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 07d1a802..169f6392 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
@@ -149,11 +149,13 @@ public class MaterialToGyMesListener implements IBusinessListener {
             singleObj.put("mainWarehouse", stockMap.get("pk_stordoc")); // 主仓库
             singleObj.put("reservation", stockMap.get("remain")); // 预留
             singleObj.put("virtualItem", isvirtual.toString()); // 虚项
-            singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
-            singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
-            singleObj.put("issuance", prodMap.get("issend")); // 发料
-            singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
-            singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
+            if (prodMap != null && !prodMap.isEmpty()) {
+                singleObj.put("productionDepartment", prodMap.get("deptCode")); // 生产部门编码
+                singleObj.put("matchingComponents", prodMap.get("iscreatesonprodorder")); // 配套子件
+                singleObj.put("issuance", prodMap.get("issend")); // 发料
+                singleObj.put("backflushMethod", prodMap.get("conversemethod")); // 倒冲方式
+                singleObj.put("postCompletionProcessing", prodMap.get("wghxcl")); // 完工后续处理
+            }
             singleObj.put("bipCreateBy", creatorName); // 创建人
             dataArr.add(singleObj);
             /**
@@ -240,7 +242,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
     }
 
     private Map getProdInfo(String pkMaterial) throws BusinessException {
-        String  sql = "SELECT b.code deptCode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" +
+        String sql = "SELECT b.code deptCode, a.iscreatesonprodorder, a.issend, a.conversemethod, a.converstime, a.wghxcl" +
                 " pk_materialprod " +
                 "FROM " +
                 " bd_materialprod a" +