.

src/main/java/com/chinaitop/depot/basic/mapper/BasicStorehouseMapper.java

@@ -42,11 +42,17 @@ public interface BasicStorehouseMapper {
     Map<String, Object> getAgentDepotId(Map<String, Object> map);
 
     /**
-     * 更新单位表仓房数和油罐数
+     * 更新单位表仓房数、油罐数、有效仓容、有效罐容
      * 
      * @param map
      */
     void editOrgCfAndHwNum(Map<String, Object> map);
 
+    /**
+     * 查询当前仓房和油罐的有效容量之和
+     * 
+     * @param orgId 单位ID
+     * @return
+     */
     Map<String, Object> queryCrAndgw(Integer orgId);
 }

src/main/java/com/chinaitop/depot/basic/mapper/BasicStorehouseMapper.xml

@@ -1223,7 +1223,7 @@
     </if>
     order by house.storehouse_id asc
   </select>
-  <!-- 更新单位表的仓房数和货位数 -->
+  <!-- 更新单位表仓房数、油罐数、有效仓容、有效罐容 -->
   <update id="editOrgCfAndHwNum" parameterType="java.util.Map" >
   	UPDATE org_info SET org_id=${orgId}
   	<if test="cf_count != null">
@@ -1243,8 +1243,8 @@
   <!-- 查询当前仓房和油罐的有效容量之和 -->
   <select id="queryCrAndgw" parameterType="java.lang.Integer" resultType="java.util.Map">
   	SELECT 
-	IFNULL((SELECT SUM(a.actual_capacity) FROM basic_storehouse a WHERE a.org_id=#{orgId,jdbcType=INTEGER}),0) as cr_count,
-	IFNULL((SELECT SUM(a.tank_capacity) FROM basic_tank a WHERE a.org_id=#{orgId,jdbcType=INTEGER}),0) as gr_count
+	IFNULL((SELECT SUM(a.actual_capacity) FROM basic_storehouse a WHERE a.del_flag=1 and a.org_id=#{orgId,jdbcType=INTEGER}),0) as cr_count,
+	IFNULL((SELECT SUM(a.tank_capacity) FROM basic_tank a WHERE a.del_flag=1 and a.org_id=#{orgId,jdbcType=INTEGER}),0) as gr_count
 	FROM DUAL
   </select>
 </mapper>

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

@@ -569,7 +569,7 @@ public class BasicStorehouseServiceImpl implements BasicStorehouseService {
 		//更新货位数据
 		warehouseService.saveOrUpdate(basicStorehouse, warehouseJson);
 
-		//更新单位表中仓房数和货位数
+		//更新单位表仓房数、油罐数、有效仓容、有效罐容
 		editOrgChNum(orgId);
 
 		modelMap.put("status", "success");