修复扣款

java110

2021-06-16 bd59c19c6fccfc8d0bf3804c0d0c712454bd7d42

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

old mode 100644
new mode 100755
@@ -23,6 +23,7 @@
            <id property="id" column="id"/>
            <result property="applyOrderId" column="applyOrderId"/>
            <result property="resId" column="resId"/>
            <result column="rsId" property="rsId"/>
            <result property="quantity" column="quantity"/>
            <result property="resName" column="resName"/>
            <result property="remark" column="remark"/>
@@ -60,18 +61,23 @@

    <!-- 保存采购明细表-->
    <insert id="savePurchaseApplyDetailInfo" parameterType="List">
        insert into purchase_apply_detail (id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd)
        insert into purchase_apply_detail (id,rs_id,apply_order_id,res_id,quantity,remark,b_id,operate,status_cd,price,purchase_quantity,purchase_remark,original_stock)
        values
        <foreach collection="list" item="item" index="index" separator=",">
            (
            #{item.id},
            #{item.rsId},
            #{item.applyOrderId},
            #{item.resId},
            #{item.quantity},
            #{item.remark},
            '-1',
            'ADD',
            '0'
            '0',
            #{item.price},
            #{item.purchaseQuantity},
            #{item.purchaseRemark},
            #{item.originalStock}
            )
        </foreach>
    </insert>
@@ -194,7 +200,10 @@
        t.end_user_tel,
        t.end_user_name endUserName,
        t.end_user_tel endUserTel,
        t.description
        t.description,
        t.create_user_id createUserId,
        t.create_user_name createUserName,
        t.warehousing_way warehousingWay
        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
@@ -297,11 +306,14 @@
        select
        p.id,
        p.apply_order_id applyOrderId,
        p.res_id resId,p.quantity,p.remark,
        p.res_id resId,p.quantity,p.remark,p.purchase_quantity purchaseQuantity,p.purchase_remark purchaseRemark,p.price purchasePrice,p.original_stock originalStock,
        r.res_name resName,r.res_code resCode,
        r.price,r.stock
        r.price,r.price standardPrice,r.stock,rst.name rstName,rss.spec_name specName,rs.supplier_name supplierName
        from
        purchase_apply_detail p inner join resource_store r on p.res_id = r.res_id and r.status_cd = '0'
        LEFT JOIN resource_supplier rs on p.rs_id=rs.rs_id
        LEFT JOIN resource_store_type rst  on r.rst_id=rst.rst_id
        LEFT JOIN resource_store_specification rss   on r.rss_id=rss.rss_id
        where 1=1
        and p.status_cd = '0'
        <if test="applyOrderIds !=null">
@@ -400,8 +412,8 @@
    <!-- 保存采购申请信息 add by wuxw 2018-07-03 -->
    <insert id="savePurchaseApply" parameterType="Map">
        insert into purchase_apply
        (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time)
        (status_cd,res_order_type,description,apply_order_id,state,store_id,user_id,user_name,b_id,end_user_name,end_user_tel,create_time,create_user_id,create_user_name,warehousing_way)
        values
        ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime})
        ('0',#{resOrderType},#{description},#{applyOrderId},#{state},#{storeId},#{userId},#{userName},'-1',#{endUserName},#{endUserTel},#{createTime},#{createUserId},#{createUserName},#{warehousingWay})
    </insert>
</mapper>