java110
2023-08-24 c86174225a4b0a68d32111bf18ac401ff95d90ea
仓库加入流程字段
27个文件已修改
582 ■■■■■ 已修改文件
java110-bean/src/main/java/com/java110/dto/store/StorehouseDto.java 72 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/po/store/StorehousePo.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/store/StorehouseServiceDaoImplMapper.xml 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-db/src/main/resources/mapper/store/StorehouseV1ServiceDaoImplMapper.xml 198 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListStorehousesCmd.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/dao/IStorehouseServiceDao.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/dao/impl/StorehouseServiceDaoImpl.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/IStoreServiceSMO.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ContractAttrInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ContractInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeSpecInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeTemplateInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyDetailInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/SmallWeChatInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/SmallWechatAttrInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/StoreAttrInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/StoreInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/StoreServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/WechatMenuInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/WechatSmsTemplateInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/businesstype/CbusinesstypeInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
service-store/src/main/java/com/java110/store/smo/impl/demo/DemoInnerServiceSMOImpl.java 补丁 | 查看 | 原始文档 | blame | 历史
java110-bean/src/main/java/com/java110/dto/store/StorehouseDto.java
@@ -20,8 +20,6 @@
    private String shDesc;
    private String shType;
    private String shObjId;
    private String[] shObjIds;
    private String shId;
    private String shName;
    private String storeId;
@@ -30,6 +28,13 @@
    private Date createTime;
    private String statusCd = "0";
    private String purchaseSwitch;
    private String purchaseRafId;
    private String useSwitch;
    private String useRafId;
    private String allocationSwitch;
    private String allocationRafId;
    public String getShDesc() {
        return shDesc;
@@ -47,13 +52,6 @@
        this.shType = shType;
    }
    public String getShObjId() {
        return shObjId;
    }
    public void setShObjId(String shObjId) {
        this.shObjId = shObjId;
    }
    public String getShId() {
        return shId;
@@ -95,13 +93,6 @@
        this.statusCd = statusCd;
    }
    public String[] getShObjIds() {
        return shObjIds;
    }
    public void setShObjIds(String[] shObjIds) {
        this.shObjIds = shObjIds;
    }
    public String getIsShow() {
        return isShow;
@@ -110,4 +101,53 @@
    public void setIsShow(String isShow) {
        this.isShow = isShow;
    }
    public String getPurchaseSwitch() {
        return purchaseSwitch;
    }
    public void setPurchaseSwitch(String purchaseSwitch) {
        this.purchaseSwitch = purchaseSwitch;
    }
    public String getPurchaseRafId() {
        return purchaseRafId;
    }
    public void setPurchaseRafId(String purchaseRafId) {
        this.purchaseRafId = purchaseRafId;
    }
    public String getUseSwitch() {
        return useSwitch;
    }
    public void setUseSwitch(String useSwitch) {
        this.useSwitch = useSwitch;
    }
    public String getUseRafId() {
        return useRafId;
    }
    public void setUseRafId(String useRafId) {
        this.useRafId = useRafId;
    }
    public String getAllocationSwitch() {
        return allocationSwitch;
    }
    public void setAllocationSwitch(String allocationSwitch) {
        this.allocationSwitch = allocationSwitch;
    }
    public String getAllocationRafId() {
        return allocationRafId;
    }
    public void setAllocationRafId(String allocationRafId) {
        this.allocationRafId = allocationRafId;
    }
}
java110-bean/src/main/java/com/java110/po/store/StorehousePo.java
@@ -15,6 +15,13 @@
    private String statusCd = "0";
    private String purchaseSwitch;
    private String purchaseRafId;
    private String useSwitch;
    private String useRafId;
    private String allocationSwitch;
    private String allocationRafId;
    public String getShDesc() {
        return shDesc;
    }
