diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
index 4fc6894..1c77a28 100644
--- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java
@@ -1829,7 +1829,10 @@ public class BomUploadServiceImpl {
                 String zzcj = (String) qgKwMap.get(s); //xhj
 
                 dmYdjh.setKw(zzcj);
-                dmYdjh.setYlbs(bchxylp.getSfyl());
+                if(null!=bchxylp){
+                    dmYdjh.setYlbs(null==bchxylp.getSfyl()?"":bchxylp.getSfyl());
+                }
+
                // dmYdjh.setDcFd(dmBchxjbp.getDcFd());
 
                 if(tzbh.substring(4, 5).equals("X")){
@@ -1876,7 +1879,9 @@ public class BomUploadServiceImpl {
                     dmYdjh.setQgcd(dmBchxjbp.getYlzd4().doubleValue());
                     dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue());
                     dmYdjh.setZl(dmBchxjbp.getDcZl());
-                    dmYdjh.setYlbs(bchxylp.getSfyl());
+                    if(null!=bchxylp) {
+                        dmYdjh.setYlbs(null == bchxylp.getSfyl() ? "" : bchxylp.getSfyl());
+                    }
                     String s = (String) kwxxMap.get(tzbh.substring(4, 7));
                     String zzcj = (String) qgKwMap.get(s); //xhj
 
@@ -1920,7 +1925,10 @@ public class BomUploadServiceImpl {
 
                     dmYdjhadd.setWpgg(dmBchxjbp.getWpgg());
                     dmYdjhadd.setWpxh(dmBchxjbp.getWpxh());
-                    dmYdjhadd.setWpxh( bchxylp.getSfyl());
+                    if(null!=bchxylp){
+                        dmYdjhadd.setYlbs( null==bchxylp.getSfyl()?"":bchxylp.getSfyl());
+                    }
+
                     dmYdjhadd.setLqlb(hxlx);
                     dmYdjhadd.setTzbh(tzbh);
                     dmYdjhadd.setHxcd(dmBchxjbp.getHxcd().doubleValue());