diff --git a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
index 879e6b1..5a06dfd 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
+++ b/nursing-unit-api/src/main/java/com/nu/modules/pad/invoicing/api/InvoicingApi.java
@@ -321,7 +321,12 @@ public class InvoicingApi {
     @PostMapping(value = "/pickingInfo")
     public Result<String> pickingInfo(@RequestBody CgdInfoEntity cgdInfoEntityDto) {
         String result = invoicingApi.pickingInfo(cgdInfoEntityDto);
-        return Result.OK("拣货成功！");
+        if(StringUtils.equals("2",result)){
+            return Result.error("入库数量错误，超过请购数量");
+        }else if(StringUtils.equals("3",result)){
+            return Result.error("销账数量错误，超过请购数量");
+        }
+        return Result.OK("操作成功！");
     }
 
 }
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 0f681f4..26211b1 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
@@ -39,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -413,7 +414,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getCgBy()),"qg_by",cgdMainEntityDto.getCgBy());
         queryWrapper.gt(StringUtils.isNotBlank(cgdMainEntityDto.getStartTime()),"qg_date",cgdMainEntityDto.getStartTime());
         queryWrapper.lt(StringUtils.isNotBlank(cgdMainEntityDto.getEndTime()),"qg_date",cgdMainEntityDto.getEndTime());
-        queryWrapper.eq(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
+        queryWrapper.in(StringUtils.isNotBlank(cgdMainEntityDto.getStatus()),"status",cgdMainEntityDto.getStatus());
         Page<NuInvoicingCgdMain> page = new Page<>(pageNo, pageSize);
         List<NuInvoicingCgdMain> list = cgdMainMapper.selectList(page,queryWrapper);
         IPage<CgdMainEntity> entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
@@ -818,6 +819,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String pickingInfo(CgdInfoEntity cgdInfoEntityDto) {
         QueryWrapper<NuInvoicingCgdInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("id",cgdInfoEntityDto.getJhId());
@@ -856,6 +858,16 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         crkInfo.setNewPrice(price);//新的价格
         crkInfo.setCzqkcl(kcsl);//操作前库存量
         String dqkcl = kcsl;
+
+        if(jhNum > cgsl - rksl - xzsl){
+            if(StringUtils.equals("0",jhType)) {//入库操作
+                return "2";//入库数量错误，超过请购数量
+            }else{
+                return "3";//销账数量错误，超过请购数量
+            }
+        }
+
+
         if(StringUtils.equals("0",jhType)){//入库操作
             crkInfo.setCrkStatus("1");
             dqkcl = (Integer.parseInt(kcsl) + jhNum) + "";
@@ -887,14 +899,14 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //判断拣货人信息是否为空，不为空就给值
         if(StringUtils.isEmpty(cgdMain.getJhBy())){
-            cgdMain.setJhBy(loginUser.getRealname());
+//            cgdMain.setJhBy(loginUser.getRealname());
             cgdMain.setJhTime(new Date());
             cgdMain.setStatus("1");
             cgdMainMapper.updateById(cgdMain);
         }
         //判断单据是否完结   如果采购数量 = 入库数量 + 销账数量  就代表这个单据完结了
         if(cgsl == rksl + xzsl){
-            cgdMain.setWjBy(loginUser.getRealname());
+//            cgdMain.setWjBy(loginUser.getRealname());
             cgdMain.setWjTime(new Date());
             cgdMain.setStatus("2");
             cgdMainMapper.updateById(cgdMain);