Merge remote-tracking branch 'origin/master'

于杰

2025-11-04 7cf8f8fc1abca63423c1fb4618363f8a9d283f9d

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

@@ -36,6 +36,7 @@
        <result column="project" property="order.project"/>
        <result column="customer_name" property="order.customerName"/>
        <result column="customer_Id" property="order.customerId"/>
        <result column="order_type" property="order.orderType"/>

    </resultMap>

@@ -63,10 +64,23 @@
        fol.money,
        o.customer_name,
        o.project,
        od.price
        od.price,
        CASE
        WHEN #{type} = '入库' THEN
            if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
        ELSE
            0
        END AS quantity_available,
        CASE
        WHEN #{type} = '入库' THEN
        if(fgi.quantity_available>fol.quantity,fol.quantity,fgi.quantity_available)
        ELSE
        0
        END AS cancelAvailable
        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 sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -95,7 +109,7 @@
                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}
            </if>
            <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
                and  od.price regexp #{finishedOperateLog.orderDetail.price}
                and  od.price regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.price},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
@@ -122,10 +136,10 @@
                and fol.remarks regexp #{finishedOperateLog.remarks}
            </if>
            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                and fol.area regexp #{finishedOperateLog.area}
                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
                and fol.money regexp #{finishedOperateLog.money}
                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
                and o.customer_name regexp #{finishedOperateLog.order.customerName}
@@ -144,6 +158,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 sd.`order` o on o.order_id=fol.order_id
        <where>
            date(fol.operate_time)>=#{startDate} and date(fol.operate_time) &lt;= #{endDate}
@@ -159,6 +174,9 @@
            <if test="finishedOperateLog.quantity != null and finishedOperateLog.quantity != ''">
                and fol.quantity regexp #{finishedOperateLog.quantity}
            </if>
            <if test="finishedOperateLog.processId != null and finishedOperateLog.processId != ''">
                and fol.process_id regexp #{finishedOperateLog.processId}
            </if>
            <if test="finishedOperateLog.operator != null and finishedOperateLog.operator != ''">
                and fol.operator regexp #{finishedOperateLog.operator}
            </if>
@@ -169,7 +187,7 @@
                and  od.product_name regexp #{finishedOperateLog.orderDetail.productName}
            </if>
            <if test="finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
                and  od.price regexp #{finishedOperateLog.orderDetail.price}
                and  od.price regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.price},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.orderDetail.width != null and finishedOperateLog.orderDetail.width != ''">
                and  od.width regexp  REGEXP_REPLACE(#{finishedOperateLog.orderDetail.width},'\\.0+$','')
@@ -196,10 +214,10 @@
                and fol.remarks regexp #{finishedOperateLog.remarks}
            </if>
            <if test="finishedOperateLog.area != null and finishedOperateLog.area != ''">
                and fol.area regexp #{finishedOperateLog.area}
                and fol.area regexp REGEXP_REPLACE(#{finishedOperateLog.area},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.money != null and finishedOperateLog.money != ''">
                and fol.money regexp #{finishedOperateLog.money}
                and fol.money regexp REGEXP_REPLACE(#{finishedOperateLog.money},'\\.0+$','')
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.customerName != null and finishedOperateLog.order.customerName != '')">
                and o.customer_name regexp #{finishedOperateLog.order.customerName}
@@ -217,6 +235,11 @@

    <update id="updateFinishedOperateLogState">
        update mm.finished_operate_log set status=#{type} where id=#{finishedOperateLog.id};
    </update>

    <update id="updateFinishedOperateLogQuantity">
        update mm.finished_operate_log set quantity=quantity-#{finishedOperateLog.cancelAvailable},
                                           area=area-#{deliveryDetailArea},money=money-#{deliveryDetailMoney}  where id=#{finishedOperateLog.id};
    </update>

    <select id="getSelectOperateRecord" resultMap="selectFinishedGoodsInventory">
@@ -480,7 +503,8 @@
        fol.money,
        o.customer_name,
        o.project,
        od.price
        od.price,
        o.order_type
        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
@@ -549,6 +573,9 @@
            </if>
            <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
                and  od.price regexp #{finishedOperateLog.orderDetail.price}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.orderType != null and finishedOperateLog.order.orderType != '')">
                and o.order_type regexp #{finishedOperateLog.order.orderType}
            </if>
        </where>
        order by fol.`status` desc
@@ -627,6 +654,9 @@
            <if test="finishedOperateLog.orderDetail!=null and finishedOperateLog.orderDetail.price != null and finishedOperateLog.orderDetail.price != ''">
                and  od.price regexp #{finishedOperateLog.orderDetail.price}
            </if>
            <if test="finishedOperateLog.order !=null and (finishedOperateLog.order.orderType != null and finishedOperateLog.order.orderType != '')">
                and o.order_type regexp #{finishedOperateLog.order.orderType}
            </if>
        </where>
    </select>

@@ -655,7 +685,8 @@
                                            status,
                                            remarks,
                                            money,
                                            area
                                            area,
                                            compute_area
        )
        values (
                   #{oddNumber} ,#{flowCard.order.orderId},#{flowCard.processId},#{flowCard.orderNumber},"入库",#{userName},
@@ -666,7 +697,7 @@
        <if test="createTime == null">
            now()
        </if>
                ,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea}
                ,"未审核",#{container},#{deliveryDetailMoney},#{deliveryDetailArea},#{getComputeArea}

               )
    </insert>
