From cf2c7f784a4a0384dd50db4e1ce640bdfc6467b1 Mon Sep 17 00:00:00 2001 From: xhj Date: Sun, 15 Dec 2024 14:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcsj/impl/BomUploadServiceImpl.java | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) 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 da2dc36..3dd6cd3 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 @@ -1823,9 +1823,14 @@ public class BomUploadServiceImpl { List bclqmxpList = bclqmxpService.list(new QueryWrapper().eq("DC_CH_z", dcch) .eq("DC_PL_z", dcpl) ); + // todo distnce List ydjhs = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch ) .eq("dc_pl",dcpl) ); + +// List ydjhs1 = dmYdjhService.list(new QueryWrapper().eq("dc_ch", dcch ) +// .eq("dc_pl",dcpl).eq("isnull(tzbh,'')","") +// ); DmYdjh ydjhMin=null; Boolean f=true; if(ydjhs.size()<0){ @@ -1874,7 +1879,7 @@ public class BomUploadServiceImpl { && StringUtils.isNotBlank(fst.getWpxh()) && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) && (fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh()) - || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh())) + || (cjs1 + fst.getWpxh()).equalsIgnoreCase(dmBchxjbp.getWpxh()) || ( fst.getWpxh()).equalsIgnoreCase(cjs1 +dmBchxjbp.getWpxh())) && fst.getTzbh().equalsIgnoreCase(dmBchxjbp.getTzbh()) ) .findFirst() @@ -1928,6 +1933,21 @@ public class BomUploadServiceImpl { dmYdjh.setBcqpyld(null==collect11.get(0).getQpyld()? null:collect11.get(0).getQpyld().doubleValue()); } + if(f){ + dmYdjh.setSlrq(ydjhMin.getSlrq()); + dmYdjh.setPwrq(ydjhMin.getPwrq()); + dmYdjh.setHxrq(ydjhMin.getHxrq()); + dmYdjh.setQgrq(ydjhMin.getQgrq()); + dmYdjh.setDmrq(ydjhMin.getDmrq()); + dmYdjh.setQjgrq(ydjhMin.getQgjhrq()); + dmYdjh.setJssj(ydjhMin.getJssj()); + dmYdjh.setSljhrq(ydjhMin.getSljhrq()); + dmYdjh.setPwjhrq(ydjhMin.getPwjhrq()); + dmYdjh.setLljhrq(ydjhMin.getLljhrq()); + dmYdjh.setHxjhrq(ydjhMin.getHxjhrq()); + dmYdjh.setQgjhrq(ydjhMin.getQgjhrq()); + } + ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素 @@ -1988,6 +2008,20 @@ public class BomUploadServiceImpl { dmYdjh.setWpgg(dmBchxjbp.getWpgg()); dmYdjh.setWpxh(dmBchxjbp.getWpxh()); } + if(f){ + dmYdjh.setSlrq(ydjhMin.getSlrq()); + dmYdjh.setPwrq(ydjhMin.getPwrq()); + dmYdjh.setHxrq(ydjhMin.getHxrq()); + dmYdjh.setQgrq(ydjhMin.getQgrq()); + dmYdjh.setDmrq(ydjhMin.getDmrq()); + dmYdjh.setQjgrq(ydjhMin.getQgjhrq()); + dmYdjh.setJssj(ydjhMin.getJssj()); + dmYdjh.setSljhrq(ydjhMin.getSljhrq()); + dmYdjh.setPwjhrq(ydjhMin.getPwjhrq()); + dmYdjh.setLljhrq(ydjhMin.getLljhrq()); + dmYdjh.setHxjhrq(ydjhMin.getHxjhrq()); + dmYdjh.setQgjhrq(ydjhMin.getQgjhrq()); + } ups.add(dmYdjh); ydjhs.remove(dmYdjh); // 从列表中移除找到的元素