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 db73a13..0b9ef84 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java @@ -91,8 +91,17 @@ public class 三月滚动排产控制器 { } @PostMapping("saveDhjh") - public ResultBean 设置订货计划(@RequestBody 订货计划 _订货计划){ - _订货计划滚动信息接口.save(_订货计划); + public ResultBean 设置订货计划(@RequestBody List<订货计划> _订货计划){ + for (订货计划 订货计划 : _订货计划) { + _订货计划滚动信息接口.save(订货计划); + } + return new ResultBean<>(); + } + @PostMapping("removeDhjh") + public ResultBean 删除订货计划(@RequestBody List<订货计划> _订货计划){ + for (订货计划 订货计划 : _订货计划) { + _订货计划滚动信息接口.remove(订货计划.getKey()); + } return new ResultBean<>(); } @@ -131,7 +140,7 @@ public class 三月滚动排产控制器 { return new ResultBean<>(); } - @PostMapping("remove") + @PostMapping("removeSbcn") public ResultBean 删除产能(@RequestBody List<设备产能> _设备产能){ for (设备产能 设备产能 : _设备产能) { _设备产能接口.remove(设备产能.getCode()); 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 a941460..64a8a26 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java @@ -1,5 +1,6 @@ package com.dsic.gj_erp.pc.service; +import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.pc.工序CD; import com.dsic.gj_erp.pc.订货计划; import lombok.AllArgsConstructor; @@ -9,10 +10,8 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; +import java.util.*; +import java.util.stream.Collectors; @Service @AllArgsConstructor @@ -46,6 +45,7 @@ public class 订货计划滚动信息接口 { 订货计划 _订货计划= (订货计划) redisTemplate.opsForValue().get(key); list.add(_订货计划); } + list = list.stream().sorted(Comparator.comparing(订货计划::getMonth).thenComparing(订货计划::getIndex)).collect(Collectors.toList()); return list; } } diff --git a/src/main/java/com/dsic/gj_erp/pc/订货计划.java b/src/main/java/com/dsic/gj_erp/pc/订货计划.java index 2f5f0be..cc22281 100644 --- a/src/main/java/com/dsic/gj_erp/pc/订货计划.java +++ b/src/main/java/com/dsic/gj_erp/pc/订货计划.java @@ -6,6 +6,7 @@ import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; +import java.util.ArrayList; import java.util.List; @Getter @@ -20,7 +21,7 @@ public class 订货计划 { private String tonnage; private String sumWeight; private String allArriveData;//到齐日期 - + private String key; public String getKey(){ return this.month+this.dcch+pls; } @@ -37,6 +38,7 @@ public class 订货计划 { try { int start=Integer.parseInt(split.get(0)); int end=Integer.parseInt(split.get(1)); + this.plList=new ArrayList<>(); for (int i=start;i<=end;i++){ this.plList.add(i+""); }