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 3590b049..c397285c 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
@@ -235,7 +235,10 @@ public class BlWarehouseMaterialInfoController extends JeecgController<BlWarehou
     @RequiresPermissions("warehouseMaterialInfo:bl_warehouse_material_info:add")
     @PostMapping(value = "/addAllWuliao")
     public Result<String> addAllWuliao(@RequestBody BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
-        blWarehouseMaterialInfoService.addAllWuliao(blWarehouseMaterialInfo);
+        String result = blWarehouseMaterialInfoService.addAllWuliao(blWarehouseMaterialInfo);
+        if(StringUtils.equals("2",result)){
+            return Result.error("当前无物料可进行操作");
+        }
         return Result.OK("添加成功！");
     }
 
diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java
index fc690a0a..81aa47ed 100644
--- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java
+++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/warehouseMaterialInfo/service/IBlWarehouseMaterialInfoService.java
@@ -13,7 +13,7 @@ import java.util.Map;
  */
 public interface IBlWarehouseMaterialInfoService extends IService<BlWarehouseMaterialInfo> {
 
-    void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo);
+    String addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo);
 
     void deleteBatch(String ids);
 
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 37cc9c45..5ca8209c 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
@@ -49,12 +49,15 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
 
 
     @Override
-    public void addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
+    public String addAllWuliao(BlWarehouseMaterialInfo blWarehouseMaterialInfo) {
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         //获取仓库nuid
         String nuId = blWarehouseMaterialInfo.getNuId();
         //获取所有剩余的物料信息，并且去掉库存上限或者下限为空的数据
         List<BlWarehouseMaterialInfo> list =baseMapper.getRemainingList(blWarehouseMaterialInfo);
+        if(list.size()==0){
+            return "2";
+        }
         //将所有查询到的物料进行批量新增
         for(BlWarehouseMaterialInfo blWarehouseMaterialInfo1:list){
             blWarehouseMaterialInfo1.setNuId(nuId);
@@ -62,6 +65,7 @@ public class BlWarehouseMaterialInfoServiceImpl extends ServiceImpl<BlWarehouseM
             blWarehouseMaterialInfo1.setCreateTime(new Date());
         }
         baseMapper.batchInsert(list);
+        return "1";
     }
 
     @Override