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 d1ff513..a5d0b23 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
@@ -1082,7 +1082,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
         }
         crkInfo.setDqkcl(dqkcl);//当前库存量(操作后的库存量)
         crkInfo.setContent("采购单："+cgdMain.getCgdNo());
-        if(crkInfo.getCrkNum()>0){
+        if(crkInfo.getCrkNum()>0 && StringUtils.equals("0",jhType)){
             crkInfoMapper.insert(crkInfo);
         }
 
@@ -1134,7 +1134,7 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl<NuInvoicingCgdMai
             //判断采购物料状态
             if(StringUtils.equals("2",info.getStatus())){
                 count++;
-            }else if(StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus())){
+            }else if((StringUtils.equals("3",info.getStatus()) || StringUtils.equals("2",info.getStatus()) && wrksl==0)){
                 count++;
             }else if(StringUtils.equals("0",info.getStatus())){
                 break;
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
index 0372219..3590b04 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/controller/BlWarehouseMaterialInfoController.java
@@ -284,7 +284,7 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
 
     @ApiOperation(value = "库房物料配置信息-物料是否占用", notes = "库房物料配置信息-物料是否占用")
     @GetMapping(value = "/queryWlsfzy")
-    public Result<Map<String,Object>> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = true) String nuId) {
+    public Result<Map<String,Object>> queryWlsfzy(@RequestParam(name = "wlId", required = true) String wlId,@RequestParam(name = "nuId", required = false) String nuId) {
         Map<String,Object> map = blWarehouseMaterialInfoService.queryWlsfzy(wlId, nuId);
         return Result.OK(map);
     }
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
index bdb920d..0f40588 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/impl/BlWarehouseMaterialInfoServiceImpl.java
@@ -77,6 +77,19 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
     @Override
     public Map<String,Object> queryWlsfzy(String wlId, String nuId) {
         Map<String,Object> map = new HashMap<>();
+
+        List<BlWarehouseMaterialInfo> kcslList =baseMapper.selectList(new QueryWrapper<BlWarehouseMaterialInfo>().eq("wl_id", wlId));
+        String sfxkcsl = "0";
+        for(BlWarehouseMaterialInfo blWarehouseMaterialInfo:kcslList){
+            if(Integer.parseInt(blWarehouseMaterialInfo.getKcsl())>0){
+                sfxkcsl = "1";
+                break;
+            }
+        }
+        if ("1".equals(sfxkcsl)){
+            map.put("message","库存数量不为0，请先清空库存数量后再停用");
+        }
+
         //查询采购单数据是否有占用的
         List<NuInvoicingCgdMain> cgdMainList = nuInvoicingCgdMainMapper.selecCgdWlsfzytList(wlId);
         if(cgdMainList.size()>0){