1.修正批量上料预处理垛位层数计算错误的问题

2.增加切割后摆放功能

src/main/java/com/dsic/gj_erp/controller/zyjh/GetXXXController.java

@@ -0,0 +1,35 @@
+package com.dsic.gj_erp.controller.zyjh;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
+import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("zyjh")
+@AllArgsConstructor
+public class GetXXXController {
+
+    private final DmDwxxpService dmDwxxpService;
+    private final DmYdjhLjService ydjhLjService;
+
+    @PostMapping("getYdjhlj")
+    public ResultBean<?> getYdjhlj(@RequestBody DmYdjhLj lj){
+        List<DmYdjhLj> list = ydjhLjService.list(Wrappers.<DmYdjhLj>lambdaQuery()
+                .eq(DmYdjhLj::getCzbh, lj.getCzbh())
+                .eq(StrUtil.isNotEmpty(lj.getPl()), DmYdjhLj::getPl, lj.getPl())
+        );
+        return new ResultBean<>(list);
+    }
+
+    @GetMapping("getBFangDwxx")
+    public ResultBean<?> getBFangDwxx(){
+        return new ResultBean<>(dmDwxxpService.getDwxxForSelect());
+    }
+}

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -59,6 +59,17 @@ public class ZyjhController {
 
     private final MpDhsjServcie mpDhsjServcie;
 
+    /**
+     * 零件摆放
+     * @param list
+     * @return
+     */
+    @PostMapping("ljbf")
+    public ResultBean<?> ljbf(@RequestBody List<DmYdjhLj> list){
+
+        return new ResultBean<>();
+    }
+
     @GetMapping("getBzryByBz")
     public ResultBean<?> getBzryByBz(String zyq, String zt){
         return new ResultBean<>(zyjhService.getBzryByBz(zyq,zt));

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

@@ -7,10 +7,17 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
 
+    public Map<String,List<DmDwxxp>> getDwxxForSelect(){
+        List<DmDwxxp> list = this.list();
+        return list.stream().collect(Collectors.groupingBy(DmDwxxp::getQy));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void saveOrEdit(List<DmDwxxp> list){
         this.saveOrUpdateBatchByMultiId(list);
@@ -18,4 +25,5 @@ public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
     public void remove(DmDwxxp dwxxp){
         baseMapper.deleteByMultiId(dwxxp);
     }
+
 }

src/main/resources/mappers/jcsj/DmDwxxpMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.jcsj.DmDwxxpMapper">
+
+</mapper>