货位总数接口增加查询条件启用/弃用

src/main/java/com/chinaitop/depot/basic/controller/BasicWarehouseController.java

@@ -351,12 +351,13 @@ public class BasicWarehouseController {
 	@RequestMapping(value="/getCountWhs", method=RequestMethod.GET)
 	@ApiOperation(value="查询货位数", notes = "查询货位数")
 	@ApiImplicitParams({
-		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query")
+		@ApiImplicitParam(name = "orgId", value = "单位ID", paramType = "query"),
+		@ApiImplicitParam(name = "delFlag", value = "启用状态(1:启用,0:弃用)", paramType = "query")
 	})
-	public Integer getCountWhs(Integer orgId) {
+	public Integer getCountWhs(Integer orgId, Integer delFlag) {
 		Integer hws = 0;
 		try {
-			hws = basicWarehouseService.getCountWhs(orgId);
+			hws = basicWarehouseService.getCountWhs(orgId, delFlag);
 		} catch (Exception e) {
 			hws = 0;
 			e.printStackTrace();

src/main/java/com/chinaitop/depot/basic/service/BasicWarehouseService.java

@@ -60,9 +60,10 @@ public interface BasicWarehouseService {
 	 * 查询当前单位下货位总数
 	 * 
 	 * @param orgId 单位ID
+	 * @param delFlag 启用状态(1:启用,0:弃用)
 	 * @return
 	 * @throws Exception
 	 */
-	Integer getCountWhs(Integer orgId) throws Exception;
+	Integer getCountWhs(Integer orgId, Integer delFlag) throws Exception;
 
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -94,13 +94,16 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 	}
 
 	@Override
-	public Integer getCountWhs(Integer orgId) throws Exception {
+	public Integer getCountWhs(Integer orgId, Integer delFlag) throws Exception {
 		BasicWarehouseExample example = new BasicWarehouseExample();
 		BasicWarehouseExample.Criteria criteria = example.createCriteria();
 		criteria.andLibraryTypeEqualTo("0");//查询本库的，不查第三方库的
 		if (null != orgId) {
 			criteria.andOrgIdEqualTo(orgId);
 		}
+		if (null != delFlag) {
+			criteria.andDelFlagEqualTo(delFlag);
+		}
 		Integer hws = mapper.countByExample(example);
 		return hws;
 	}