1.完善配盘流程

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

@@ -54,6 +54,9 @@ public class DmYppyz extends Model<DmYppyz> {
     @TableField(exist = false)
     private List<DmBom> bomList;
 
+    @TableField(exist = false)
+    private String zt;
+
     public void 设置状态(String name){
         this.status=StatusEnum.valueOf(name);
     }

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<DmYppyz> list = service.wbfList(entity);
+        List<YppDto> list = service.wbfList(entity);
         return new ResultBean<>(list);
     }
 

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<DmYppyz> ybf = zyjhService.getYbf(yppyz);
+        List<YppDto> ybf = zyjhService.getYbf(yppyz);
         return new ResultBean<>(ybf);
     }
 

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<DmYppyz> {
-    List<DmYppyz> bgList(DmYppyz entity);
-    List<DmYppyz> wbfList(DmYppyz entity);
+    List<YppDto> bgList(DmYppyz entity);
+    List<YppDto> wbfList(DmYppyz entity);
 
 }

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<DmYppyzMapper, DmYppyz> {
 
-    public List<DmYppyz> bgList(DmYppyz entity) {
+    public List<YppDto> bgList(DmYppyz entity) {
         return baseMapper.bgList(entity);
     }
 
-    public List<DmYppyz> wbfList(DmYppyz entity) {
+    public List<YppDto> wbfList(DmYppyz entity) {
         return baseMapper.wbfList(entity);
     }
 }

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<DmYdjhMapper,DmYdjh> {
         yppyzService.update(new UpdateWrapper<DmYppyz>().set("status","已配送").eq("id",id));
     }
 
-    public List<DmYppyz> getYbf(DmYppyz yppyz) {
-        return yppyzService.bgList(yppyz);
+    public List<YppDto> getYbf(DmYppyz yppyz) {
+        List<YppDto> yppyzList = yppyzService.bgList(yppyz);
+
+        return yppyzList.stream().filter(item->{
+            List<DmYdjhLj> 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){

src/main/resources/mappers/zyjh/YppyzMapper.xml

@@ -30,19 +30,17 @@
 
     <select id="bgList" resultMap="bgListResult">
         SELECT
-        a.id,a.dc_ch ,a.dc_pl , c.zl ,c.kw,c.lx ,c.dwxx_id,
-        b.id lj_id,b.czbh lj_czbh,b.pl lj_pl,b.fd lj_fd,b.tlth lj_tlth,b.ljbh lj_ljbh,b.qq lj_qq,b.dw lj_dw,b.lx lj_lx
+            b.czbh dc_ch ,b.pl dc_pl,b.fd as dc_fd, b.zl ,b.kw,b.lx,
+            b.id lj_id,b.czbh lj_czbh,b.pl lj_pl,b.fd lj_fd,b.tlth lj_tlth,b.ljbh lj_ljbh,b.qq lj_qq,b.dw lj_dw,b.lx lj_lx,
+            b.ppzt lj_ppzt,
+            d.id bom_id,d.dcch bom_dcch,d.tzbh bom_tzbh,d.ljbh bom_ljbh
         from
-        dm_ydjh a left join dm_ydjh_lj b on a.dc_ch =b.czbh and a.dc_pl =b.pl and a.tzbh =b.tlth
-        left join dm_yppyz c on b.lx=c.lx and b.zl =b.zl AND b.kw =c.kw
+            dm_bom d left join dm_ydjh_lj b on d.dcch  =b.czbh and d.pl =b.pl and d.tzbh  =b.tlth and b.ljbh=d.ljbh
         WHERE
-        a.zt>=62 and b.ppzt &lt;'04' and isnull(b.lx,'')!=''
+            isnull(b.lx,'')!='' and b.ppzt&lt;'03'
             <if test="dcCh!='' and dcCh!=''">
                 and a.dc_ch=#{dcCh}
             </if>
-        <if test="zyq!='' and zyq!=''">
-            and a.zyq1=#{zyq}
-        </if>
             order by a.dc_ch ,a.dc_pl
     </select>
 
@@ -55,11 +53,17 @@
             dm_ydjh a left join dm_ydjh_lj b on a.dc_ch =b.czbh and a.dc_pl =b.pl and a.tzbh =b.tlth
             left join dm_yppyz c on b.lx=c.lx and b.zl =b.zl AND b.kw =c.kw
         WHERE
-            a.zt>=62 and b.ppzt &lt;'04' and isnull(b.lx,'')!=''
-            <if test="dcCh!='' and dcCh!=''">
+            a.zt>=62  and isnull(b.lx,'')!=''
+            <if test="zt==null or zt==''">
+                and b.ppzt &lt;'04'
+            </if>
+            <if test="zt=='04'">
+                and b.ppzt ='04'
+            </if>
+            <if test="dcCh!=null and dcCh!=''">
                 and a.dc_ch=#{dcCh}
             </if>
-            <if test="zyq!='' and zyq!=''">
+            <if test="zyq!=null and zyq!=''">
                 and a.zyq1=#{zyq}
             </if>
             order by a.dc_ch ,a.dc_pl