1.修正预配盘因bom中ylbs缺失导致的问题

2.修正预配盘完整检查可能会导致数据遗漏的问题

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

@@ -101,8 +101,8 @@ public class ZyjhController {
      * 零件摆放,预配盘报工
      */
     @PostMapping("ppBGong")
-    public ResultBean<?> ppBGong(@RequestBody List<PPBGongDto> ppbGongDtoList){
-        ppbGongDtoList.forEach(dto->{
+    public ResultBean<?> ppBGong(@RequestBody List<PPBGongDto> ppBGongDtoList){
+        ppBGongDtoList.forEach(dto->{
             if (ObjUtil.isNotEmpty(dto.getLjList())){
                 List<DmYdjhLj> list=dto.getLjList();
                 zyjhService.ppBGong(list,dto.getDcCh(),dto.getDcPl(),dto.getZyq());

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> {
 
+    int getNotPPLjCount(String dcch,String pl,String fd);
+
     List<DmYdjh> getWithDjh(Integer zt,String zyq);
 
     List<Object> getWppljAndPpyz(String zyq1);

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

@@ -52,13 +52,7 @@ public class ZyjhService extends ServiceImpl<DmYdjhMapper,DmYdjh> {
     }
 
     public void ppwc(Integer id,String dcCh,String dcPl,String dcFd){
-        int count = ljService.count(Wrappers.<DmYdjhLj>lambdaQuery()
-                .eq(DmYdjhLj::getCzbh, dcCh)
-                .eq(DmYdjhLj::getPl, dcPl)
-                .eq(DmYdjhLj::getFd, dcFd)
-                .isNull(DmYdjhLj::getQq)
-                .isNull(DmYdjhLj::getDw)
-        );
+        int count = baseMapper.getNotPPLjCount(dcCh,dcPl,dcFd);
         if (count==0){
             yppyzService.update(new UpdateWrapper<DmYppyz>().set("status","已摆放").eq("id",id));
         }

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

@@ -934,7 +934,7 @@
         from dm_ydjh,dm_bom
                          LEFT JOIN dm_qfxq on dm_qfxq.DC_CH=dm_bom.dcch and dm_qfxq.DC_PL=dm_bom.pl and dm_qfxq.DC_FD=dm_bom.fd
         WHERE
-            dm_ydjh.dc_ch= dm_bom.dcch
+            dm_ydjh.dc_ch= dm_bom.dcch and dm_bom.type='b'
           and dm_ydjh.dc_pl=dm_bom.pl
           and dm_ydjh.tzbh=dm_bom.tzbh
           and dm_ydjh.dc_ch=#{dcCh} and dm_ydjh.dc_pl=#{dcPl} and dm_ydjh.tzbh=#{tzbh}
@@ -1214,6 +1214,16 @@ where dc_ch=#{dcch} and dc_pl =#{dcpl}
         order by a.dc_ch,a.dc_pl,a.tzbh
     </select>
 
+    <select id="getNotPPLjCount" resultType="java.lang.Integer">
+        SELECT count(1)
+        from
+            dm_bom a,dm_ydjh b
+        WHERE
+            a.dcch=b.dc_ch and a.pl=b.dc_pl and a.tzbh=b.tzbh
+            and a.dcch =#{dcch} and a.pl=#{pl} and a.fd=#{fd} and a.type='b' and b.ylbs='N'
+          and not EXISTS (SELECT czbh,tlth from dm_ydjh_lj b where a.dcch=b.czbh and a.tzbh=b.tlth and isnull(b.qq,'')!='' and isnull(b.dw,'')!='')
+    </select>
+
 
     <update id="xzylbs"   parameterType="string" >
         UPDATE dm_ydjh set dm_ydjh.ylbs=dm_bchxylp.sfyl

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

@@ -28,8 +28,7 @@
             dm_yppyz a,
             dm_ydjh b left join dm_ydjh_lj c on b.dc_ch=c.czbh and b.dc_pl=c.pl and b.tzbh=c.tlth
         where
-            a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd
-            and a.status='已摆放' and b.zt>=62
+            a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd and a.status='已摆放' and b.lx='b' and b.zt>=62
             <if test="dcCh!=null and dcCh!=''">
               and a.dc_ch=#{dcCh}
             </if>
@@ -50,7 +49,7 @@
             dm_yppyz a,
             dm_ydjh b left join dm_ydjh_lj c on b.dc_ch=c.czbh and b.dc_pl=c.pl and b.tzbh=c.tlth
         where
-            a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd
+            a.dc_ch=b.dc_ch and a.dc_pl=b.dc_pl and a.dc_fd =c.fd and b.lx='b'
             and a.status='设置垛位' and b.zt>=62
             and b.zyq1=#{zyq} and a.dc_ch=#{dcCh}
             and isnull(c.qq,'')='' and isnull(c.dw,'')=''