采购问题修改

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailMapper.java

@@ -69,7 +69,7 @@ public interface PmsPurchaseBillDetailMapper extends BaseMapper<PmsPurchaseBillD
 	@Select("select * from pms_purchase_bill_detail where billSid = #{billSid}")
 	List<PmsPurchaseBillDetailDetailsVo> selByMainSid(String billSid);
 
-    IPage<PmsPurchaseBillDetailReportVo> purDetailReForm(IPage<PmsPurchaseBillDetail> page, QueryWrapper<PmsPurchaseBillDetail> qw);
+    IPage<PmsPurchaseBillDetailReportVo> purDetailReForm(IPage<PmsPurchaseBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PmsPurchaseBillDetail> qw);
 
-	IPage<PmsPurchaseBillDetailSumVo> purSumReForm(IPage<PmsPurchaseBillDetail> page, QueryWrapper<PmsPurchaseBillDetail> qw);
+	IPage<PmsPurchaseBillDetailSumVo> purSumReForm(IPage<PmsPurchaseBillDetail> page, @Param(Constants.WRAPPER) QueryWrapper<PmsPurchaseBillDetail> qw);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailService.java

@@ -124,6 +124,7 @@ public class PmsPurchaseBillDetailService extends MybatisBaseService<PmsPurchase
         if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
             qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
         }
+        qw.eq("pdd.isDelete",0);
         qw.groupBy("pdd.goodsSkuCode");
         IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
         IPage<PmsPurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);