1.修复数据格式问题导致生产数据导入失败问题

2.修复无数据报错的bug

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

@@ -1542,7 +1542,10 @@ public class BomUploadServiceImpl {
                         System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ().split("\\*")[0]);
                         System.out.println("e.getWpggZ().split(\"\\\\*\")[0] = " + e.getWpggZ());
                         dmBom.setBh(new BigDecimal(e.getWpggZ().split("\\*")[0]));
-                        dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2]));
+xiiu                        if (e.getWpggZ().split("\\*").length>2){
+                            dmBom.setBc(new BigDecimal(e.getWpggZ().split("\\*")[2]));
+                        }
+
                         String tzbh = e.getTzbhZ();
                         String hxlx = "";
                         // 根据图纸编号获取 手工，数控 跨位，组立，、

src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java

@@ -311,16 +311,20 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
      */
     @Override
     public List<Pldto> getPl(String begin, String end) {
-        String beginTime_lj = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
+        DmSygdMxLj one = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
                 .select("top 1 xzglxq ")
                 .inSql("parent_id ", " SELECT dm_sygd_mx.id from dm_sygd_mx WHERE dm_sygd_mx.jssj BETWEEN '" + begin + "' and '" + end + "'")
-                .orderByAsc("xzglxq")).getXzglxq();
+                .orderByAsc("xzglxq"));
-        String endTime_lj = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
+
+        DmSygdMxLj two = ljService.getOne(new QueryWrapper<DmSygdMxLj>()
                 .select("top 1 xzglxq ")
                 .inSql("parent_id ", " SELECT dm_sygd_mx.id from dm_sygd_mx WHERE dm_sygd_mx.jssj BETWEEN '" + begin + "' and '" + end + "'")
-                .orderByDesc("xzglxq")).getXzglxq();
+                .orderByDesc("xzglxq"));
-        List<Pldto> pldtoList = baseMapper.getPl(beginTime_lj, endTime_lj);
+        if (ObjectUtil.isAllNotEmpty(one,two)){
-        return pldtoList;
+            List<Pldto> pldtoList = baseMapper.getPl(one.getXzglxq(), two.getXzglxq());
+            return pldtoList;
+        }
+        return null;
     }
 
     /**