@@ -78,4 +85,52 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
    public String getPurchaseSwitch() {
        return purchaseSwitch;
    }
    public void setPurchaseSwitch(String purchaseSwitch) {
        this.purchaseSwitch = purchaseSwitch;
    }
    public String getPurchaseRafId() {
        return purchaseRafId;
    }
    public void setPurchaseRafId(String purchaseRafId) {
        this.purchaseRafId = purchaseRafId;
    }
    public String getUseSwitch() {
        return useSwitch;
    }
    public void setUseSwitch(String useSwitch) {
        this.useSwitch = useSwitch;
    }
    public String getUseRafId() {
        return useRafId;
    }
    public void setUseRafId(String useRafId) {
        this.useRafId = useRafId;
    }
    public String getAllocationSwitch() {
        return allocationSwitch;
    }
    public void setAllocationSwitch(String allocationSwitch) {
        this.allocationSwitch = allocationSwitch;
    }
    public String getAllocationRafId() {
        return allocationRafId;
    }
    public void setAllocationRafId(String allocationRafId) {
        this.allocationRafId = allocationRafId;
    }
}
java110-db/src/main/resources/mapper/store/StorehouseServiceDaoImplMapper.xml
@@ -3,91 +3,13 @@
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="storehouseServiceDaoImpl">
    <!-- 保存仓库信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessStorehouseInfo" parameterType="Map">
        insert into business_storehouse(
        sh_desc,sh_type,sh_obj_id,operate,sh_id,sh_name,b_id,store_id,is_show
        ) values (
        #{shDesc},#{shType},#{shObjId},#{operate},#{shId},#{shName},#{bId},#{storeId},#{isShow}
        )
    </insert>
    <!-- 查询仓库信息(Business) add by wuxw 2018-07-03 -->
    <select id="getBusinessStorehouseInfo" parameterType="Map" resultType="Map">
        select t.sh_desc,t.sh_desc shDesc,t.sh_type,t.sh_type shType,t.sh_obj_id,t.sh_obj_id
        shObjId,t.operate,t.sh_id,t.sh_id shId,t.sh_name,t.sh_name shName,t.b_id,t.b_id bId,t.store_id,t.store_id
        storeId,t.is_show,t.is_show isShow
        from business_storehouse t
        where 1 =1
        <if test="shDesc !=null and shDesc != ''">
            and t.sh_desc= #{shDesc}
        </if>
        <if test="shType !=null and shType != ''">
            and t.sh_type= #{shType}
        </if>
        <if test="shObjId !=null and shObjId != ''">
            and t.sh_obj_id= #{shObjId}
        </if>
        <if test="operate !=null and operate != ''">
            and t.operate= #{operate}
        </if>
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
        <if test="shName !=null and shName != ''">
            and t.sh_name= #{shName}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            and t.is_show= #{isShow}
        </if>
    </select>
    <!-- 保存仓库信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveStorehouseInfoInstance" parameterType="Map">
        insert into storehouse(
        sh_desc,sh_type,sh_obj_id,sh_id,status_cd,sh_name,b_id,store_id,is_show
        ) select t.sh_desc,t.sh_type,t.sh_obj_id,t.sh_id,'0',t.sh_name,t.b_id,t.store_id,t.is_show
        from business_storehouse t
        where 1=1
        <if test="shDesc !=null and shDesc != ''">
            and t.sh_desc= #{shDesc}
        </if>
        <if test="shType !=null and shType != ''">
            and t.sh_type= #{shType}
        </if>
        <if test="shObjId !=null and shObjId != ''">
            and t.sh_obj_id= #{shObjId}
        </if>
        and t.operate= 'ADD'
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
        <if test="shName !=null and shName != ''">
            and t.sh_name= #{shName}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            and t.is_show= #{isShow}
        </if>
    </insert>
    <!-- 查询仓库信息 add by wuxw 2018-07-03 -->
    <select id="getStorehouseInfo" parameterType="Map" resultType="Map">
        select t.sh_desc,t.sh_desc shDesc,t.sh_type,t.sh_type shType,t.sh_obj_id,t.sh_obj_id shObjId,t.sh_id,t.sh_id
        shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.b_id,t.b_id bId,t.store_id,t.store_id
        storeId,t.is_show,t.is_show isShow,t.create_time createTime
        select t.sh_desc,t.sh_desc shDesc,t.sh_type,t.sh_id,t.sh_id
        shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.store_id,t.store_id
        storeId,t.is_show,t.is_show isShow,t.create_time createTime,t.purchase_switch purchaseSwitch,
        t.purchase_raf_id purchaseRafId,t.use_switch useSwitch,t.use_raf_id useRafId,
        t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId
        from storehouse t
        where 1 =1
        <if test="shDesc !=null and shDesc != ''">
