diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
index ec989f20..cfe3c8ef 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java
@@ -409,9 +409,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     @Override
     public IPage<CgdInfoEntity> queryCgdInfoList(Integer pageNo, Integer pageSize, CgdInfoEntity cgdInfoEntityDto, HttpServletRequest req) {
         NuInvoicingCgdInfo nuInvoicingCgdInfo = new NuInvoicingCgdInfo();
-//        String categoryId = cgdInfoEntityDto.getCategoryId();
-//        String typeId = cgdInfoEntityDto.getTypeId();
-//        String medicationId = cgdInfoEntityDto.getMedicationId();
+        String categoryId = cgdInfoEntityDto.getCategoryId();
+        String typeId = cgdInfoEntityDto.getTypeId();
+        String medicationId = cgdInfoEntityDto.getMedicationId();
         BeanUtils.copyProperties(cgdInfoEntityDto,nuInvoicingCgdInfo);
 //        nuInvoicingCgdInfo.setCategoryId(null);
 //        nuInvoicingCgdInfo.setTypeId(null);
@@ -425,9 +425,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
                 "                b.pinyin like concat('%', '"+cgdInfoEntityDto.getWlParamInfo()+"' , '%') or\n" +
                 "                b.material_no like concat('%', '"+cgdInfoEntityDto.getWlParamInfo()+"' , '%') or\n" +
                 "                b.specification_model like concat('%', '"+cgdInfoEntityDto.getWlParamInfo()+"' , '%') )");
-//        queryWrapper.eq(StringUtils.isNotBlank(categoryId),"b.category_id",categoryId);
-//        queryWrapper.eq(StringUtils.isNotBlank(typeId),"b.type_id",typeId);
-//        queryWrapper.eq(StringUtils.isNotBlank(medicationId),"b.medication_id",medicationId);
+        queryWrapper.eq(StringUtils.isNotBlank(categoryId),"b.category_id",categoryId);
+        queryWrapper.eq(StringUtils.isNotBlank(typeId),"b.type_id",typeId);
+        queryWrapper.eq(StringUtils.isNotBlank(medicationId),"b.medication_id",medicationId);
         List<NuInvoicingCgdInfo> list = cgdInfoMapper.queryCgdInfoList(page,queryWrapper);
 //        getOpeMediaAddress();
         for (NuInvoicingCgdInfo cgdInfo : list){
@@ -873,6 +873,21 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             if(qgsl == 0){
                 continue;
             }
+            //查询采购单未完结的单据是否有此请购数量
+            NuInvoicingCgdInfo cgdInfoParam = new NuInvoicingCgdInfo();
+            cgdInfoParam.setNuId(info.getNuId());
+            cgdInfoParam.setWlId(info.getWlId());
+            List<NuInvoicingCgdInfo> listcg = cgdInfoMapper.selectWlNumList(cgdInfoParam);
+            int cgdNum = 0;
+            for(NuInvoicingCgdInfo cgdInfo : listcg){
+                //cgdNum = 采购数量*兑换比例
+                cgdNum += cgdInfo.getPurchaseQuantity() * Integer.parseInt(cgdInfo.getDhbl());
+            }
+
+            if(Integer.parseInt(info.getUpperLimit())<(Integer.parseInt(kcsl) + cgdNum)){
+                continue;
+            }
+
             qgdInfoIns.setPurchaseQuantity(qgsl);
             qgdInfoMapper.insert(qgdInfoIns);
             count++;