From 76e7fe7d66768706b3a3e8edfa115eacdb205317 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Wed, 16 Oct 2024 10:23:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=B5=8F=E8=A7=88=E5=99=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?excel=E4=B8=8A=E4=BC=A0=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jhgk/三月滚动排产控制器.java | 7 +++--- ...日程批量表合并导入控制器.java | 5 +++- .../gj_erp/pc/service/三月滚动接口.java | 23 +++++++++---------- .../jhgk/impl/DmSygdMxServiceImpl.java | 11 +++++++-- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java index 7e8d38e..e1d552f 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/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 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); } diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java index efc1c84..3b6449d 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java +++ b/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 fdList = czplpNewService.list(new QueryWrapper().eq("dc_pl", item.getDcPl()).eq("dc_ch", dcCh)); boolean remove = czplpNewService.remove(new QueryWrapper().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){ diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index 9d60d51..b20c400 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/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->{ - if (lj.getDcch().equals(mx.getDcCh()) - &&lj.getPl().equals(mx.getDcPl()) - && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){ - lj.setParentId(mx.getId()); - } - })); - ljService.saveBatch(ljList,500); + new Thread(()->{ + ljList.forEach(lj-> mxList.forEach(mx->{ + if (lj.getDcch().equals(mx.getDcCh()) + &&lj.getPl().equals(mx.getDcPl()) + && (StrUtil.isBlank(lj.getTzbh())||lj.getTzbh().equals(mx.getTzbh()))){ + lj.setParentId(mx.getId()); + } + })); + ljService.saveBatch(ljList,500); + }).start(); List list= sygdMxService.tqSygd1(begin,end); - ResultBean r = new ResultBean(list); - return r; + return new ResultBean<>(list); } } diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java index 3b81dbc..d2ba251 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java @@ -906,8 +906,12 @@ public class DmSygdMxServiceImpl extends ServiceImpl i private List tqSygd2(String begin,String end){ List slkw=Arrays.asList("7","8","9","5","6","15","11","14"); - List list = this.list(Wrappers.lambdaQuery().between(DmSygdMx::getJssj, begin, end)); + List list = this.list(Wrappers.lambdaQuery() + .between(DmSygdMx::getJssj, begin, end) + .orderBy(true,true,DmSygdMx::getDcCh,DmSygdMx::getDcPl,DmSygdMx::getSlrq) + ); Map> collect = list.stream().collect(Collectors.groupingBy(item -> item.getDcCh() +"_"+ item.getDcPl())); + List list2=new ArrayList<>(); //按批次合并为一行 collect.forEach((key,val)->{ @@ -1005,8 +1009,10 @@ public class DmSygdMxServiceImpl extends ServiceImpl 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 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