@@ -128,39 +50,6 @@
            limit #{page}, #{row}
        </if>
    </select>
    <!-- 修改仓库信息 add by wuxw 2018-07-03 -->
    <update id="updateStorehouseInfoInstance" parameterType="Map">
        update storehouse t set t.status_cd = #{statusCd}
        <if test="newBId != null and newBId != ''">
            ,t.b_id = #{newBId}
        </if>
        <if test="shDesc !=null and shDesc != ''">
            , t.sh_desc= #{shDesc}
        </if>
        <if test="shType !=null and shType != ''">
            , t.sh_type= #{shType}
        </if>
        <if test="shObjId !=null and shObjId != ''">
            , t.sh_obj_id= #{shObjId}
        </if>
        <if test="shName !=null and shName != ''">
            , t.sh_name= #{shName}
        </if>
        <if test="storeId !=null and storeId != ''">
            , t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            , t.is_show= #{isShow}
        </if>
        where 1=1
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
        <if test="bId !=null and bId != ''">
            and t.b_id= #{bId}
        </if>
    </update>
    <!-- 查询仓库数量 add by wuxw 2018-07-03 -->
    <select id="queryStorehousesCount" parameterType="Map" resultType="Map">
java110-db/src/main/resources/mapper/store/StorehouseV1ServiceDaoImplMapper.xml
@@ -5,120 +5,128 @@
<mapper namespace="storehouseV1ServiceDaoImpl">
    <!-- 保存使用记录信息 add by wuxw 2018-07-03 -->
    <insert id="saveStorehouseInfo" parameterType="Map">
        insert into storehouse(
sh_desc,sh_type,sh_obj_id,sh_id,sh_name,store_id,is_show
) values (
#{shDesc},#{shType},#{shObjId},#{shId},#{shName},#{storeId},#{isShow}
)
        sh_desc,sh_id,sh_name,store_id,is_show,purchase_switch,purchase_raf_id,
        use_switch,use_raf_id,allocation_switch,allocation_raf_id
        ) values (
        #{shDesc},#{shType},#{shObjId},#{shId},#{shName},#{storeId},#{isShow}
        ,#{purchaseSwitch},#{purchaseRafId},#{useSwitch},#{useRafId},#{allocationSwitch},#{allocationRafId}
        )
    </insert>
    <!-- 查询使用记录信息 add by wuxw 2018-07-03 -->
    <select id="getStorehouseInfo" parameterType="Map" resultType="Map">
        select  t.sh_desc,t.sh_desc shDesc,t.sh_type,t.sh_type shType,t.sh_obj_id,t.sh_obj_id shObjId,t.sh_id,t.sh_id shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.store_id,t.store_id storeId,t.is_show,t.is_show isShow
from storehouse t
where 1 =1
<if test="shDesc !=null and shDesc != ''">
   and t.sh_desc= #{shDesc}
</if>
<if test="shType !=null and shType != ''">
   and t.sh_type= #{shType}
</if>
<if test="shObjId !=null and shObjId != ''">
   and t.sh_obj_id= #{shObjId}
</if>
<if test="shId !=null and shId != ''">
   and t.sh_id= #{shId}
</if>
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if>
<if test="shName !=null and shName != ''">
   and t.sh_name= #{shName}
</if>
<if test="storeId !=null and storeId != ''">
   and t.store_id= #{storeId}
</if>
<if test="isShow !=null and isShow != ''">
   and t.is_show= #{isShow}
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
   limit #{page}, #{row}