@@ -680,11 +711,12 @@
                                            quantity,
                                            operate_time,
                                            status,
                                            remarks
                                            remarks,
                                            area
        )
        values (
                   #{orderDetail.deliveryDetail.deliveryId} ,#{orderDetail.deliveryDetail.orderId},#{orderDetail.deliveryDetail.orderNumber}
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo}
                   ,"出库",#{userName},#{orderDetail.deliveryDetail.quantity},now(),"未审核",#{boxNo},#{orderDetail.deliveryDetail.area}
               )
    </insert>

@@ -768,7 +800,8 @@
               fol.money,
               o.customer_name,
               o.project,
               od.price
               od.price,
               o.order_type
        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
@@ -786,10 +819,14 @@
                                            operator,
                                            quantity,
                                            operate_time,
                                            status
                                            status,
                                            area,
                                            compute_area,
                                            remarks
        )
        values (
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核"
                   #{oddNumber} ,#{orderDetail.orderId},"",#{orderDetail.orderNumber},"入库",#{userName},#{orderDetail.quantity},now(),"未审核",
                #{orderDetail.computeGrossArea},#{orderDetail.computeArea},""
               )
    </insert>

@@ -943,7 +980,8 @@
                                                                             o.batch,
                                                                             fol.remarks,
                                                                             SUM(fol.quantity) as quantity,
                                                                             ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,
                                                                             /*ROUND( sum(od.width * od.height * fol.quantity) / 1000000, 2 ) as area,*/
                                                                             fol.area as area,
                                                                             ROUND( sum(od.width * od.height * fol.quantity*p.total_thickness*2.5) / 1000000, 2 ) as weight,
                                                                             fol.process_id,
                                                                             aaa.teams_groups_name,
@@ -996,7 +1034,8 @@
            sum(fol.quantity) as quantity,
            od.product_name,
            od.product_id,
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,
            /*ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 ) as area,*/
            ROUND(sum(fol.compute_area * fol.quantity) , 2 ) as area,
            ROUND(sum(od.width * od.height * fol.quantity / 1000000) , 2 )*#{thickness}*2.5 as weight
        FROM
            ( SELECT * FROM mm.finished_operate_log aa WHERE aa.operate_type = '入库' AND aa.STATUS != '已作废' ) fol
@@ -1056,4 +1095,6 @@
        left join sd.`order` o on o.order_id=fol.order_id
        where fol.operation_order_number=#{deliveryId}
    </select>


</mapper>