From 86e65dee36a2c0ae32175cb0e92e58d7d4c7e481 Mon Sep 17 00:00:00 2001 From: xhj Date: Fri, 28 Feb 2025 12:13:54 +0800 Subject: [PATCH] bz --- .../jcsj/impl/BomUploadServiceImpl.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 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 9244835..e9e223f 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 @@ -1738,18 +1738,21 @@ public class BomUploadServiceImpl { List collect11 = list.stream().filter(fst -> null!= fst.getTjb() && tzbh.equals(fst.getTjb().getTzbh()) ).collect(Collectors.toList()); // 找到长度 - BigDecimal cd=collect11.get(0).getTjb().getXccd().divide(new BigDecimal("1000")); - dmBom.setYlbs(collect11.get(0).getTjb().getSfyl()); - List collect111 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpxhZ()) && - fst.getBclq().getWpxh().equals(e.getWpggZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) && fst.getBclq().getYlzd11().compareTo(cd)==0 - ).collect(Collectors.toList()); - if (collect111.size() > 0) { + if(collect11.size()>0){ + BigDecimal cd=collect11.get(0).getTjb().getXccd().divide(new BigDecimal("1000")); + dmBom.setYlbs(collect11.get(0).getTjb().getSfyl()); + List collect111 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpgg().equals(e.getWpxhZ()) && + fst.getBclq().getWpxh().equals(e.getWpggZ()) && fst.getBclq().getDcPlZ().equals(e.getDcPlZ()) && fst.getBclq().getYlzd11().compareTo(cd)==0 + ).collect(Collectors.toList()); + if (collect111.size() > 0) { // dmBom.setFds(collect11.get(0).getBclq().getDcFdZ()); - dmBom.setXcgs(collect111.get(0).getBclq().getSl()); - dmBom.setXcshms(collect111.get(0).getBclq().getShms()); - dmBom.setFds(collect111.get(0).getBclq().getDcFdZ()); + dmBom.setXcgs(collect111.get(0).getBclq().getSl()); + dmBom.setXcshms(collect111.get(0).getBclq().getShms()); + dmBom.setFds(collect111.get(0).getBclq().getDcFdZ()); + } } + dmBom.setType("X"); }else {