1.预配盘临时提交

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

@@ -39,6 +39,10 @@ public class DmYppyz extends Model<DmYppyz> {
 
     private StatusEnum status=StatusEnum.未设置垛位;
 
+    public static StatusEnum 已设置垛位状态(){
+        return StatusEnum.设置垛位;
+    }
+
     public static DmYppyz of(DmYdjh ydjh){
 
         DmYppyz dmYppyz = new DmYppyz();
@@ -46,7 +50,7 @@ public class DmYppyz extends Model<DmYppyz> {
         return dmYppyz;
     }
 
-    private enum StatusEnum{
+    public enum StatusEnum{
         未设置垛位,设置垛位,已配送
     }
 }

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

@@ -5,9 +5,12 @@ 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.jhgk.DmYdjhLj;
+import com.dsic.gj_erp.bean.zyjh.DmYppyz;
 import com.dsic.gj_erp.service.jcsj.impl.DmDwxxpService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhLjService;
 import com.dsic.gj_erp.service.jhgk.DmYdjhService;
+import com.dsic.gj_erp.service.zyjh.DmYppyzService;
+import com.dsic.gj_erp.service.zyjh.ZyjhService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,10 +21,15 @@ import java.util.List;
 @AllArgsConstructor
 public class GetXXXController {
 
+    private final ZyjhService zyjhService;
     private final DmDwxxpService dmDwxxpService;
-    private final DmYdjhService dmYdjhService;
     private final DmYdjhLjService ydjhLjService;
 
+    @GetMapping("getYppyz")
+    public ResultBean<?> getYppyz(String zyq){
+        return new ResultBean<>(zyjhService.getWppljAndPpyz(zyq));
+    }
+
     @PostMapping("getYdjhlj")
     public ResultBean<?> getYdjhlj(@RequestBody DmYdjhLj lj){
         List<DmYdjhLj> list = ydjhLjService.list(Wrappers.<DmYdjhLj>lambdaQuery()
@@ -33,7 +41,6 @@ public class GetXXXController {
 
     @GetMapping("tq")
     public ResultBean<?> tqFromYdjh(){
-
         return new ResultBean<>(dmDwxxpService.getDwxxForSelect());
     }
 

src/main/java/com/dsic/gj_erp/mapper/jhgk/DmYdjhMapper.java

@@ -22,6 +22,8 @@ import java.util.Map;
  */
 public interface DmYdjhMapper extends BaseMapper<DmYdjh> {
 
+    List<Object> getWppljAndPpyz(String zyq1);
+
     List<DmYdjh> tqYppyzFromYdjh(DmYdjh dmYdjh);
 
     List<DmSygdMx> getSygdmx(String nextMonth);

src/main/java/com/dsic/gj_erp/service/zyjh/ZyjhService.java

@@ -39,6 +39,13 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
 
     private static final String MPDHSJ_KEY="MPDHSJ";
 
+    /**
+     * 获取预配盘原则和对应未配盘零件信息
+     */
+    public Object getWppljAndPpyz(String zyq1){
+        return baseMapper.getWppljAndPpyz(zyq1);
+    }
+
     public Map<String,Object> getMPSYCLJLJBP(String dcCh,String tzbh){
         return baseMapper.getMPSYCLJLJBP(dcCh,tzbh);
     }

src/main/resources/mappers/jhgk/DmYdjhMapper.xml

@@ -937,7 +937,6 @@
             dm_ydjh.dc_ch= dm_bom.dcch
           and dm_ydjh.dc_pl=dm_bom.pl
           and dm_ydjh.tzbh=dm_bom.tzbh
-          and dm_ydjh.dc_fd=dm_bom.fd
           and dm_ydjh.dc_ch=#{dcCh} and dm_ydjh.dc_pl=#{dcPl} and dm_ydjh.tzbh=#{tzbh}
     </select>
 
@@ -1149,6 +1148,14 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
 
     </select>
 
+    <select id="getWppljAndPpyz" resultType="java.lang.Object">
+        select a.dc_ch,a.dc_pl,b.id,b.tlth
+        from dm_yppyz a inner join dm_ydjh_lj b on a.dc_ch=b.czbh and a.dc_pl=b.pl
+                        left join dm_ydjh c on b.czbh=c.dc_ch and b.pl=c.dc_pl and b.tlth =c.tzbh
+        where
+            a.status='设置垛位' and b.ppzt='01' and c.zyq1=#{zyq1}
+    </select>
+
 
     <update id="xzylbs"   parameterType="string" >
         UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl