From c0994e8f46c5e6e6fb30abcdca1c9e2cc8418ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Fri, 28 Feb 2025 09:28:13 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=AD=A3=E6=89=B9=E9=87=8F=E4=B8=8A?= =?UTF-8?q?=E6=96=99=E9=A2=84=E5=A4=84=E7=90=86=E5=9E=9B=E4=BD=8D=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=202.=E5=A2=9E=E5=8A=A0=E5=88=87=E5=89=B2=E5=90=8E?= =?UTF-8?q?=E6=91=86=E6=94=BE=E5=8A=9F=E8=83=BD=203.=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=8F=AD=E7=BB=84=E4=BA=BA=E5=91=98=E8=81=8C=E4=BD=8D=E4=B8=BA?= =?UTF-8?q?=E5=88=92=E7=BA=BF=E6=97=B6=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=204.=E4=BD=9C=E4=B8=9A=E8=AE=A1=E5=88=92=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=BF=E6=95=B0=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=A5=97?= =?UTF-8?q?=E6=96=99=E5=9B=BE=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java | 12 +++++------- src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java | 8 ++++++++ .../gj_erp/controller/jcsj/DmDwxxpController.java | 7 +++++-- .../gj_erp/controller/zyjh/DmYppyzController.java | 1 + .../gj_erp/service/jcsj/impl/DmDwxxpService.java | 4 ++-- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java index 3e80c66..3f3eb66 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/DmDwxxp.java +++ b/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; } diff --git a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java b/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java index bd6ad45..06f855e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/zyjh/DmYppyz.java +++ b/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{ + 未设置垛位,设置垛位,已配送 + } } diff --git a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java b/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java index aed259c..09b82e9 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jcsj/DmDwxxpController.java +++ b/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> 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<>(); diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java index 976dff4..c77d1fe 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/DmYppyzController.java +++ b/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 list = service.list(Wrappers.lambdaQuery() .eq(StrUtil.isNotEmpty(entity.getDcCh()), DmYppyz::getDcCh, entity.getDcCh()) + .eq(StrUtil.isNotEmpty(entity.getDcPl()), DmYppyz::getDcPl, entity.getDcPl()) ); return new ResultBean<>(list); } diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java index c1651ca..fa0e4eb 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmDwxxpService.java @@ -20,10 +20,10 @@ public class DmDwxxpService extends MppServiceImpl { @Transactional(rollbackFor = Exception.class) public void saveOrEdit(List list){ - this.saveOrUpdateBatchByMultiId(list); + this.saveOrUpdateBatch(list); } public void remove(DmDwxxp dwxxp){ - baseMapper.deleteByMultiId(dwxxp); + baseMapper.deleteById(dwxxp); } }