修改工厂日历接口数据格式

修改工序CD保存等参数格式

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;
 
 /**
  * <p>
@@ -32,15 +37,23 @@ public class EmGcrlController {
     @ApiOperation(value = "查询")
     @PostMapping(value = "/getList")
     public ResultBean getList(@RequestBody JSONObject json) {
-        List<EmGcrl> emGcrls= emGcrlService.getList(json);
+//        List<EmGcrl> emGcrls= emGcrlService.getList(json);
-        return new ResultBean(emGcrls);
+        List<EmGcrl> emGcrls=emGcrlService.list(new QueryWrapper<EmGcrl>().orderByAsc("gl"));
+        Map<String,List<EmGcrl>> years= emGcrls.stream().collect(Collectors.groupingBy(EmGcrl::getNf));
+        List<String> 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<EmGcrl> emGcrls) {
+    public ResultBean update(@RequestBody EmGcrl emGcrl) {
-        emGcrlService.update(emGcrls);
+        emGcrlService.update(new UpdateWrapper<EmGcrl>().set("xxr",emGcrl.getXxr()).eq("gl",emGcrl.getGl()));
 
         return new ResultBean();
     }

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){
+    public ResultBean<?> 设置工序CD(@RequestBody List<工序CD> _工序CD){
-        _工序CD接口.save(_工序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 设备产能 _设备产能){
+    public ResultBean<?> 设置产能(@RequestBody List<设备产能> _设备产能){
-        _设备产能接口.save(_设备产能);
+        for (设备产能 设备产能 : _设备产能) {
+            _设备产能接口.save(设备产能);
+        }
         return new ResultBean<>();
     }
 
-    @GetMapping("remove")
+    @PostMapping("remove")
-    public ResultBean<?> 删除产能(String code){
+    public ResultBean<?> 删除产能(@RequestBody List<设备产能> _设备产能){
-        _设备产能接口.remove(code);
+        for (设备产能 设备产能 : _设备产能) {
+            _设备产能接口.remove(设备产能.getCode());
+        }
         return new ResultBean<>();
     }
 }

src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java

@@ -68,17 +68,19 @@ public class EmGcrlServiceImpl extends ServiceImpl<EmGcrlMapper, EmGcrl> impleme
 
     @Override
     public void generate(String nf) {
-        List<EmGcrl> emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf);
+        //        List<EmGcrl> emGcrlRepositoryByNf=emGcrlRepository.findByNf(nf);
-        if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){
+        nf=this.getOne(new QueryWrapper<EmGcrl>().select("top 1 * ").orderByDesc("nf")).getNf();
-            Integer intNF=Integer.parseInt(nf);
+//        nf=(Integer.parseInt(nf)+1)+"";
-            LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日
+//        if (ObjectUtil.isEmpty(emGcrlRepositoryByNf)){
-            LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日
+        Integer intNF=Integer.parseInt(nf)+1;
-            List<EmGcrl> saveList=new ArrayList<>();
+        LocalDate startDate = LocalDate.of(intNF, 1, 1); // 起始日期：2022年1月1日
-            LocalDate currentDate = startDate;
+        LocalDate endDate = LocalDate.of(intNF, 12, 31); // 结束日期：2022年12月31日
-            String gzr="";
+        List<EmGcrl> saveList=new ArrayList<>();
-            while (currentDate.isBefore(endDate) || currentDate.isEqual(endDate)) {
+        LocalDate currentDate = startDate;
-                EmGcrl emGcrl=new EmGcrl();
+        String gzr="";
-                emGcrl.setNf(nf);
+        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<EmGcrlMapper, EmGcrl> impleme
                 currentDate = currentDate.plusDays(1); // 增加一天，处理下一个日期
             }
             saveBatch(saveList);
-        }
+//        }
     }
 }