From 9e0ed0bb943d91231f543c93406cd0a9bd2d9dcf Mon Sep 17 00:00:00 2001 From: xhj Date: Thu, 14 Nov 2024 10:52:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=99=E6=96=99=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/jcsj/impl/BomUploadServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) 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());