优化完成物品采购

java110

2020-07-15 38d7bffeb4d445f7719b0dc76bb17f3c8a99560d

优化完成物品采购

 java110-bean/src/main/java/com/java110/dto/purchaseApply/PurchaseApplyDetailDto.java

@@ -13,6 +13,7 @@
    private String resCode;
    private String price;
    private String stock;
    private String id;

    public String getApplyOrderId() {
        return applyOrderId;
@@ -86,6 +87,13 @@
        this.stock = stock;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }
}



 java110-bean/src/main/java/com/java110/dto/workflow/WorkflowStepStaffDto.java

@@ -1,6 +1,7 @@
package com.java110.dto.workflow;

import com.java110.dto.PageDto;

import java.io.Serializable;
import java.util.Date;

@@ -15,10 +16,11 @@
public class WorkflowStepStaffDto extends PageDto implements Serializable {

    private String wssId;
private String stepId;
private String staffName;
private String communityId;
private String staffId;
    private String stepId;
    private String staffName;
    private String communityId;
    private String staffId;
    private String staffRole;


    private Date createTime;
@@ -29,31 +31,40 @@
    public String getWssId() {
        return wssId;
    }
public void setWssId(String wssId) {

    public void setWssId(String wssId) {
        this.wssId = wssId;
    }
public String getStepId() {

    public String getStepId() {
        return stepId;
    }
public void setStepId(String stepId) {

    public void setStepId(String stepId) {
        this.stepId = stepId;
    }
public String getStaffName() {

    public String getStaffName() {
        return staffName;
    }
public void setStaffName(String staffName) {

    public void setStaffName(String staffName) {
        this.staffName = staffName;
    }
public String getCommunityId() {

    public String getCommunityId() {
        return communityId;
    }
public void setCommunityId(String communityId) {

    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
public String getStaffId() {

    public String getStaffId() {
        return staffId;
    }
public void setStaffId(String staffId) {

    public void setStaffId(String staffId) {
        this.staffId = staffId;
    }

@@ -73,4 +84,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String getStaffRole() {
        return staffRole;
    }

    public void setStaffRole(String staffRole) {
        this.staffRole = staffRole;
    }
}

 java110-bean/src/main/java/com/java110/po/purchase/PurchaseApplyDetailPo.java

@@ -16,6 +16,12 @@
    private String resId;
    private String quantity;
    private String remark;
    private String price;
    private String id;

    private String purchaseQuantity;

    private String purchaseRemark;

    public String getApplyOrderId() {
        return applyOrderId;
@@ -48,4 +54,36 @@
    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getPrice() {
        return price;
    }

    public void setPrice(String price) {
        this.price = price;
    }

    public String getPurchaseQuantity() {
        return purchaseQuantity;
    }

    public void setPurchaseQuantity(String purchaseQuantity) {
        this.purchaseQuantity = purchaseQuantity;
    }

    public String getPurchaseRemark() {
        return purchaseRemark;
    }

    public void setPurchaseRemark(String purchaseRemark) {
        this.purchaseRemark = purchaseRemark;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }
}

 java110-bean/src/main/java/com/java110/po/purchase/ResourceStorePo.java

@@ -19,6 +19,7 @@
    private String description;
    private String price;
    private String stock;
    private String statusCd;

    public String getResId() {
        return resId;
@@ -75,4 +76,12 @@
    public void setStock(String stock) {
        this.stock = stock;
    }

    public String getStatusCd() {
        return statusCd;
    }

    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }
}

 java110-bean/src/main/java/com/java110/po/workflow/WorkflowStepStaffPo.java

@@ -1,46 +1,61 @@
package com.java110.po.workflow;

import java.io.Serializable;
import java.util.Date;

public class WorkflowStepStaffPo implements Serializable {

    private String wssId;
private String stepId;
private String staffName;
private String communityId;
private String staffId;
public String getWssId() {
    private String stepId;
    private String staffName;
    private String communityId;
    private String staffId;
    private String staffRole;

    public String getWssId() {
        return wssId;
    }
public void setWssId(String wssId) {

    public void setWssId(String wssId) {
        this.wssId = wssId;
    }
public String getStepId() {

    public String getStepId() {
        return stepId;
    }
public void setStepId(String stepId) {

    public void setStepId(String stepId) {
        this.stepId = stepId;
    }
public String getStaffName() {

    public String getStaffName() {
        return staffName;
    }
public void setStaffName(String staffName) {

    public void setStaffName(String staffName) {
        this.staffName = staffName;
    }
public String getCommunityId() {

    public String getCommunityId() {
        return communityId;
    }
public void setCommunityId(String communityId) {

    public void setCommunityId(String communityId) {
        this.communityId = communityId;
    }
public String getStaffId() {

    public String getStaffId() {
        return staffId;
    }
public void setStaffId(String staffId) {

    public void setStaffId(String staffId) {
        this.staffId = staffId;
    }

    public String getStaffRole() {
        return staffRole;
    }


    public void setStaffRole(String staffRole) {
        this.staffRole = staffRole;
    }
}

 java110-bean/src/main/java/com/java110/vo/api/purchaseApply/PurchaseApplyDetailVo.java

@@ -4,6 +4,7 @@

//采购明细表
public class PurchaseApplyDetailVo {
    private String id;
    private String applyOrderId;
    private String resId;
    private String quantity;
@@ -122,6 +123,14 @@
    public void setDescription(String description) {
        this.description = description;
    }

    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }
}



 java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java

@@ -216,6 +216,14 @@
                Date date = new Date(((Timestamp) value).getTime());
                String tmpValue = DateUtil.getFormatTimeString(date, DateUtil.DATE_FORMATE_STRING_A);
                map.put(key, "'" + tmpValue + "'");
            } else if(value instanceof Double){
                map.put(key, "'" + map.get(key) + "'");
            }else {
                if (value != null) {
                    map.put(key, "'" + value.toString() + "'");
                } else {
                    map.put(key, "''");
                }
            }
        }
    }

 java110-db/src/main/resources/mapper/common/WorkflowStepStaffServiceDaoImplMapper.xml

@@ -7,9 +7,9 @@
    <!-- 保存工作流节点信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessWorkflowStepStaffInfo" parameterType="Map">
        insert into business_workflow_step_staff(
        wss_id,operate,step_id,staff_name,b_id,community_id,staff_id
        wss_id,operate,step_id,staff_name,b_id,community_id,staff_id,staff_role
        ) values (
        #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId}
        #{wssId},#{operate},#{stepId},#{staffName},#{bId},#{communityId},#{staffId},#{staffRole}
        )
    </insert>

@@ -17,7 +17,8 @@
    <!-- 查询工作流节点信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessWorkflowStepStaffInfo" parameterType="Map" resultType="Map">
        select t.wss_id,t.wss_id wssId,t.operate,t.step_id,t.step_id stepId,t.staff_name,t.staff_name
        staffName,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId
        staffName,t.b_id,t.b_id bId,t.community_id,t.community_id communityId,t.staff_id,t.staff_id staffId,t.staff_role,
        t.staff_role staffRole
        from business_workflow_step_staff t
        where 1 =1
        <if test="wssId !=null and wssId != ''">
@@ -48,8 +49,9 @@
    <!-- 保存工作流节点信息至 instance表中 add by wuxw 2018-07-03 -->
    <insert id="saveWorkflowStepStaffInfoInstance" parameterType="Map">
        insert into workflow_step_staff(
        wss_id,step_id,staff_name,status_cd,b_id,community_id,staff_id
        ) select t.wss_id,t.step_id,t.staff_name,'0',t.b_id,t.community_id,t.staff_id from business_workflow_step_staff
        wss_id,step_id,staff_name,status_cd,b_id,community_id,staff_id,staff_role
        ) select t.wss_id,t.step_id,t.staff_name,'0',t.b_id,t.community_id,t.staff_id,t.staff_role
        from business_workflow_step_staff
        t where 1=1
        <if test="wssId !=null and wssId != ''">
            and t.wss_id= #{wssId}
@@ -78,7 +80,7 @@
    <select id="getWorkflowStepStaffInfo" parameterType="Map" resultType="Map">
        select t.wss_id,t.wss_id wssId,t.step_id,t.step_id stepId,t.staff_name,t.staff_name
        staffName,t.status_cd,t.status_cd statusCd,t.b_id,t.b_id bId,t.community_id,t.community_id
        communityId,t.staff_id,t.staff_id staffId
        communityId,t.staff_id,t.staff_id staffId,t.staff_role,t.staff_role staffRole
        from workflow_step_staff t
        where 1 =1
        <if test="wssId !=null and wssId != ''">
@@ -101,6 +103,9 @@
        </if>
        <if test="staffId !=null and staffId != ''">
            and t.staff_id= #{staffId}
        </if>
        <if test="staffRole !=null and staffRole != ''">
            and t.staff_role= #{staffRole}
        </if>
        order by t.create_time desc
        <if test="page != -1 and page != null ">
@@ -128,6 +133,9 @@
        <if test="staffId !=null and staffId != ''">
            , t.staff_id= #{staffId}
        </if>
        <if test="staffRole !=null and staffRole != ''">
            , t.staff_role= #{staffRole}
        </if>
        where 1=1
        <if test="wssId !=null and wssId != ''">
            and t.wss_id= #{wssId}

 java110-db/src/main/resources/mapper/store/PurchaseApplyDetailServiceDaoImplMapper.xml

@@ -6,17 +6,17 @@

    <!-- 保存订单明细信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessPurchaseApplyDetailInfo" parameterType="Map">
           insert into business_purchase_apply_detail
                (operate,apply_order_id,b_id,res_id,quantity,remark,status_cd) values
           (#{operate},#{applyOrderId},#{bId},#{resId},#{quantity},#{remark},#{statusCd})
       </insert>
        insert into business_purchase_apply_detail
        (operate,apply_order_id,b_id,res_id,quantity,remark,status_cd) values
        (#{operate},#{applyOrderId},#{bId},#{resId},#{quantity},#{remark},#{statusCd})
    </insert>


    <!-- 查询订单明细信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
        select
            t.operate,t.apply_order_id,t.apply_order_id applyOrderId,
            t.b_id,t.b_id bId,t.res_id,t.res_id resId
        t.operate,t.apply_order_id,t.apply_order_id applyOrderId,
        t.b_id,t.b_id bId,t.res_id,t.res_id resId
        from business_purchase_apply_detail t
        where 1 =1
        <if test="operate !=null and operate != ''">
@@ -92,16 +92,27 @@

    <!-- 修改订单明细信息 add by wuxw 2018-07-03 -->
    <update id="updatePurchaseApplyDetailInfoInstance" parameterType="Map">
        update purchase_apply_detail t set t.status_cd = #{statusCd}
        <if test="newBId != null and newBId != ''">
            ,t.b_id = #{newBId}
        </if>
        <if test="applyOrderId !=null and applyOrderId != ''">
            , t.apply_order_id= #{applyOrderId}
        </if>
        <if test="resId !=null and resId != ''">
            , t.res_id= #{resId}
        </if>
        update purchase_apply_detail t
        <set>
            <if test="statusCd != null and statusCd != ''">
                t.status_cd = #{statusCd},
            </if>
            <if test="newBId != null and newBId != ''">
                t.b_id = #{newBId},
            </if>
            <if test="resId !=null and resId != ''">
                t.res_id= #{resId},
            </if>
            <if test="price !=null and price != ''">
                t.price= #{price},
            </if>
            <if test="purchaseQuantity !=null and purchaseQuantity != ''">
                t.purchase_quantity= #{purchaseQuantity},
            </if>
            <if test="purchaseRemark !=null and purchaseRemark != ''">
                t.purchase_remark= #{purchaseRemark},
            </if>
        </set>
        where 1=1
        <if test="id !=null and id != ''">
            and t.id= #{id}

 java110-db/src/main/resources/mapper/store/PurchaseApplyServiceDaoImplMapper.xml

@@ -6,21 +6,22 @@


    <resultMap type="com.java110.dto.purchaseApply.PurchaseApplyDto" id="applyMap">
        <id column="applyOrderId"  property="applyOrderId"/>
        <result column="description"  property="description"/>
        <result column="resOrderType"  property="resOrderType"/>
        <result column="statusCd"  property="statusCd"/>
        <result column="state"  property="state"/>
        <result column="storeId"  property="storeId"/>
        <result column="userName"  property="userName"/>
        <result column="bId"  property="bId"/>
        <id column="applyOrderId" property="applyOrderId"/>
        <result column="description" property="description"/>
        <result column="resOrderType" property="resOrderType"/>
        <result column="statusCd" property="statusCd"/>
        <result column="state" property="state"/>
        <result column="storeId" property="storeId"/>
        <result column="userName" property="userName"/>
        <result column="bId" property="bId"/>
        <result column="userId" property="userId"/>
        <result column="createTime" property="createTime"/>
        <result column="stateName" property="stateName"/>
        <result column="endUserName" property="endUserName"/>
        <result column="endUserTel" property="endUserTel"/>
        <!-- 一对多关系 -->
        <collection property="purchaseApplyDetailVo" ofType="com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo"  javaType="java.util.ArrayList">
        <collection property="purchaseApplyDetailVo" ofType="com.java110.vo.api.purchaseApply.PurchaseApplyDetailVo"
                    javaType="java.util.ArrayList">
            <id property="id" column="id"/>
            <result property="applyOrderId" column="applyOrderId"/>
            <result property="resId" column="resId"/>
@@ -36,10 +37,10 @@

    <!-- 保存采购申请信息 add by wuxw 2018-07-03 -->
    <insert id="saveBusinessPurchaseApplyInfo" parameterType="Map">
           insert into business_purchase_apply
                (operate,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel)
           values
                (#{operate},#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},#{bId},#{endUserName},#{endUserTel})
        insert into business_purchase_apply
        (operate,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel)
        values
        (#{operate},#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},#{bId},#{endUserName},#{endUserTel})
    </insert>

    <!-- 保存采购明细表备份表 -->
@@ -47,7 +48,7 @@
        insert into business_purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
        values
        <foreach collection="list" item="item" index="index" separator=",">
        (
            (
            #{item.applyOrderId},
            #{item.resId},
            #{item.quantity},
@@ -55,17 +56,18 @@
            #{item.bId},
            #{item.operate},
            #{item.statusCd}
        )
            )
        </foreach>
    </insert>


    <!-- 保存采购明细表-->
    <insert id="savePurchaseApplyDetailInfo" parameterType="List">
        insert into purchase_apply_detail (apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
        insert into purchase_apply_detail (id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
        values
        <foreach collection="list" item="item" index="index" separator=",">
            (
            #{item.id},
            #{item.applyOrderId},
            #{item.resId},
            #{item.quantity},
@@ -78,15 +80,23 @@
    </insert>



    <!-- 查询采购申请信息（Business） add by wuxw 2018-07-03 -->
    <select id="getBusinessPurchaseApplyInfo" parameterType="Map" resultType="Map">
        select
            t.operate,t.res_order_type resOrderType,
            t.operate,
            t.res_order_type,
            t.res_order_type resOrderType,
            t.description,
            t.apply_order_id applyOrderId,t.state,
            t.apply_order_id,
            t.apply_order_id applyOrderId,
            t.state,
            t.store_id,
            t.store_id storeId,
            t.user_name userName,t.b_id bId,t.user_id userId,
            t.user_name userName,
            t.b_id bId,
            t.b_id,
            t.user_id,
            t.user_id userId,
            t.status_cd statusCd,
            t.end_user_name,
            t.end_user_tel,
@@ -184,15 +194,15 @@
    <!-- 查询采购申请信息 add by wuxw 2018-07-03 -->
    <select id="getPurchaseApplyInfo" parameterType="Map" resultType="Map">
        select
            t.res_order_type resOrderType,t.description,
            t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
            t.store_id storeId,t.user_name userName,
            t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
            t.end_user_name,
            t.end_user_tel,
            t.end_user_name endUserName,
            t.end_user_tel endUserTel,
            t.description
        t.res_order_type resOrderType,t.description,
        t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
        t.store_id storeId,t.user_name userName,
        t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
        t.end_user_name,
        t.end_user_tel,
        t.end_user_name endUserName,
        t.end_user_tel endUserTel,
        t.description
        from purchase_apply t
        inner join t_dict d on t.state = d.status_cd and d.table_name = 'purchase_apply' and d.table_columns = 'state'
        where 1 =1
@@ -243,14 +253,14 @@
    </select>



    <select id="getPurchaseApplyInfo2" parameterType="Map" resultMap="applyMap">
        select
        t.res_order_type resOrderType,t.description,
        t.apply_order_id applyOrderId,t.status_cd statusCd,t.state,
        t.store_id storeId,t.user_name userName,
        t.b_id bId,t.user_id userId,t.create_time createTime,d.name stateName,
        de.apply_order_id applyOrderId,de.res_id resId,de.quantity,de.remark,rs.res_name resName,rs.price,rs.stock,rs.res_code resCode,rs.description,
        de.apply_order_id applyOrderId,de.res_id resId,de.quantity,de.remark,rs.res_name
        resName,rs.price,rs.stock,rs.res_code resCode,rs.description,
        t.end_user_name,
        t.end_user_tel,
        t.end_user_name endUserName,
@@ -296,12 +306,13 @@
    <!-- 查询采购明细 -->
    <select id="getPurchaseApplyDetailInfo" parameterType="Map" resultType="Map">
        select
            p.apply_order_id applyOrderId,
            p.res_id resId,p.quantity,p.remark,
            r.res_name resName,r.res_code resCode,
            r.price,r.stock
        p.id,
        p.apply_order_id applyOrderId,
        p.res_id resId,p.quantity,p.remark,
        r.res_name resName,r.res_code resCode,
        r.price,r.stock
        from
            purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
        purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
        where 1=1
        and p.status_cd = '0'
        <if test="applyOrderIds !=null">

 java110-interface/src/main/java/com/java110/intf/store/IPurchaseApplyDetailInnerServiceSMO.java

@@ -2,6 +2,7 @@

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.purchaseApplyDetail.PurchaseApplyDetailDto;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,4 +41,13 @@
     */
    @RequestMapping(value = "/queryPurchaseApplyDetailsCount", method = RequestMethod.POST)
    int queryPurchaseApplyDetailsCount(@RequestBody PurchaseApplyDetailDto purchaseApplyDetailDto);

    /**
     * 修改采购申请明细
     *
     * @param purchaseApplyDetailPo 数据对象分享
     * @return 小区下的小区楼记录数
     */
    @RequestMapping(value = "/updatePurchaseApplyDetail", method = RequestMethod.POST)
    int updatePurchaseApplyDetail(@RequestBody PurchaseApplyDetailPo purchaseApplyDetailPo);
}

 java110-interface/src/main/java/com/java110/intf/store/IResourceStoreInnerServiceSMO.java

@@ -2,6 +2,7 @@

import com.java110.config.feign.FeignConfiguration;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.po.purchase.ResourceStorePo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,4 +39,7 @@
     */
    @RequestMapping(value = "/queryResourceStoresCount", method = RequestMethod.POST)
    int queryResourceStoresCount(@RequestBody ResourceStoreDto resourceResourceStoreDto);

    @RequestMapping(value = "/updateResourceStore", method = RequestMethod.POST)
    int updateResourceStore(@RequestBody ResourceStorePo resourceStorePo);
}

 java110-utils/src/test/java/com/java110/utils/AppTest.java

@@ -33,6 +33,9 @@
     */
    public void testApp()
    {
        assertTrue( true );

        String a = "1";
        System.out.printf("a=" + Integer.parseInt(a));

    }
}

 service-api/src/main/java/com/java110/api/listener/purchaseApply/AuditApplyOrderListener.java

@@ -106,7 +106,7 @@

        JSONObject businessComplaint = new JSONObject();
        businessComplaint.putAll(BeanConvertUtil.beanCovertMap(purchaseApplyDtos.get(0)));
        businessComplaint.put("state", "10002");
        businessComplaint.put("state", "1002");
        PurchaseApplyPo purchaseApplyPo = BeanConvertUtil.covertBean(businessComplaint, PurchaseApplyPo.class);

        super.update(dataFlowContext, purchaseApplyPo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_PURCHASE_APPLY);

 service-api/src/main/java/com/java110/api/listener/workflow/UpdateWorkflowListener.java

@@ -10,12 +10,12 @@
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.common.IWorkflowStepInnerServiceSMO;
import com.java110.intf.common.IWorkflowStepStaffInnerServiceSMO;
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowStepDto;
import com.java110.dto.workflow.WorkflowStepStaffDto;
import com.java110.intf.common.IWorkflowInnerServiceSMO;
import com.java110.intf.common.IWorkflowStepInnerServiceSMO;
import com.java110.intf.common.IWorkflowStepStaffInnerServiceSMO;
import com.java110.po.workflow.WorkflowPo;
import com.java110.po.workflow.WorkflowStepPo;
import com.java110.po.workflow.WorkflowStepStaffPo;
@@ -23,6 +23,7 @@
import com.java110.utils.constant.ServiceCodeWorkflowConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;

@@ -157,6 +158,7 @@
            workflowStepStaffPo.setStaffId(step.getString("staffId"));
            workflowStepStaffPo.setStaffName(step.getString("staffName"));
            workflowStepStaffPo.setStepId(workflowStepPo.getStepId());
            workflowStepStaffPo.setStaffRole(StringUtil.isEmpty(step.getString("staffRole")) ? "1001" : step.getString("staffRole"));
            super.insert(context, workflowStepStaffPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW_STEP_STAFF);
            workflowStepStaffDtos.add(BeanConvertUtil.covertBean(workflowStepStaffPo, WorkflowStepStaffDto.class));
            //会签流程
@@ -170,6 +172,8 @@
                    workflowStepStaffPo.setStaffId(subStaff.getString("staffId"));
                    workflowStepStaffPo.setStaffName(subStaff.getString("staffName"));
                    workflowStepStaffPo.setStepId(workflowStepPo.getStepId());
                    workflowStepStaffPo.setStaffRole(StringUtil.isEmpty(subStaff.getString("staffRole")) ? "1001" : subStaff.getString("staffRole"));

                    super.insert(context, workflowStepStaffPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_WORKFLOW_STEP_STAFF);
                    workflowStepStaffDtos.add(BeanConvertUtil.covertBean(workflowStepStaffPo, WorkflowStepStaffDto.class));
                }

 service-common/src/main/java/com/java110/common/listener/workflow/AbstractWorkflowStepStaffBusinessServiceDataFlowListener.java

@@ -43,6 +43,7 @@
        businessWorkflowStepStaffInfo.put("staffName", businessWorkflowStepStaffInfo.get("staff_name"));
        businessWorkflowStepStaffInfo.put("communityId", businessWorkflowStepStaffInfo.get("community_id"));
        businessWorkflowStepStaffInfo.put("staffId", businessWorkflowStepStaffInfo.get("staff_id"));
        businessWorkflowStepStaffInfo.put("staffRole", businessWorkflowStepStaffInfo.get("staff_role"));
        businessWorkflowStepStaffInfo.remove("bId");
        businessWorkflowStepStaffInfo.put("statusCd", statusCd);
    }
@@ -73,6 +74,7 @@
        currentWorkflowStepStaffInfo.put("staffName", currentWorkflowStepStaffInfo.get("staff_name"));
        currentWorkflowStepStaffInfo.put("communityId", currentWorkflowStepStaffInfo.get("community_id"));
        currentWorkflowStepStaffInfo.put("staffId", currentWorkflowStepStaffInfo.get("staff_id"));
        currentWorkflowStepStaffInfo.put("staffRole", currentWorkflowStepStaffInfo.get("staff_role"));


        currentWorkflowStepStaffInfo.put("operate", StatusConstant.OPERATE_DEL);

 service-store/src/main/java/com/java110/store/api/PurchaseApi.java

@@ -7,8 +7,8 @@
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.bmo.purchase.IPurchaseApplyBMO;
import com.java110.store.bmo.purchase.IResourceEnterBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +24,9 @@

    @Autowired
    private IPurchaseApplyBMO purchaseApplyBMOImpl;

    @Autowired
    private IResourceEnterBMO resourceEnterBMOImpl;

    /**
     * 采购申请
@@ -63,10 +66,34 @@
        for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
            JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
            PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
            purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
            purchaseApplyDetailPos.add(purchaseApplyDetailPo);
        }
        purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);

        return purchaseApplyBMOImpl.apply(purchaseApplyPo);
    }

    @RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
    public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "applyOrderId", "订单ID为空");

        JSONArray purchaseApplyDetails = reqJson.getJSONArray("purchaseApplyDetailVo");

        List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
        for (int detailIndex = 0; detailIndex < purchaseApplyDetails.size(); detailIndex++) {
            JSONObject purchaseApplyDetail = purchaseApplyDetails.getJSONObject(detailIndex);
            Assert.hasKeyAndValue(purchaseApplyDetail, "purchaseQuantity", "采购数量未填写");
            Assert.hasKeyAndValue(purchaseApplyDetail, "price", "采购单价未填写");
            Assert.hasKeyAndValue(purchaseApplyDetail, "id", "明细ID为空");
            PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(purchaseApplyDetail, PurchaseApplyDetailPo.class);
            purchaseApplyDetailPos.add(purchaseApplyDetailPo);

        }

        PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
        purchaseApplyPo.setApplyOrderId(reqJson.getString("applyOrderId"));
        purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
        return resourceEnterBMOImpl.enter(purchaseApplyPo);
    }
}

 service-store/src/main/java/com/java110/store/bmo/purchase/IResourceEnterBMO.java

New file
@@ -0,0 +1,14 @@
package com.java110.store.bmo.purchase;

import com.java110.po.purchase.PurchaseApplyPo;
import org.springframework.http.ResponseEntity;

public interface IResourceEnterBMO {

    /**
     * 采购入库
     * @param purchaseApplyPo
     * @return
     */
    ResponseEntity<String> enter(PurchaseApplyPo purchaseApplyPo);
}

 service-store/src/main/java/com/java110/store/bmo/purchase/impl/ResourceEnterBMOImpl.java

New file
@@ -0,0 +1,51 @@
package com.java110.store.bmo.purchase.impl;

import com.java110.core.annotation.Java110Transactional;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyDetailInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.bmo.purchase.IResourceEnterBMO;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;

import java.util.List;


@Service("resourceEnterBMOImpl")
public class ResourceEnterBMOImpl implements IResourceEnterBMO {

    @Autowired
    private IPurchaseApplyDetailInnerServiceSMO purchaseApplyDetailInnerServiceSMOImpl;


    @Autowired
    private IPurchaseApplyUserInnerServiceSMO purchaseApplyUserInnerServiceSMOImpl;

    @Autowired
    private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;


    @Override
    @Java110Transactional
    public ResponseEntity<String> enter(PurchaseApplyPo purchaseApplyPo) {


        List<PurchaseApplyDetailPo> purchaseApplyDetailPos = purchaseApplyPo.getPurchaseApplyDetailPos();
        for (PurchaseApplyDetailPo purchaseApplyDetailPo : purchaseApplyDetailPos) {
            purchaseApplyDetailInnerServiceSMOImpl.updatePurchaseApplyDetail(purchaseApplyDetailPo);
            ResourceStorePo resourceStorePo = new ResourceStorePo();
            resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
            resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
            resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
        }

        return ResultVo.createResponseEntity(ResultVo.CODE_OK, "采购申请成功");
    }
}

 service-store/src/main/java/com/java110/store/dao/IPurchaseApplyDetailServiceDao.java

@@ -62,7 +62,7 @@
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updatePurchaseApplyDetailInfoInstance(Map info) throws DAOException;
    int updatePurchaseApplyDetailInfoInstance(Map info) throws DAOException;


    /**

 service-store/src/main/java/com/java110/store/dao/IResourceStoreServiceDao.java

@@ -67,7 +67,7 @@
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    void updateResourceStoreInfoInstance(Map info) throws DAOException;
    int updateResourceStoreInfoInstance(Map info) throws DAOException;


    /**

 service-store/src/main/java/com/java110/store/dao/impl/PurchaseApplyDetailServiceDaoImpl.java

@@ -1,11 +1,11 @@
package com.java110.store.dao.impl;

import com.alibaba.fastjson.JSONObject;
import com.java110.core.base.dao.BaseServiceDao;
import com.java110.store.dao.IPurchaseApplyDetailServiceDao;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.exception.DAOException;
import com.java110.utils.util.DateUtil;
import com.java110.core.base.dao.BaseServiceDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -25,6 +25,7 @@

    /**
     * 订单明细信息封装
     *
     * @param businessPurchaseApplyDetailInfo 订单明细信息 封装
     * @throws DAOException DAO异常
     */
@@ -32,17 +33,18 @@
    public void saveBusinessPurchaseApplyDetailInfo(Map businessPurchaseApplyDetailInfo) throws DAOException {
        businessPurchaseApplyDetailInfo.put("month", DateUtil.getCurrentMonth());
        // 查询business_user 数据是否已经存在
        logger.debug("保存订单明细信息 入参 businessPurchaseApplyDetailInfo : {}",businessPurchaseApplyDetailInfo);
        int saveFlag = sqlSessionTemplate.insert("purchaseApplyDetailServiceDaoImpl.saveBusinessPurchaseApplyDetailInfo",businessPurchaseApplyDetailInfo);
        logger.debug("保存订单明细信息 入参 businessPurchaseApplyDetailInfo : {}", businessPurchaseApplyDetailInfo);
        int saveFlag = sqlSessionTemplate.insert("purchaseApplyDetailServiceDaoImpl.saveBusinessPurchaseApplyDetailInfo", businessPurchaseApplyDetailInfo);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存订单明细数据失败："+ JSONObject.toJSONString(businessPurchaseApplyDetailInfo));
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存订单明细数据失败：" + JSONObject.toJSONString(businessPurchaseApplyDetailInfo));
        }
    }


    /**
     * 查询订单明细信息
     *
     * @param info bId 信息
     * @return 订单明细信息
     * @throws DAOException DAO异常
@@ -50,43 +52,44 @@
    @Override
    public List<Map> getBusinessPurchaseApplyDetailInfo(Map info) throws DAOException {

        logger.debug("查询订单明细信息 入参 info : {}",info);
        logger.debug("查询订单明细信息 入参 info : {}", info);

        List<Map> businessPurchaseApplyDetailInfos = sqlSessionTemplate.selectList("purchaseApplyDetailServiceDaoImpl.getBusinessPurchaseApplyDetailInfo",info);
        List<Map> businessPurchaseApplyDetailInfos = sqlSessionTemplate.selectList("purchaseApplyDetailServiceDaoImpl.getBusinessPurchaseApplyDetailInfo", info);

        return businessPurchaseApplyDetailInfos;
    }



    /**
     * 保存订单明细信息 到 instance
     * @param info   bId 信息
     *
     * @param info bId 信息
     * @throws DAOException DAO异常
     */
    @Override
    public void savePurchaseApplyDetailInfoInstance(Map info) throws DAOException {
        logger.debug("保存订单明细信息Instance 入参 info : {}",info);
        logger.debug("保存订单明细信息Instance 入参 info : {}", info);

        int saveFlag = sqlSessionTemplate.insert("purchaseApplyDetailServiceDaoImpl.savePurchaseApplyDetailInfoInstance",info);
        int saveFlag = sqlSessionTemplate.insert("purchaseApplyDetailServiceDaoImpl.savePurchaseApplyDetailInfoInstance", info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"保存订单明细信息Instance数据失败："+ JSONObject.toJSONString(info));
        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "保存订单明细信息Instance数据失败：" + JSONObject.toJSONString(info));
        }
    }


    /**
     * 查询订单明细信息（instance）
     *
     * @param info bId 信息
     * @return List<Map>
     * @throws DAOException DAO异常
     */
    @Override
    public List<Map> getPurchaseApplyDetailInfo(Map info) throws DAOException {
        logger.debug("查询订单明细信息 入参 info : {}",info);
        logger.debug("查询订单明细信息 入参 info : {}", info);

        List<Map> businessPurchaseApplyDetailInfos = sqlSessionTemplate.selectList("purchaseApplyDetailServiceDaoImpl.getPurchaseApplyDetailInfo",info);
        List<Map> businessPurchaseApplyDetailInfos = sqlSessionTemplate.selectList("purchaseApplyDetailServiceDaoImpl.getPurchaseApplyDetailInfo", info);

        return businessPurchaseApplyDetailInfos;
    }
@@ -94,28 +97,28 @@

    /**
     * 修改订单明细信息
     *
     * @param info 修改信息
     * @throws DAOException DAO异常
     */
    @Override
    public void updatePurchaseApplyDetailInfoInstance(Map info) throws DAOException {
        logger.debug("修改订单明细信息Instance 入参 info : {}",info);
    public int updatePurchaseApplyDetailInfoInstance(Map info) throws DAOException {
        logger.debug("修改订单明细信息Instance 入参 info : {}", info);

        int saveFlag = sqlSessionTemplate.update("purchaseApplyDetailServiceDaoImpl.updatePurchaseApplyDetailInfoInstance",info);
        int saveFlag = sqlSessionTemplate.update("purchaseApplyDetailServiceDaoImpl.updatePurchaseApplyDetailInfoInstance", info);

        if(saveFlag < 1){
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR,"修改订单明细信息Instance数据失败："+ JSONObject.toJSONString(info));
        }
        return saveFlag;
    }

     /**
    /**
     * 查询订单明细数量
     *
     * @param info 订单明细信息
     * @return 订单明细数量
     */
    @Override
    public int queryPurchaseApplyDetailsCount(Map info) {
        logger.debug("查询订单明细数据 入参 info : {}",info);
        logger.debug("查询订单明细数据 入参 info : {}", info);

        List<Map> businessPurchaseApplyDetailInfos = sqlSessionTemplate.selectList("purchaseApplyDetailServiceDaoImpl.queryPurchaseApplyDetailsCount", info);
        if (businessPurchaseApplyDetailInfos.size() < 1) {

 service-store/src/main/java/com/java110/store/dao/impl/ResourceStoreServiceDaoImpl.java

@@ -102,14 +102,12 @@
     * @throws DAOException DAO异常
     */
    @Override
    public void updateResourceStoreInfoInstance(Map info) throws DAOException {
    public int updateResourceStoreInfoInstance(Map info) throws DAOException {
        logger.debug("修改资源信息Instance 入参 info : {}", info);

        int saveFlag = sqlSessionTemplate.update("resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance", info);

        if (saveFlag < 1) {
            throw new DAOException(ResponseConstant.RESULT_PARAM_ERROR, "修改资源信息Instance数据失败：" + JSONObject.toJSONString(info));
        }
        return saveFlag;
    }

    /**

 service-store/src/main/java/com/java110/store/smo/impl/PurchaseApplyDetailInnerServiceSMOImpl.java

@@ -2,6 +2,7 @@


import com.java110.dto.purchaseApplyDetail.PurchaseApplyDetailDto;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.store.dao.IPurchaseApplyDetailServiceDao;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
@@ -91,6 +92,11 @@
    public int queryPurchaseApplyDetailsCount(@RequestBody PurchaseApplyDetailDto purchaseApplyDetailDto) {
        return purchaseApplyDetailServiceDaoImpl.queryPurchaseApplyDetailsCount(BeanConvertUtil.beanCovertMap(purchaseApplyDetailDto));    }

    @Override
    public int updatePurchaseApplyDetail(@RequestBody PurchaseApplyDetailPo purchaseApplyDetailPo) {
        return purchaseApplyDetailServiceDaoImpl.updatePurchaseApplyDetailInfoInstance(BeanConvertUtil.beanCovertMap(purchaseApplyDetailPo));
    }

    public IPurchaseApplyDetailServiceDao getPurchaseApplyDetailServiceDaoImpl() {
        return purchaseApplyDetailServiceDaoImpl;
    }

 service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java

@@ -2,17 +2,22 @@


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.dao.IResourceStoreServiceDao;
import com.java110.utils.lock.DistributedLock;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @ClassName FloorInnerServiceSMOImpl
@@ -53,6 +58,31 @@
        return resourceResourceStoreServiceDaoImpl.queryResourceStoresCount(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto));
    }

    @Override
    public int updateResourceStore(@RequestBody ResourceStorePo resourceStorePo) {
        //查询
        //开始锁代码
        String requestId = DistributedLock.getLockUUID();
        String key = this.getClass().getSimpleName() + resourceStorePo.getResId();
        try {
            DistributedLock.waitGetDistributedLock(key, requestId);
            Map info = new HashMap<>();
            info.put("resId", resourceStorePo.getResId());
            info.put("storeId", resourceStorePo.getStoreId());
            List<Map> stores = resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(info);

            Assert.listOnlyOne(stores, "不存在该物品");
            int stock = Integer.parseInt(stores.get(0).get("stock").toString());
            int newStock = Integer.parseInt(resourceStorePo.getStock());
            resourceStorePo.setStock((stock + newStock) + "");
            resourceStorePo.setStatusCd("0");
            return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
        } finally {
            DistributedLock.releaseDistributedLock(requestId, key);
        }
    }


    public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
        return resourceResourceStoreServiceDaoImpl;
    }