From 3524cc609ae1a67b91667eca69e47a11283caa1a Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Thu, 7 Nov 2024 16:49:04 +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 | 17 ++++++++++++++---
 1 file changed, 14 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 061367f..4fc6894 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
@@ -427,13 +427,13 @@ public class BomUploadServiceImpl {
                 qw.set("jsq_lqb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
                 qw.eq("dc_ch", e.getDcChZ());
                 qw.eq("dc_pl", e.getDcPlZ());
-                qw.eq("dc_fd", fd);
+               // qw.eq("dc_fd", fd);
                 dmCzplpNewService.update(qw);
                 UpdateWrapper<DmTzjh> qw1 = new UpdateWrapper<>();
                 qw1.set("jsq_lqb", DateUtil.format(DateUtil.date(), "yyyy/MM/dd"));
                 qw1.eq("dc_ch", e.getDcChZ());
                 qw1.eq("dc_pl", e.getDcPlZ());
-                qw1.eq("dc_fd", fd);
+              //  qw1.eq("dc_fd", fd);
                 dmTzjhService.update(qw1);
             }
         });
@@ -1622,6 +1622,8 @@ public class BomUploadServiceImpl {
                         dmBom.setZl(zlbm);
                         dmBom.setKw(zzcj);
                         dmBom.setLqlb(hxlx);
+                        //List<BomVO> collecta = list.stream().filter(fst -> null!= fst.getTjb() && fst.getTjb().getTzbh().equals(e.getTzbhZ()) ).collect(Collectors.toList());
+                       // dmBom.setYlbs(collecta.get(0).getTjb().getSfyl());
                         //dmBom.setLqbs("Y");
                         if(tzbh.substring(4, 5).equals("X")){ // 型材
                             // 先去 统计表中查找
@@ -1632,7 +1634,7 @@ public class BomUploadServiceImpl {
                             ).collect(Collectors.toList());
                             // 找到长度
                             BigDecimal cd=collect11.get(0).getTjb().getXccd().divide(new BigDecimal("1000"));
-
+                            dmBom.setYlbs(collect11.get(0).getTjb().getSfyl());
                             List<BomVO> 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());
@@ -1642,6 +1644,7 @@ public class BomUploadServiceImpl {
                                 dmBom.setXcshms(collect111.get(0).getBclq().getShms());
                                 dmBom.setFds(collect111.get(0).getBclq().getDcFdZ());
                             }
+
                             dmBom.setType("X");
                         }else {
 
@@ -1650,6 +1653,7 @@ public class BomUploadServiceImpl {
                             // 找到长度
                             if(collect11.size()>0){
                                 dmBom.setYlbhgg(collect11.get(0).getTjb().getYlggs());
+
                             }
 
 
@@ -1758,6 +1762,7 @@ public class BomUploadServiceImpl {
     public Map  bomxzjh( List<DmBchxjbp> dmBchxjbps,Map kwxxMap,Map qgKwMap , HttpServletRequest req,List<DmBchxmxp>mxs){
         String dcch=dmBchxjbps.get(0).getDcCh();
         String dcpl=dmBchxjbps.get(0).getDcPl();
+        List<DmBchxylp> tjListOld = bchxylpService.list(new QueryWrapper<DmBchxylp>().eq("dc_ch", dcch).eq("dc_pl", dcpl));
         List<DmYdjh> ydjhs = dmYdjhService.list(new QueryWrapper<DmYdjh>().eq("dc_ch", dcch )
             .eq("dc_pl",dcpl)
         );
@@ -1783,6 +1788,9 @@ public class BomUploadServiceImpl {
           //  DmBchxjbp dmBchxjbp = (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1);
             DmBchxjbp dmBchxjbp =    (DmBchxjbp) ObjConvertUtils.checkNullNew(dmBchxjbp1);
             DmBchxmxp bchxmxp = mxs.stream().filter(fst -> fst.getHxbh().equals(dmBchxjbp.getHxbh())).findFirst().orElse(null);
+            DmBchxylp bchxylp = tjListOld.stream().filter(fst -> fst.getTzbh().equals(dmBchxjbp.getTzbh())
+                && fst.getWpgg().equalsIgnoreCase(dmBchxjbp.getWpgg()) && fst.getWpxh().equalsIgnoreCase(dmBchxjbp.getWpxh())
+            ).findFirst().orElse(null);
             // dmBchxjbp
             String wpgg = dmBchxjbp.getWpgg();
             String wpxh = dmBchxjbp.getWpxh();
@@ -1821,6 +1829,7 @@ public class BomUploadServiceImpl {
                 String zzcj = (String) qgKwMap.get(s); //xhj
 
                 dmYdjh.setKw(zzcj);
+                dmYdjh.setYlbs(bchxylp.getSfyl());
                // dmYdjh.setDcFd(dmBchxjbp.getDcFd());
 
                 if(tzbh.substring(4, 5).equals("X")){
@@ -1867,6 +1876,7 @@ public class BomUploadServiceImpl {
                     dmYdjh.setQgcd(dmBchxjbp.getYlzd4().doubleValue());
                     dmYdjh.setLjsl(dmBchxjbp.getLjsl().doubleValue());
                     dmYdjh.setZl(dmBchxjbp.getDcZl());
+                    dmYdjh.setYlbs(bchxylp.getSfyl());
                     String s = (String) kwxxMap.get(tzbh.substring(4, 7));
                     String zzcj = (String) qgKwMap.get(s); //xhj
 
@@ -1910,6 +1920,7 @@ public class BomUploadServiceImpl {
 
                     dmYdjhadd.setWpgg(dmBchxjbp.getWpgg());
                     dmYdjhadd.setWpxh(dmBchxjbp.getWpxh());
+                    dmYdjhadd.setWpxh( bchxylp.getSfyl());
                     dmYdjhadd.setLqlb(hxlx);
                     dmYdjhadd.setTzbh(tzbh);
                     dmYdjhadd.setHxcd(dmBchxjbp.getHxcd().doubleValue());