first

src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java

@@ -1405,6 +1405,7 @@ public class BomUploadServiceImpl {
                             Comparator.comparing(
                                 tc -> tc.getTjb().getWpgg() + ";" + tc.getTjb().getWpxh() + ";" + tc.getTjb().getTzbh()))), ArrayList::new));
             collect.forEach(i -> {
+                if(null !=i.getTjb()){
                     DmBchxylp e = i.getTjb();
                     if (StringUtils.isNotBlank(e.getWpgg())) {
                         DmBom dmBom = new DmBom();
@@ -1465,9 +1466,12 @@ public class BomUploadServiceImpl {
                         }
                         adds.add(dmBom);
                     }
+                }
+
             });
         } else {
             list.forEach(i -> {
+                if(null!= i.getTlt()){
                     DmBchxmxp e = i.getTlt();
                     if (StringUtils.isNotBlank(e.getWpggZ())) {
                         DmBom dmBom = new DmBom();
@@ -1531,6 +1535,9 @@ public class BomUploadServiceImpl {
 
                         adds.add(dmBom);
                     }
+                }
+
+
             });
         }
         dmBomService.insertBoms(adds);

src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java

@@ -62,8 +62,9 @@ public class DmBomServiceImpl extends ServiceImpl<DmBomMapper, DmBom> implements
 //        }else{
             List<DmBom> list = this.list(new QueryWrapper<DmBom>().eq("dcch", map.get("dcch"))
                 .eq(StrUtil.isNotEmpty((String) map.get("fd")), "fd", map.get("dcfd"))
-                .eq(StrUtil.isNotEmpty((String) map.get("pl")), "fd", map.get("dcpl"))
+                .eq(StrUtil.isNotEmpty((String) map.get("dcpl")), "pl", map.get("dcpl"))
                 .eq(StrUtil.isNotEmpty((String) map.get("zt")), "zt", map.get("zt"))
+                .orderBy(true,true,"pl","fd")
             );
             return list;
 //        }

src/main/resources/mappers/jcsj/DmBclqmxpMapper.xml

@@ -116,7 +116,9 @@
         <if test=" zzcj!=null and zzcj!=''">
             and   DM_BCLQJBP.zzcj=#{zzcj}
         </if>
-
+        <if test=" dcfd!=null and dcfd!=''">
+            and  DM_BCLQMXP.DC_FD  like'%'+#{dcfd}+'%'
+        </if>
 
         <if test=" delx!=null and delx!=''">
             and   DM_BCLQJBP.DELX=#{delx}