1.修正浏览器版本问题导致的excel上传验证错误

src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java

@@ -49,7 +49,7 @@ public class 三月滚动排产控制器 {
         } catch (RuntimeException e) {
             e.printStackTrace();
             ResultBean<?> resultBean = new ResultBean<>();
-            resultBean.setStatus(10000);
+            resultBean.setStatus(10001);
             resultBean.setSuccess(false);
             resultBean.setMessage(e.getMessage());
             return resultBean;
@@ -69,17 +69,18 @@ public class 三月滚动排产控制器 {
 
         HashMap<Object, Object> map = new HashMap<>();
         if (from.equals(Manager.from)&&to.equals(Manager.to)){
-            semaphore.release();
             map.put("zy",Manager.资源池);
+            semaphore.release();
             return new ResultBean<>(map);
         }
 
         try {
             排产.execute(from,to);
+            map.put("zy",Manager.资源池);
         }finally {
             semaphore.release();
         }
-        map.put("zy",Manager.资源池);
+
         return new ResultBean<>(map);
     }
 

src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java

@@ -61,6 +61,9 @@ public class 中日程批量表合并导入控制器 {
         String bzr = (String) req.getAttribute("yhms");
         String day=DateUtil.date().toString("yyyy/MM/dd");
         for(ZrcAndPlb item:objList){
+            if (item.getMfd()==null){
+                continue;
+            }
             String[] fds = item.getMfd().split("/");
             List<DmCzplpNew> fdList = czplpNewService.list(new QueryWrapper<DmCzplpNew>().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh));
             boolean remove = czplpNewService.remove(new QueryWrapper<DmCzplpNew>().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh));
@@ -102,8 +105,8 @@ public class 中日程批量表合并导入控制器 {
                             fdList.stream().filter(fst -> plb.getDcPl().equals(fst.getDcPl()))
                                     .findFirst().ifPresent(it->updateCzPlp(plb,it));
                         }catch (Exception ignored){}
-                        plList.add(plb);
                     }
+                    plList.add(plb);
 
                     //旧表数据,仅当首次导入时写入即可
                     if (!remove){

src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java

@@ -33,8 +33,6 @@ public class 三月滚动接口 {
     private final DmSygdMxService sygdMxService;
     private final DmSygdService sygdService;
 
-
-
     @Transactional
     public ResultBean 生成三月滚动(String begin, String end) {
         //清理历史数据
@@ -74,17 +72,18 @@ public class 三月滚动接口 {
 
         sygdMxService.saveBatch(mxList,500);
 
-        ljList.forEach(lj-> mxList.forEach(mx->{
+        new Thread(()->{
-            if (lj.getDcch().equals(mx.getDcCh())
+            ljList.forEach(lj-> mxList.forEach(mx->{
-                    &&lj.getPl().equals(mx.getDcPl())
+                if (lj.getDcch().equals(mx.getDcCh())
-                    && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){
+                        &&lj.getPl().equals(mx.getDcPl())
-                lj.setParentId(mx.getId());
+                        && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){
-            }
+                    lj.setParentId(mx.getId());
-        }));
+                }
-        ljService.saveBatch(ljList,500);
+            }));
+            ljService.saveBatch(ljList,500);
+        }).start();
 
         List<DmYdjhxf> list= sygdMxService.tqSygd1(begin,end);
-        ResultBean r = new ResultBean(list);
+        return new ResultBean<>(list);
-        return r;
     }
 }

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

@@ -906,8 +906,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
 
     private List<DmYdjhxf> tqSygd2(String begin,String end){
         List<String> slkw=Arrays.asList("7","8","9","5","6","15","11","14");
-        List<DmSygdMx> list = this.list(Wrappers.<DmSygdMx>lambdaQuery().between(DmSygdMx::getJssj, begin, end));
+        List<DmSygdMx> list = this.list(Wrappers.<DmSygdMx>lambdaQuery()
+                .between(DmSygdMx::getJssj, begin, end)
+                .orderBy(true,true,DmSygdMx::getDcCh,DmSygdMx::getDcPl,DmSygdMx::getSlrq)
+        );
         Map<String, List<DmSygdMx>> collect = list.stream().collect(Collectors.groupingBy(item -> item.getDcCh() +"_"+ item.getDcPl()));
+
         List<DmYdjhxf> list2=new ArrayList<>();
         //按批次合并为一行
         collect.forEach((key,val)->{
@@ -1005,8 +1009,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             dmYdjhxf.setSkpt(skpt.get()+"");
             val.stream().filter(item->"6".equals(item.getKw()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setPtks(item.getQgrq()));
+
             val.stream().filter(item->"6".equals(item.getKw()))
                 .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setPtjs(item.getQjgrq()));
+
             dmYdjhxf.setSkbs(skbs.get()+"");
             val.stream().filter(item->"15".equals(item.getKw()))
                     .min(Comparator.comparing(DmSygdMx::getQgrq)).ifPresent(item -> dmYdjhxf.setSkqgks(item.getQgrq()));
@@ -1021,7 +1027,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
             dmYdjhxf.setFdxq(val.get(0).getJssj());
             list2.add(dmYdjhxf);
         });
-        return list2;
+//        return list2.stream().sorted(Comparator.comparing(item -> item.getDcCh() +"_"+ item.getDcPl()+"_"+item.getSl())).collect(Collectors.toList());
+        return list2.stream().sorted(Comparator.comparing(DmYdjhxf::getSl)).collect(Collectors.toList());
     }
 
     @Transactional