From 87c74fc03cd4293a3d7c55e93236b531b57e3b10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=93=B2=E5=A5=87?= <13840175730@139.com> Date: Mon, 7 Apr 2025 15:11:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E9=85=8D=E7=9B=98=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dsic/gj_erp/bean/zyjh/DmYppyz.java | 3 ++ .../controller/zyjh/DmYppyzController.java | 3 +- .../controller/zyjh/ZyjhController.java | 2 +- .../gj_erp/mapper/zyjh/DmYppyzMapper.java | 5 ++- .../gj_erp/service/zyjh/DmYppyzService.java | 5 ++- .../dsic/gj_erp/service/zyjh/ZyjhService.java | 15 +++++++- .../resources/mappers/zyjh/YppyzMapper.xml | 38 ++++++++++--------- 7 files changed, 46 insertions(+), 25 deletions(-) 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 39eed75..e751c31 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 @@ -54,6 +54,9 @@ public class DmYppyz extends Model { @TableField(exist = false) private List bomList; + @TableField(exist = false) + private String zt; + public void 设置状态(String name){ this.status=StatusEnum.valueOf(name); } 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 0f5292f..7eb1b4f 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 @@ -6,6 +6,7 @@ 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.zyjh.DmYppyz; +import com.dsic.gj_erp.controller.zyjh.dto.YppDto; import com.dsic.gj_erp.service.zyjh.DmYppyzService; import lombok.AllArgsConstructor; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +28,7 @@ public class DmYppyzController { @PostMapping("wbfList") public ResultBean wbfList(@RequestBody DmYppyz entity){ - List list = service.wbfList(entity); + List list = service.wbfList(entity); return new ResultBean<>(list); } diff --git a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java index cf33cc6..a89d9a3 100644 --- a/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java +++ b/src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java @@ -93,7 +93,7 @@ public class ZyjhController { */ @PostMapping("wzxjc") public ResultBean wzxjc(@RequestBody DmYppyz yppyz){ - List ybf = zyjhService.getYbf(yppyz); + List ybf = zyjhService.getYbf(yppyz); return new ResultBean<>(ybf); } diff --git a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java b/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java index 20a714b..876d4b5 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/zyjh/DmYppyzMapper.java @@ -2,13 +2,14 @@ package com.dsic.gj_erp.mapper.zyjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.zyjh.DmYppyz; +import com.dsic.gj_erp.controller.zyjh.dto.YppDto; import org.apache.ibatis.annotations.Mapper; import java.util.List; @Mapper public interface DmYppyzMapper extends BaseMapper { - List bgList(DmYppyz entity); - List wbfList(DmYppyz entity); + List bgList(DmYppyz entity); + List wbfList(DmYppyz entity); } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java index 76933f9..fab99f8 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/DmYppyzService.java @@ -2,6 +2,7 @@ package com.dsic.gj_erp.service.zyjh; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.zyjh.DmYppyz; +import com.dsic.gj_erp.controller.zyjh.dto.YppDto; import com.dsic.gj_erp.mapper.zyjh.DmYppyzMapper; import org.springframework.stereotype.Service; @@ -10,11 +11,11 @@ import java.util.List; @Service public class DmYppyzService extends ServiceImpl { - public List bgList(DmYppyz entity) { + public List bgList(DmYppyz entity) { return baseMapper.bgList(entity); } - public List wbfList(DmYppyz entity) { + public List wbfList(DmYppyz entity) { return baseMapper.wbfList(entity); } } diff --git a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java index 5264733..e89ccfd 100644 --- a/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java +++ b/src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java @@ -18,6 +18,7 @@ import com.dsic.gj_erp.bean.zyjh.DmYppyz; import com.dsic.gj_erp.controller.zyjh.dto.PgWithPcDto; import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao; import com.dsic.gj_erp.controller.zyjh.dto.SljhSearch; +import com.dsic.gj_erp.controller.zyjh.dto.YppDto; import com.dsic.gj_erp.mapper.jhgk.DmYdjhMapper; import com.dsic.gj_erp.service.jcsj.DmBzryService; import com.dsic.gj_erp.service.jcsj.DmCbxxpService; @@ -58,8 +59,18 @@ public class ZyjhService extends ServiceImpl { yppyzService.update(new UpdateWrapper().set("status","已配送").eq("id",id)); } - public List getYbf(DmYppyz yppyz) { - return yppyzService.bgList(yppyz); + public List getYbf(DmYppyz yppyz) { + List yppyzList = yppyzService.bgList(yppyz); + + return yppyzList.stream().filter(item->{ + List ljList = item.getLjList(); + for (DmYdjhLj lj :ljList){ + if ("01".equals(lj.getPpzt())){ + return false; + } + } + return true; + }).collect(Collectors.toList()); } public void ppwc(Integer id,String dcCh,String dcPl,String dcFd){ diff --git a/src/main/resources/mappers/zyjh/YppyzMapper.xml b/src/main/resources/mappers/zyjh/YppyzMapper.xml index f5a8fc1..bb9dc56 100644 --- a/src/main/resources/mappers/zyjh/YppyzMapper.xml +++ b/src/main/resources/mappers/zyjh/YppyzMapper.xml @@ -30,20 +30,18 @@