1.完善上料反馈界面逻辑

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

@@ -0,0 +1,22 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 预处理垛位
+ */
+@Getter
+@Setter
+public class Ycldw {
+
+    private Integer id;
+    private String name;
+
+    @TableField(exist = false)
+    private List<YcldwInfo> list;
+
+}

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

@@ -0,0 +1,42 @@
+package com.dsic.gj_erp.bean.zyjh;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 预处理垛位层数信息
+ */
+@Getter
+@Setter
+public class YcldwInfo {
+
+    private String id;
+    private Integer dwId;
+    private Integer ceng;
+    private String czbh;
+    private String pl;
+    private String fd;
+    private String kw;
+    private String zl;
+    private String tlth;
+
+    private String wph;
+    private String wpgg;
+    private String sljhrq;
+    private String qgjhrq;
+    private String bfr;//摆放人
+    private String bfrq;//摆放日期
+    private ZtEnum zt;
+
+    private void baifang(){
+        this.zt=ZtEnum.BF;
+    }
+
+    private void paowan(){
+        this.zt=ZtEnum.PW;
+    }
+
+    private enum ZtEnum{
+        BF,PW
+    }
+}

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

@@ -1,13 +1,19 @@
 package com.dsic.gj_erp.controller.zyjh;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsic.gj_erp.bean.ResultBean;
+import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.pgd.PgdSljh;
 import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
+import com.dsic.gj_erp.mapper.zyjh.YcldwMapper;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
+import com.dsic.gj_erp.service.pgd.PgdSljhService;
 import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
+
-import org.springframework.web.bind.annotation.RequestMapping;
+import java.util.List;
-import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequestMapping("zyjh")
@@ -16,9 +22,35 @@ public class ZyjhController {
 
     private final DmYdjhService ydjhService;
 
+    private final PgdSljhService pgdSljhService;
+
+    private final YcldwMapper ycldwMapper;
+
+    /**
+     * 获取上料计划
+     */
+    @PostMapping("sljh")
+    public ResultBean<?> sljh(){
+        String date = DateUtil.date().toString("yyyy/MM/dd");
+        List<DmYdjh> list = ydjhService.list(Wrappers.<DmYdjh>lambdaQuery()
+                .le(DmYdjh::getSlrq, date)
+                .eq(DmYdjh::getZt, "2")
+        );
+        return new ResultBean<>(list);
+    }
+
+    /**
+     * 获取预处理垛位信息
+     */
+    @PostMapping("ycldw")
+    public ResultBean<?> ycldw(){
+        return new ResultBean<>(ycldwMapper.ycldwList());
+    }
+
     @PostMapping("sl")
     public ResultBean<?> sl(@RequestBody ShangLiao sl){
 
         return new ResultBean<>();
     }
+
 }

src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java

@@ -0,0 +1,7 @@
+package com.dsic.gj_erp.mapper.zyjh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
+
+public interface YcldwInfoMapper extends BaseMapper<YcldwInfo> {
+}

src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwMapper.java

@@ -0,0 +1,12 @@
+package com.dsic.gj_erp.mapper.zyjh;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsic.gj_erp.bean.zyjh.Ycldw;
+
+import java.util.List;
+
+public interface YcldwMapper extends BaseMapper<Ycldw> {
+
+    List<Ycldw> ycldwList();
+
+}

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

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsic.gj_erp.mapper.zyjh.YcldwMapper">
+
+    <resultMap id="ycldwVo" type="ycldw">
+        <id column="id" property="id" jdbcType="VARCHAR" />
+        <result column="name" property="name" jdbcType="VARCHAR" />
+        <collection property="list" ofType="ycldwInfo" javaType="java.util.ArrayList" columnPrefix="info_" >
+            <id column="id" property="id" jdbcType="INTEGER" />
+            <result column="ceng" property="ceng" jdbcType="INTEGER" />
+            <result column="czbh" property="czbh" jdbcType="VARCHAR" />
+            <result column="pl" property="pl" jdbcType="VARCHAR" />
+            <result column="fd" property="fd" jdbcType="VARCHAR" />
+            <result column="kw" property="kw" jdbcType="VARCHAR" />
+            <result column="zl" property="zl" jdbcType="VARCHAR" />
+            <result column="tlth" property="tlth" jdbcType="VARCHAR" />
+            <result column="wpgg" property="wpgg" jdbcType="VARCHAR" />
+            <result column="wph" property="wph" jdbcType="VARCHAR" />
+            <result column="sljhrq" property="sljhrq" jdbcType="DOUBLE" />
+            <result column="qgjhrq" property="qgjhrq" jdbcType="VARCHAR" />
+            <result column="bfr" property="bfr" jdbcType="VARCHAR" />
+            <result column="bfrq" property="bfrq" jdbcType="VARCHAR" />
+            <result column="zt" property="zt" jdbcType="VARCHAR" />
+        </collection>
+    </resultMap>
+
+    <sql id="ycldwInfo" >
+        b.id info_id,b.ceng info_ceng,b.czbh info_czbh,b.pl info_pl,b.fd info_fd,b.kw info_kw,b.zl info_zl,b.tlth info_tlth,
+             b.wpgg info_wpgg,b.wph info_wph,b.sljhrq info_sljhrq,b.qgjhrq info_qgjhrq,b.bfr info_bfr,b.bfrq info_bfrq,b.zt info_zt
+    </sql>
+
+    <select id="ycldwList" resultMap="ycldwVo">
+        select
+            a.id,a.name,
+            <include refid="ycldwInfo" />
+        from
+            ycldw a left join ycldw_info b on a.id=b.dw_id AND b.zt='BF'
+        order by ceng desc
+    </select>
+</mapper>