</if>
        select t.sh_desc,t.sh_desc shDesc,t.sh_id,t.sh_id
        shId,t.status_cd,t.status_cd statusCd,t.sh_name,t.sh_name shName,t.store_id,t.store_id
        storeId,t.is_show,t.is_show isShow,t.create_time createTime,t.purchase_switch purchaseSwitch,
        t.purchase_raf_id purchaseRafId,t.use_switch useSwitch,t.use_raf_id useRafId,
        t.allocation_switch allocationSwitch,t.allocation_raf_id allocationRafId
        from storehouse t
        where 1 =1
        <if test="shDesc !=null and shDesc != ''">
            and t.sh_desc= #{shDesc}
        </if>
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="shName !=null and shName != ''">
            and t.sh_name= #{shName}
        </if>
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            and t.is_show= #{isShow}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
            limit #{page}, #{row}
        </if>
    </select>
    <!-- 修改使用记录信息 add by wuxw 2018-07-03 -->
    <update id="updateStorehouseInfo" parameterType="Map">
        update  storehouse t set t.status_cd = #{statusCd}
<if test="newBId != null and newBId != ''">
,t.b_id = #{newBId}
</if>
<if test="shDesc !=null and shDesc != ''">
, t.sh_desc= #{shDesc}
</if>
<if test="shType !=null and shType != ''">
, t.sh_type= #{shType}
</if>
<if test="shObjId !=null and shObjId != ''">
, t.sh_obj_id= #{shObjId}
</if>
<if test="shName !=null and shName != ''">
, t.sh_name= #{shName}
</if>
<if test="storeId !=null and storeId != ''">
, t.store_id= #{storeId}
</if>
<if test="isShow !=null and isShow != ''">
, t.is_show= #{isShow}
</if>
 where 1=1 <if test="shId !=null and shId != ''">
and t.sh_id= #{shId}
</if>
        update storehouse t set t.status_cd = #{statusCd}
        <if test="newBId != null and newBId != ''">
            ,t.b_id = #{newBId}
        </if>
        <if test="shDesc !=null and shDesc != ''">
            , t.sh_desc= #{shDesc}
        </if>
        <if test="purchaseSwitch !=null and purchaseSwitch != ''">
            , t.purchase_switch= #{purchaseSwitch}
        </if>
        <if test="purchaseRafId !=null and purchaseRafId != ''">
            , t.purchase_raf_id= #{purchaseRafId}
        </if>
        <if test="useSwitch !=null and useSwitch != ''">
            , t.use_switch= #{useSwitch}
        </if>
        <if test="useRafId !=null and useRafId != ''">
            , t.use_raf_id= #{useRafId}
        </if>
        <if test="allocationSwitch !=null and allocationSwitch != ''">
            , t.allocation_switch= #{allocationSwitch}
        </if>
        <if test="allocationRafId !=null and allocationRafId != ''">
            , t.allocation_raf_id= #{allocationRafId}
        </if>
        <if test="shName !=null and shName != ''">
            , t.sh_name= #{shName}
        </if>
        <if test="storeId !=null and storeId != ''">
            , t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            , t.is_show= #{isShow}
        </if>
        where 1=1
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
    </update>
    <!-- 查询使用记录数量 add by wuxw 2018-07-03 -->
     <select id="queryStorehousesCount" parameterType="Map" resultType="Map">
        select  count(1) count
from storehouse t
where 1 =1
<if test="shDesc !=null and shDesc != ''">
   and t.sh_desc= #{shDesc}
</if>
<if test="shType !=null and shType != ''">
   and t.sh_type= #{shType}
</if>
<if test="shObjId !=null and shObjId != ''">
   and t.sh_obj_id= #{shObjId}
</if>
<if test="shId !=null and shId != ''">
   and t.sh_id= #{shId}
</if>
<if test="statusCd !=null and statusCd != ''">
   and t.status_cd= #{statusCd}
</if>
<if test="shName !=null and shName != ''">
   and t.sh_name= #{shName}
</if>
<if test="storeId !=null and storeId != ''">
   and t.store_id= #{storeId}
