1.预配盘相关

src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java

@@ -250,4 +250,8 @@ public class DmPpxxb implements Serializable {
     private Double yxqsrq;
 
 
+    private String dwh;
+
+    private String qy;
+
 }

src/main/java/com/dsic/gj_erp/controller/jhgk/YppController.java

@@ -0,0 +1,77 @@
+package com.dsic.gj_erp.controller.jhgk;
+
+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.DmQfxq;
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.bean.pgd.DmPpxxb;
+import com.dsic.gj_erp.mapper.pgd.DmPpxxbMapper;
+import com.dsic.gj_erp.service.jhgk.DmQfxqService;
+import com.dsic.gj_erp.service.pgd.DmPpxxbService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("ypp")
+@AllArgsConstructor
+public class YppController {
+
+    private final DmQfxqService qfxqService;
+    private final DmPpxxbService ppxxbService;
+
+    private final DmPpxxbMapper ppxxbMapper;
+
+    @PostMapping("getQfxq")
+    public ResultBean<?> getQfxq(@RequestBody DmQfxq qfxq){
+        String existsSql="select dc_ch,dc_pl,dc_fd from dm_ppxxb ";
+        StringBuilder builder=new StringBuilder(existsSql);
+        builder.append("where dc_ch=").append("'").append(qfxq.getDcCh()).append("'");
+        if (StrUtil.isNotEmpty(qfxq.getDcPl())){
+            builder.append(" dc_pl=").append("'").append(qfxq.getDcPl()).append("'");
+        }
+        if (StrUtil.isNotEmpty(qfxq.getDcFd())){
+            builder.append(" dc_fd=").append("'").append(qfxq.getDcFd()).append("'");
+        }
+        builder.append(" group by dc_ch,dc_pl,dc_fd");
+        List<DmQfxq> list = qfxqService.list(Wrappers.<DmQfxq>lambdaQuery()
+                .eq(DmQfxq::getDcCh, qfxq.getDcCh())
+                .eq(StrUtil.isNotEmpty(qfxq.getDcPl()),DmQfxq::getDcPl, qfxq.getDcPl())
+                .eq(StrUtil.isNotEmpty(qfxq.getDcFd()),DmQfxq::getDcFd, qfxq.getDcFd())
+                .eq(DmQfxq::getZt,"")
+                .notExists(builder.toString())
+        );
+        return new ResultBean<>(list);
+    }
+
+    @PostMapping("getLjxx")
+    public ResultBean<?> getLjxx(@RequestBody Map<String,Object> map){
+        List<DmYdjhLj> dmYdjhLj = ppxxbMapper.getDmYdjhLj(map);
+        return new ResultBean<>(dmYdjhLj);
+    }
+
+    @PostMapping("getList")
+    public ResultBean<?> getList(@RequestBody DmPpxxb dmPpxxb){
+        List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
+                .eq(DmPpxxb::getDcCh, dmPpxxb.getDcCh())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getDwh()), DmPpxxb::getDwh, dmPpxxb.getDwh())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getQy()), DmPpxxb::getQy, dmPpxxb.getQy())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getDcPl()), DmPpxxb::getDcPl, dmPpxxb.getDcPl())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getDcFd()), DmPpxxb::getDcFd, dmPpxxb.getDcFd())
+        );
+
+        return new ResultBean<>(list);
+    }
+
+    @PostMapping("checkBfwz")
+    public ResultBean<?> checkBfwz(@RequestBody List<DmPpxxb> list){
+
+        return new ResultBean<>();
+    }
+}

src/main/java/com/dsic/gj_erp/controller/pgd/DmPpxxbController.java

@@ -1,10 +1,22 @@
 package com.dsic.gj_erp.controller.pgd;
 
 
+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.pgd.DmPpxxb;
+import com.dsic.gj_erp.service.jhgk.DmQfxqService;
+import com.dsic.gj_erp.service.pgd.DmPpxxbService;
+import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -15,7 +27,29 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/dmPpxxb")
+@AllArgsConstructor
 public class DmPpxxbController {
 
+    private final DmQfxqService qfxqService;
+    private final DmPpxxbService ppxxbService;
+
+    @PostMapping("getDmppxxbList")
+    public ResultBean<?> getDmppxxbList(@RequestBody DmPpxxb dmPpxxb){
+        List<DmPpxxb> list = ppxxbService.list(Wrappers.<DmPpxxb>lambdaQuery()
+                .eq(DmPpxxb::getDcCh, dmPpxxb.getDcCh())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getDwh()),DmPpxxb::getDwh, dmPpxxb.getDwh())
+                .eq(StrUtil.isNotEmpty(dmPpxxb.getQy()),DmPpxxb::getQy, dmPpxxb.getQy())
+        );
+        return new ResultBean<>(list);
+    }
+
+    @PostMapping("saveDmppxxb")
+    @Transactional(rollbackFor = Exception.class)
+    public ResultBean<?> save(@RequestBody List<DmPpxxb> list){
+        ppxxbService.saveOrUpdateBatch(list);
+
+        return new ResultBean<>();
+    }
+
 }
 

src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java

@@ -1,8 +1,12 @@
 package com.dsic.gj_erp.mapper.pgd;
 
+import com.dsic.gj_erp.bean.jhgk.DmYdjhLj;
 import com.dsic.gj_erp.bean.pgd.DmPpxxb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  *  Mapper 接口
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface DmPpxxbMapper extends BaseMapper<DmPpxxb> {
 
+    List<DmYdjhLj> getDmYdjhLj(Map<String,Object> map);
 }

src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.xml

@@ -76,4 +76,12 @@
         ZXWPH, SL, JLDW, WPJB, WPFLM, ZDRY, XGRQ, DC_CH, DC_CM, DC_PL, DC_FD, DC_TH, DC_ZL, DC_TZ, DC_YJ, DC_YS, DC_PB, DC_LPH, DC_TPBH, DC_TPMC, JLDW1, WPMC, WPGG, WPXH, ABCLX, GZLX, YLZD1, LCM1, zt, drcs, tpxx, dzxqq, xzxqq, gylx, YLZD3, XWH, YLZD9, GYSBH, YHFLH, YLZD6, TQQXZL, LCM3, YLZD5, BZ, DEZL, LCM2, YXZZRQ, YLZD2, LCM5, YLZD8, XNJBS, DRRQ, LCM4, FXWPH, WPCC, FWPJB, JZL, XLCC, YLZD7, SJBCSL, YLZD4, GYLB, DRRY, WPH, YXQSRQ
     </sql>
 
+    <select id="getDmYdjhLj" resultType="com.dsic.gj_erp.bean.jhgk.DmYdjhLj">
+        select
+            <include refid="Base_Column_List" />
+        from
+            dm_qfxq xq left join dm_ydjh_lj lj on xq.dc_ch =lj.czbh and xq.dc_pl =lj.pl  and xq.DC_FD =lj.fd
+        WHERE  xq.dc_ch =#{dcCh} and xq.dc_pl =#{dcPl} and xq.DC_FD ={dcFd}
+    </select>
+
 </mapper>