diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java index 93227b9..dcb50ac 100644 --- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java +++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java @@ -156,9 +156,6 @@ public class DataFactory { 执行排产(item.getBomList(),item.get均衡需求日期(),工序CDMap); break; } - if ("G175K-12".equals(item.getDcCh())&&"085".equals(item.getDcPl())){ - System.out.println("====="); - } } //需求日期可利用范围是±3天,排产是需要根据产能进行调整 item.set均衡需求日期(DateUtil.offsetDay(DateUtil.parse(item.getXzglxq(),"yyyy/MM/dd"),times)); @@ -171,9 +168,6 @@ public class DataFactory { //查找最小可用资源,进行占用 tmpList = tmpList.stream().filter(资源 -> dto != null && 资源.get_date().isAfterOrEquals(dto.get_资源().get_date())).collect(Collectors.toList()); tmpList.sort(Comparator.comparingDouble((tmp)->tmp.get工序产能MAP().get(Constant.工序.切割).get占用())); - if ("G175K-12".equals(item.getDcCh())&&"085".equals(item.getDcPl())){ - System.out.println("====="); - } tmpList.stream().findFirst().ifPresent(tmp->{ DateTime dateTime = DateUtil.offsetDay(tmp.get_date(), 7); 执行排产(item.getBomList(),dateTime,工序CDMap); 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 5ab71ca..de60c37 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 @@ -113,9 +113,8 @@ public class DmSygdMxServiceImpl extends ServiceImpl i private List generateYdjh(List sygdMxes,List oldYdjhList){ - Map collect = oldYdjhList.stream().collect( - Collectors.collectingAndThen(Collectors.toMap(DmYdjh::getUniqueData, item -> item), map -> map) - ); + Map collect = new HashMap<>(); + oldYdjhList.forEach(item-> collect.put(item.getUniqueData(),item)); return sygdMxes.stream().map(item -> { DmYdjh dmYdjh = new DmYdjh();