</if>
<if test="isShow !=null and isShow != ''">
   and t.is_show= #{isShow}
</if>
    <select id="queryStorehousesCount" parameterType="Map" resultType="Map">
        select count(1) count
        from storehouse t
        where 1 =1
        <if test="shDesc !=null and shDesc != ''">
            and t.sh_desc= #{shDesc}
        </if>
        <if test="shType !=null and shType != ''">
            and t.sh_type= #{shType}
        </if>
        <if test="shObjId !=null and shObjId != ''">
            and t.sh_obj_id= #{shObjId}
        </if>
        <if test="shId !=null and shId != ''">
            and t.sh_id= #{shId}
        </if>
        <if test="statusCd !=null and statusCd != ''">
            and t.status_cd= #{statusCd}
        </if>
        <if test="shName !=null and shName != ''">
            and t.sh_name= #{shName}
        </if>
        <if test="storeId !=null and storeId != ''">
            and t.store_id= #{storeId}
        </if>
        <if test="isShow !=null and isShow != ''">
            and t.is_show= #{isShow}
        </if>
     </select>
    </select>
</mapper>
service-common/src/main/java/com/java110/common/smo/impl/AllocationStorehouseUserInnerServiceSMOImpl.java
@@ -89,11 +89,6 @@
        if (storehouseDtoList != null && storehouseDtoList.size() > 0) {
            storehouseDto1 = storehouseDtoList.get(0);
        }
        if (SH_TYPE_GROUP.equals(storehouseDto1.getShType())) {//集团仓库
            communityId = "9999";
        } else {//小区仓库
            communityId = storehouseDto1.getShObjId();
        }
        //开启流程
        ProcessInstance processInstance = runtimeService.startProcessInstanceByKey(getWorkflowDto(allocationStorehouseApplyDto.getStoreId(), communityId), allocationStorehouseApplyDto.getApplyId(), variables);
        //将得到的实例流程id值赋给之前设置的变量
service-store/src/main/java/com/java110/store/cmd/resourceStore/ListStorehousesCmd.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
@@ -37,33 +38,9 @@
    @Override
    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
        String storeId = CmdContextUtils.getStoreId(context);
        StorehouseDto storehouseDto = BeanConvertUtil.covertBean(reqJson, StorehouseDto.class);
        //是否具有查看集团仓库权限
        String userId = reqJson.getString("userId");
        BasePrivilegeDto basePrivilegeDto = new BasePrivilegeDto();
        basePrivilegeDto.setResource("/viewGroupWarehouse");
        basePrivilegeDto.setUserId(userId);
        List<Map> privileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto);
        if (privileges.size() == 0) {
            storehouseDto.setShObjIds(new String[]{reqJson.getString("communityId")});
        } else {
            if (reqJson.containsKey("operationType") && reqJson.getString("operationType").equals("1000")) {
                storehouseDto.setShType("");
            }
            storehouseDto.setShObjIds(new String[]{reqJson.getString("communityId"), reqJson.getString("storeId")});
        }
        BasePrivilegeDto basePrivilegeDto1 = new BasePrivilegeDto();
        basePrivilegeDto1.setResource("/viewHiddenWarehouse");
        basePrivilegeDto1.setUserId(userId);
        List<Map> viewHiddenWarehousePrivileges = menuInnerServiceSMOImpl.checkUserHasResource(basePrivilegeDto1);
        if (viewHiddenWarehousePrivileges.size() == 0) {
            storehouseDto.setIsShow("true");
        }
        if (reqJson.containsKey("flag") && reqJson.getString("flag").equals("0")) {//调拨申请查看所有仓库
            storehouseDto.setShObjIds(null);
        }
        storehouseDto.setStoreId(storeId);
        int count = storehouseInnerServiceSMOImpl.queryStorehousesCount(storehouseDto);
        List<StorehouseDto> storehouseDtos = null;
service-store/src/main/java/com/java110/store/dao/IStorehouseServiceDao.java
@@ -16,35 +16,6 @@
 */
