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 c80b737..bb08547 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 @@ -101,13 +101,13 @@ public class DmSygdMxServiceImpl extends ServiceImpl i .between(DmSygdMx::getJssj, from, to) ); if (ObjectUtil.isNotEmpty(sygdMxes)){ - List collect = sygdMxes.stream().map(dmSygd -> { - DmSygdMx dmSygdMx = new DmSygdMx(); - dmSygdMx.setId(dmSygd.getId()); - dmSygdMx.setZt("2"); - return dmSygdMx; - }).collect(Collectors.toList()); - this.updateBatchById(collect); +// List collect = sygdMxes.stream().map(dmSygd -> { +// DmSygdMx dmSygdMx = new DmSygdMx(); +// dmSygdMx.setId(dmSygd.getId()); +// dmSygdMx.setZt("2"); +// return dmSygdMx; +// }).collect(Collectors.toList()); +// this.updateBatchById(collect); //生成作业计划 List dmYdjhs = this.generateYdjh(sygdMxes); diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java index fd986c1..6a1986c 100644 --- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java +++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/YdjhImportService.java @@ -68,13 +68,13 @@ public class YdjhImportService extends ServiceImpl { // .eq("pl", dcPl) // ); }); -// List qwb = ydjhImports.stream() -// .filter(YdjhImport::isAvailable) -// .filter(item -> !item.getDcPl().contains("-"))//去除T型材 -// .filter(item -> !item.getDcPl().contains("/"))//去除T型材 -// .filter(item -> StrUtil.isNotEmpty(item.getDcFd())) -// .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList()); -// this.execute(qwb); + List qwb = ydjhImports.stream() + .filter(YdjhImport::isAvailable) + .filter(item -> !item.getDcPl().contains("-"))//去除T型材 + .filter(item -> !item.getDcPl().contains("/"))//去除T型材 + .filter(item -> StrUtil.isNotEmpty(item.getDcFd())) + .filter(item -> item.getDcPl().contains("Q")).collect(Collectors.toList()); + this.execute(qwb); List list = ydjhImports.stream() .filter(YdjhImport::isAvailable)