Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

8 天以前 aece48b253b2e0b814bbdf5ee3d474e8cf697122

 north-glass-erp/src/main/resources/mapper/mm/FinishedOperateLog.xml

@@ -23,6 +23,7 @@
        <result column="process_id" property="processId"/>
        <result column="money" property="money"/>
        <result column="area" property="area"/>
        <result column="square_millimeter" property="squareMillimeter"/>

        <result column="width" property="orderDetail.width"/>
        <result column="height" property="orderDetail.height"/>
@@ -80,7 +81,7 @@
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -148,17 +149,20 @@
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        group by fol.order_id,fol.operation_number,fol.remarks
        order by fol.operate_time desc
        limit #{offset},#{pageSize};
    </select>

    <select id="getSelectStorageRecordLogPageTotal">
        select CEILING(count(fol.id)/#{pageSize}) as 'pageTotal',
        count(fol.id) as 'total'
        select
        CEILING(count(zu.id)/#{pageSize}) as 'pageTotal',
        count(zu.id) as 'total' from (
        select fol.id
        from (select *
        from mm.finished_operate_log aa where aa.operate_type = #{type}  and aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number
        left join mm.finished_goods_inventory fgi on fgi.order_id = fol.order_id and fol.operation_number = fgi.order_number and fgi.box_no=fol.remarks
        left join sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -226,7 +230,9 @@
                and o.project regexp #{finishedOperateLog.order.project}
            </if>
        </where>
        group by fol.order_id,fol.operation_number,fol.remarks
        order by fol.`status` desc
        ) as zu
    </select>

    <update id="updateToExamine">
@@ -504,13 +510,22 @@
        o.customer_name,
        o.project,
        od.price,
        o.order_type
        o.order_type,
        p.thickness * fol.area as square_millimeter
        from (select *
        from mm.finished_operate_log aa where  aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join sd.`order` o on o.order_id=fol.order_id
        left join sd.product p on p.id=od.product_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
            <if test="dateType=='date'">
                date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
            </if>
            <if test="dateType=='datetime'">
                fol.operate_time>=#{startDate} and fol.operate_time &lt;= #{endDate}
            </if>
            and fol.operate_type=#{type}

            <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                and fol.operate_type regexp #{finishedOperateLog.operateType}
            </if>
@@ -589,8 +604,17 @@
        from mm.finished_operate_log aa where  aa.status!='已作废') fol
        left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
        left join sd.`order` o on o.order_id=fol.order_id
        left join sd.product p on p.id=od.product_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate} and fol.operate_type=#{type}
            <if test="dateType=='date'">
                date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
            </if>
            <if test="dateType=='datetime'">
                fol.operate_time>=#{startDate} and fol.operate_time &lt;= #{endDate}
            </if>
            and fol.operate_type=#{type}


            <if test="finishedOperateLog.operateType != null and finishedOperateLog.operateType != ''">
                and fol.operate_type regexp #{finishedOperateLog.operateType}
            </if>
@@ -801,12 +825,58 @@
               o.customer_name,
               o.project,
               od.price,
               o.order_type
               o.order_type,
               p.thickness * fol.area as square_millimeter
        from (select *
              from mm.finished_operate_log aa where  aa.status!='已作废') fol
                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
                 left join sd.`order` o on o.order_id=fol.order_id
        where  date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]} and fol.operate_type=#{type}
                 left join sd.product p on p.id=od.product_id
        where
                date(fol.operate_time)>=#{dates[0]} and date(fol.operate_time) &lt;= #{dates[1]}

          and fol.operate_type=#{type}

    </select>

    <select id="exportFinishedOperateLogReportByDatetime">
        select fol.id,
               fol.operation_order_number,
               fol.order_id,
               fol.operate_type,
               fol.process_id,
               fol.operation_number,
               fol.quantity,
               fol.operator,
               od.product_id,
               od.product_name,
               od.width,
               od.height,
               fol.stater_operation_order_number,
               fol.end_operation_order_number,
               fol.operate_time,
               fol.`status`,
               fol.is_state,
               fol.reviewed,
               fol.reviewed_time,
               fol.type,
               fol.remarks,
               fol.area,
               fol.money,
               o.customer_name,
               o.project,
               od.price,
               o.order_type,
               p.thickness * fol.area as square_millimeter
        from (select *
              from mm.finished_operate_log aa where  aa.status!='已作废') fol
                 left join sd.order_detail od on fol.order_id = od.order_id and fol.operation_number = od.order_number
                 left join sd.`order` o on o.order_id=fol.order_id
                 left join sd.product p on p.id=od.product_id
        where
            fol.operate_time>=#{dates[0]} and fol.operate_time &lt;= #{dates[1]}

          and fol.operate_type=#{type}

    </select>

@@ -822,17 +892,18 @@
                                            status,
                                            area,
                                            compute_area,
                                            remarks
                                            remarks,
                                            money
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
                   #{oddNumber} ,#{orderDetail.orderId},#{processId},#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},"",#{orderDetail.grossAmount}
               )
    </insert>

    <delete id="updateOrderFinishedOperateLog"  >
    <update id="updateOrderFinishedOperateLog"  >
        update  mm.finished_operate_log set status="已作废" where order_id=#{orderDetail.orderId} and operation_number=#{orderDetail.orderNumber} and operate_type="入库";
    </delete>
    </update>

    <select id="getSelectStorageRecordPint" resultMap="selectFinishedGoodsInventory">
        select fol.id,
@@ -1097,4 +1168,6 @@
    </select>




</mapper>