多次领用，非空判断

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceInputController.java

@@ -84,7 +84,9 @@ public class StorageDeviceInputController {
         	 }
         	 if(storageDeviceinput.getPosition()!=null){
     			 BasicEquipmentEquipmentPool equipmentEquipmentPool=poolServivce.findByIdObj(Integer.parseInt(storageDeviceinput.getPosition()));
-    			 storageDeviceinput.setPositionName(equipmentEquipmentPool.getPutPosition());
+    			 if(equipmentEquipmentPool!=null){
+    				 storageDeviceinput.setPositionName(equipmentEquipmentPool.getPutPosition());
+    			 }
 
         	 }
 		}

src/main/java/com/chinaitop/depot/device/mapper/StorageDeviceinputMapper.xml

@@ -583,7 +583,7 @@
 
    <select id="getModelGetList" parameterType="java.util.Map" resultMap="BaseResultMap">
 
-   select <include refid="Base_Column_List" /> from storage_deviceinput sd where `status`=0 and device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
+   select <include refid="Base_Column_List" /> from storage_deviceinput sd where device_name In (select enumId from basic_enum where  enumName=#{deviceName}) and 
 
    storage_rack IN (select id  from basic_equipment_equipment_pool bee where shelf_id=#{storageRack}) ;