public interface IStorehouseServiceDao {
    /**
     * 保存 仓库信息
     * @param businessStorehouseInfo 仓库信息 封装
     * @throws DAOException 操作数据库异常
     */
    void saveBusinessStorehouseInfo(Map businessStorehouseInfo) throws DAOException;
    /**
     * 查询仓库信息(business过程)
     * 根据bId 查询仓库信息
     * @param info bId 信息
     * @return 仓库信息
     * @throws DAOException DAO异常
     */
    List<Map> getBusinessStorehouseInfo(Map info) throws DAOException;
    /**
     * 保存 仓库信息 Business数据到 Instance中
     * @param info
     * @throws DAOException DAO异常
     */
    void saveStorehouseInfoInstance(Map info) throws DAOException;
    /**
@@ -57,13 +28,6 @@
    List<Map> getStorehouseInfo(Map info) throws DAOException;
    /**
     * 修改仓库信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updateStorehouseInfoInstance(Map info) throws DAOException;
    /**
service-store/src/main/java/com/java110/store/dao/impl/StorehouseServiceDaoImpl.java
@@ -24,57 +24,6 @@
    private static Logger logger = LoggerFactory.getLogger(StorehouseServiceDaoImpl.class);
    /**
     * 仓库信息封装
     * @param businessStorehouseInfo 仓库信息 封装
     * @throws DAOException DAO异常
     */
    @Override
    public void saveBusinessStorehouseInfo(Map businessStorehouseInfo) throws DAOException {
        businessStorehouseInfo.put("month", DateUtil.getCurrentMonth());
        // 查询business_user 数据是否已经存在
        logger.debug("保存仓库信息 入参 businessStorehouseInfo : {}",businessStorehouseInfo);
        int saveFlag = sqlSessionTemplate.insert("storehouseServiceDaoImpl.saveBusinessStorehouseInfo",businessStorehouseInfo);
        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存仓库数据失败:"+ JSONObject.toJSONString(businessStorehouseInfo));
        }
    }
    /**
     * 查询仓库信息
     * @param info bId 信息
     * @return 仓库信息
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getBusinessStorehouseInfo(Map info) throws DAOException {
        logger.debug("查询仓库信息 入参 info : {}",info);
        List<Map> businessStorehouseInfos = sqlSessionTemplate.selectList("storehouseServiceDaoImpl.getBusinessStorehouseInfo",info);
        return businessStorehouseInfos;
    }
    /**
     * 保存仓库信息 到 instance
     * @param info   bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void saveStorehouseInfoInstance(Map info) throws DAOException {
        logger.debug("保存仓库信息Instance 入参 info : {}",info);
        int saveFlag = sqlSessionTemplate.insert("storehouseServiceDaoImpl.saveStorehouseInfoInstance",info);
        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存仓库信息Instance数据失败:"+ JSONObject.toJSONString(info));
        }
    }
    /**
@@ -93,21 +42,6 @@
    }
    /**
     * 修改仓库信息
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updateStorehouseInfoInstance(Map info) throws DAOException {
        logger.debug("修改仓库信息Instance 入参 info : {}",info);
        int saveFlag = sqlSessionTemplate.update("storehouseServiceDaoImpl.updateStorehouseInfoInstance",info);
        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改仓库信息Instance数据失败:"+ JSONObject.toJSONString(info));
        }
    }
     /**
     * 查询仓库数量
service-store/src/main/java/com/java110/store/smo/IStoreServiceSMO.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ComplaintInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ContractAttrInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ContractInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeSpecInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ContractTypeTemplateInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyDetailInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/SmallWeChatInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/SmallWechatAttrInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/StoreAttrInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/StoreInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/StoreServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/WechatMenuInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/WechatSmsTemplateInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/businesstype/CbusinesstypeInnerServiceSMOImpl.java
old mode 100755 new mode 100644
service-store/src/main/java/com/java110/store/smo/impl/demo/DemoInnerServiceSMOImpl.java
old mode 100755 new mode 100644