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

2.增加切割后摆放功能
3.修复班组人员职位为划线时的显示问题
4.作业计划查询板数修改为套料图数

src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java

@@ -1,5 +1,7 @@
 package com.dsic.gj_erp.bean.jcsj;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
 import lombok.Getter;
@@ -15,15 +17,11 @@ import java.io.Serializable;
 @TableName("dm_dwxxp")
 public class DmDwxxp implements Serializable {
 
-    @MppMultiId
+    @TableId(type=IdType.AUTO)
+    private Integer id;
+
     private String dwh;//垛位号
 
-    @MppMultiId
     private String qy;//区域
 
-    private String dcCh;
-
-    private String dcPl;
-
-    private String dcFd;
 }

src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java

@@ -31,4 +31,12 @@ public class DmYppyz {
     private String ppch;//配盘船号
 
     private String ypph;//预配盘号
+
+    private Integer dwxxId;
+
+    private StatusEnum status=StatusEnum.未设置垛位;
+
+    private enum StatusEnum{
+        未设置垛位,设置垛位,已配送
+    }
 }

src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("dwxx")
@@ -24,13 +25,15 @@ public class DmDwxxpController {
     @PostMapping("addOrEdit")
     public ResultBean<?> add(@RequestBody Map<String,List<DmDwxxp>> map){
         try {
-            dwxxpService.saveOrEdit(map.get("add"));
+            Optional.ofNullable(map.get("add")).ifPresent(item->{
+                item.forEach(dwxxpService::save);
+            });
             dwxxpService.saveOrEdit(map.get("edit"));
         }catch (Exception e){
             throw new RuntimeException("同一个区域存在相同垛位号,禁止保存");
         }
         if (map.get("remove")!=null&& !map.get("remove").isEmpty()){
-            map.get("remove").forEach(dwxxpService::deleteByMultiId);
+            map.get("remove").forEach(dwxxpService::removeById);
         }
 
         return new ResultBean<>();

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

@@ -47,6 +47,7 @@ public class DmYppyzController {
     public ResultBean<?> list(@RequestBody DmYppyz entity){
         List<DmYppyz> list = service.list(Wrappers.<DmYppyz>lambdaQuery()
                 .eq(StrUtil.isNotEmpty(entity.getDcCh()), DmYppyz::getDcCh, entity.getDcCh())
+                .eq(StrUtil.isNotEmpty(entity.getDcPl()), DmYppyz::getDcPl, entity.getDcPl())
         );
         return new ResultBean<>(list);
     }

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

@@ -20,10 +20,10 @@ public class DmDwxxpService extends MppServiceImpl<DmDwxxpMapper, DmDwxxp> {
 
     @Transactional(rollbackFor = Exception.class)
     public void saveOrEdit(List<DmDwxxp> list){
-        this.saveOrUpdateBatchByMultiId(list);
+        this.saveOrUpdateBatch(list);
     }
     public void remove(DmDwxxp dwxxp){
-        baseMapper.deleteByMultiId(dwxxp);
+        baseMapper.deleteById(dwxxp);
     }
 
 }