From cb554996aee0cf5cb786d2c8b003acb01b71ab74 Mon Sep 17 00:00:00 2001 From: xiaoning <1097449274@qq.com> Date: Tue, 25 Jun 2024 11:58:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8E=82=E6=97=A5?= =?UTF-8?q?=E5=8E=86=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8FCD=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=AD=89=E5=8F=82=E6=95=B0=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/jcsj/EmGcrlController.java | 21 +++++++++++--- .../jhgk/三月滚动排产控制器.java | 28 ++++++++++++++----- .../service/jcsj/impl/EmGcrlServiceImpl.java | 26 +++++++++-------- 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java index c662e77..d294dd5 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jcsj/EmGcrlController.java @@ -2,6 +2,8 @@ package com.dsic.gj_erp.controller.jcsj; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; @@ -12,7 +14,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** *

@@ -32,15 +37,23 @@ public class EmGcrlController { @ApiOperation(value = "查询") @PostMapping(value = "/getList") public ResultBean getList(@RequestBody JSONObject json) { - List emGcrls= emGcrlService.getList(json); - return new ResultBean(emGcrls); +// List emGcrls= emGcrlService.getList(json); + List emGcrls=emGcrlService.list(new QueryWrapper().orderByAsc("gl")); + Map> years= emGcrls.stream().collect(Collectors.groupingBy(EmGcrl::getNf)); + List restDays= emGcrls.stream().filter(l->l.getXxr().equals("0")).map(EmGcrl::getGl).collect(Collectors.toList()); + int nextYear=Integer.parseInt(emGcrls.get(emGcrls.size()-1).getNf())+1; + Map map=new HashMap(); + map.put("years",years.keySet()); + map.put("restDays",restDays); + map.put("nextYear",nextYear); + return new ResultBean(map); } @ApiOperation(value = "批量修改") @PostMapping(value = "/update") - public ResultBean update(@RequestBody List emGcrls) { - emGcrlService.update(emGcrls); + public ResultBean update(@RequestBody EmGcrl emGcrl) { + emGcrlService.update(new UpdateWrapper().set("xxr",emGcrl.getXxr()).eq("gl",emGcrl.getGl())); return new ResultBean(); } 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 1ec1dbb..31dfc1e 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/三月滚动排产控制器.java @@ -12,6 +12,7 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; import java.util.concurrent.Semaphore; @RestController @@ -101,11 +102,20 @@ public class 三月滚动排产控制器 { } @PostMapping("saveGxcd") - public ResultBean 设置工序CD(@RequestBody 工序CD _工序CD){ - _工序CD接口.save(_工序CD); + public ResultBean 设置工序CD(@RequestBody List<工序CD> _工序CD){ + for (工序CD 工序CD : _工序CD) { + _工序CD接口.save(工序CD); + } return new ResultBean<>(); } + @PostMapping("removeGxcd") + public ResultBean 删除工序CD(@RequestBody List<工序CD> _工序CD){ + for (工序CD 工序CD : _工序CD) { + _工序CD接口.remove(工序CD.getGx().name()); + } + return new ResultBean<>(); + } @GetMapping("getSbcnAll") public ResultBean 获取全部产能(){ Object o = _设备产能接口.get(); @@ -113,14 +123,18 @@ public class 三月滚动排产控制器 { } @PostMapping("saveSbcn") - public ResultBean 设置产能(@RequestBody 设备产能 _设备产能){ - _设备产能接口.save(_设备产能); + public ResultBean 设置产能(@RequestBody List<设备产能> _设备产能){ + for (设备产能 设备产能 : _设备产能) { + _设备产能接口.save(设备产能); + } return new ResultBean<>(); } - @GetMapping("remove") - public ResultBean 删除产能(String code){ - _设备产能接口.remove(code); + @PostMapping("remove") + public ResultBean 删除产能(@RequestBody List<设备产能> _设备产能){ + for (设备产能 设备产能 : _设备产能) { + _设备产能接口.remove(设备产能.getCode()); + } return new ResultBean<>(); } } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java index d5f3fd4..4f1d906 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java @@ -68,17 +68,19 @@ public class EmGcrlServiceImpl extends ServiceImpl impleme @Override public void generate(String nf) { - List emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf); - if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){ - Integer intNF=Integer.parseInt(nf); - LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日 - LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日 - List saveList=new ArrayList<>(); - LocalDate currentDate = startDate; - String gzr=""; - while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) { - EmGcrl emGcrl=new EmGcrl(); - emGcrl.setNf(nf); + // List emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf); + nf=this.getOne(new QueryWrapper().select("top 1 * ").orderByDesc("nf")).getNf(); +// nf=(Integer.parseInt(nf)+1)+""; +// if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){ + Integer intNF=Integer.parseInt(nf)+1; + LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日 + LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日 + List saveList=new ArrayList<>(); + LocalDate currentDate = startDate; + String gzr=""; + while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) { + EmGcrl emGcrl=new EmGcrl(); + emGcrl.setNf(intNF+""); String gl = currentDate.format(DateTimeFormatter.ofPattern("yyyy/MM/dd")); emGcrl.setGl(gl); // WeekFields weekFields = WeekFields.of(Locale.getDefault()); @@ -112,6 +114,6 @@ public class EmGcrlServiceImpl extends ServiceImpl impleme currentDate = currentDate.plusDays(1); // 增加一天，处理下一个日期 } saveBatch(saveList); - } +// } } }