From f1f76d0ecfa71d4b526baa172cb31abd6ed71afa Mon Sep 17 00:00:00 2001
From: xhj <xhjzrq@163.com>
Date: Tue, 17 Oct 2023 11:50:22 +0800
Subject: [PATCH] first

---
 .../java/com/dsic/gj_erp/bean/jcsj/DmBom.java |  6 +++
 .../jcsj/impl/BomUploadServiceImpl.java       | 41 ++++++++++++++++---
 .../mappers/jcsj/DmBchxylpMapper.xml          |  4 ++
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
index b18908a..1ae06ed 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmBom.java
@@ -198,6 +198,12 @@ public class DmBom implements Serializable {
 
 
     private String yidd;
+    private String bzry;
+    private String bzrq;
+
+
+    private BigDecimal xcgs;
+    private BigDecimal xcshms;
 
 
 
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 26af6a2..6c5fdf1 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
@@ -1296,7 +1296,7 @@ public class BomUploadServiceImpl {
             }
         }
         System.out.println(" = " + "tlt over");
-        if (type.equals("01")) {
+//        if (type.equals("01")) {
             List<DmWlqd> ljbList = wlqdService.getLJQDList(querMap);
             for (int i = 0; i < ljbList.size(); ) {
                 if (i == adds.size()) {
@@ -1316,7 +1316,7 @@ public class BomUploadServiceImpl {
                     }
                 }
             }
-        }
+//        }
 //        tltList.forEach(e->{
 //            if(StringUtils.isNotBlank(e.getWpggZ())){
 //
@@ -1443,19 +1443,25 @@ public class BomUploadServiceImpl {
                     dmBom.setLqlb(hxlx);
                     // 领取表找打 fds
                     if (e.getHxfl().equals("B")) {
-                        List<BomVO> collect11 = list.stream().filter(fst -> fst.getBclq().getWpgg().equals(e.getWpgg()) &&
-                            fst.getBclq().getWpxh().equals(e.getWpxh())
+                        dmBom.setType("B");
+                        List<BomVO> collect11 = list.stream().filter(fst ->  null!= fst.getBclq() &&fst.getBclq().getWpgg().equals(e.getWpgg()) &&
+                            fst.getBclq().getWpxh().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl())
                         ).collect(Collectors.toList());
                         if (collect11.size() > 0) {
                             dmBom.setFds(collect11.get(0).getBclq().getDcFdZ());
                         }
                     } else {
-                        List<BomVO> collect11 = list.stream().filter(fst -> fst.getBclq().getWpxh().equals(e.getWpgg()) &&
-                            fst.getBclq().getWpgg().equals(e.getWpxh())
+
+                        BigDecimal cd=e.getXccd().divide(new BigDecimal("1000"));
+                        List<BomVO> collect11 = list.stream().filter(fst -> null!= fst.getBclq() && fst.getBclq().getWpxh().equals(e.getWpgg()) &&
+                            fst.getBclq().getWpgg().equals(e.getWpxh()) && fst.getBclq().getDcPlZ().equals(e.getDcPl())  && fst.getBclq().getYlzd11().compareTo(cd)==0
                         ).collect(Collectors.toList());
                         if (collect11.size() > 0) {
                             dmBom.setFds(collect11.get(0).getBclq().getDcFdZ());
+                            dmBom.setXcgs(collect11.get(0).getBclq().getSl());
+                            dmBom.setXcshms(collect11.get(0).getBclq().getShms());
                         }
+                        dmBom.setType("X");
                     }
                     adds.add(dmBom);
                 }
@@ -1500,6 +1506,29 @@ public class BomUploadServiceImpl {
                     dmBom.setKw(zzcj);
                     dmBom.setLqlb(hxlx);
                     dmBom.setLqbs("Y");
+                    if(tzbh.substring(4, 5).equals("X")){ // 型材
+                        // 先去 统计表中查找
+//                        List<BomVO> collect11 = list.stream().filter(fst -> null!= fst.getTjb() && fst.getTjb().getWpxh().equals(e.getWpxhZ()) &&
+//                            fst.getTjb().getWpgg().equals(e.getWpggZ()) && fst.getTjb().getDcPl().equals(e.getDcPlZ())
+//                        ).collect(Collectors.toList());
+                        List<BomVO> 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"));
+
+                        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());
+                        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.setType("X");
+                    }else {
+                        dmBom.setType("B");
+                    }
+
                     adds.add(dmBom);
                 }
             });
diff --git a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml
index 8e417b3..15d3781 100644
--- a/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml
+++ b/src/main/resources/mappers/jcsj/DmBchxylpMapper.xml
@@ -100,6 +100,10 @@
         <if test=" hxfl!=null and hxfl!=''">
             and   dm_bchxylp.HXFL=#{hxfl}
         </if>
+
+        <if test=" tzbh!=null and tzbh!=''">
+            and  dm_bchxylp.tzbh  like'%'+#{tzbh}+'%'
+        </if>
     </select>
 
 </mapper>