blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2025-09-24 4ecafe1bbc2f5da577f1f5dff307983f9fd71bde 
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml


@@ -93,13 +93,14 @@


        <result column="create_time" property="deliveryDetail.createTime"/>


        <result column="dd_quantity" property="deliveryDetail.quantity"/>


        <result column="box_no" property="deliveryDetail.boxNo"/>


        <result column="area" property="deliveryDetail.area"/>




        <result column="project" property="order.project"/>




        <result column="creator" property="delivery.creator"/>


        <result column="customer_name" property="delivery.customerName"/>


        <result column="d_quantity" property="delivery.quantity"/>


        <result column="area" property="delivery.area"/>








    </resultMap>


@@ -150,7 +151,7 @@


        set quantity_available=quantity_available+#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


        where order_number=#{orderNumber}  and order_id=#{orderId}


        <if test="boxNo != null and boxNo != ''">


        <if test="boxNo != null ">


            and trim(box_no) = trim(#{boxNo})


        </if>


        <if test="boxNo == null ">


@@ -163,7 +164,7 @@


        set quantity_available=quantity_available-#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


        where order_id=#{orderId}  and order_number=#{orderNumber}


        <if test="boxNo != null and boxNo != ''">


        <if test="boxNo != null ">


            and trim(box_no) = trim(#{boxNo})


        </if>


        <if test="boxNo == null ">


@@ -175,7 +176,7 @@


        update mm.finished_goods_inventory


        set inventory=inventory+#{quantity}


        where order_number=#{orderNumber}  and order_id=#{orderId}


        <if test="remarks != null and remarks != ''">


        <if test="remarks != null ">


            and trim(box_no) = trim(#{remarks})


        </if>


        <if test="remarks == null ">


@@ -187,7 +188,7 @@


        update mm.finished_goods_inventory


        set inventory=inventory-#{quantity}


        where order_number=#{orderNumber}  and order_id=#{orderId}


        <if test="boxNo != null and boxNo != ''">


        <if test="boxNo != null ">


            and trim(box_no) = trim(#{boxNo})


        </if>


        <if test="boxNo == null ">


@@ -318,7 +319,7 @@


        update sd.delivery_detail


        set delivery_detail_state=#{state}


        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId}


        <if test="remarks != null and remarks != ''">


        <if test="remarks != null ">


            and trim(box_no) = trim(#{remarks})


        </if>


        <if test="remarks == null ">


@@ -410,7 +411,7 @@


               dd.quantity as dd_quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


               dd.area,


               od.building_number,


               d.creator,


               dd.delivery_detail_remakes,


@@ -565,11 +566,11 @@


        <if test="remark != null and remark != ''">


            , remark= #{remark}


        </if>


        <if test="container != null and container != ''">


        <if test="container != null ">


            , box_no= #{container}


        </if>


        where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId}


        <if test="container != null and container != ''">


        <if test="container != null ">


            and box_no= #{container}


        </if>


        <if test="container == null ">


@@ -620,7 +621,7 @@


        select count(*)


        from  mm.`finished_goods_inventory`


        where order_number = #{orderNumber} and order_id=#{orderId}


        <if test="boxNo != null and boxNo != ''">


        <if test="boxNo != null ">


            and box_no=#{boxNo}


        </if>


        <if test="boxNo == null ">


@@ -633,7 +634,7 @@


        select count(*)


        from  mm.`finished_goods_inventory`


        where order_number = #{orderNumber} and order_id=#{orderId}


        <if test="container != null and container != ''">


        <if test="container != null ">


            and box_no=#{container}


        </if>


        <if test="container == null ">


@@ -1099,7 +1100,7 @@


          and order_id=#{orderId}


          and delivery_id=#{deliveryId}


          and delivery_detail_state=0


        <if test="boxNo != null and boxNo != ''">


        <if test="boxNo != null ">


            and  box_no=trim(#{boxNo})


        </if>


        <if test="boxNo == null ">


@@ -1120,11 +1121,12 @@


               dd.quantity as dd_quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


               dd.area,


               od.building_number,


               d.creator,


               dd.delivery_detail_remakes,


               dd.create_time


               dd.create_time,


               dd.box_no


        from sd.delivery_detail dd


                 left join sd.delivery d on dd.delivery_id = d.delivery_id


                 left join sd.order_detail od on od.order_id = dd.order_id and dd.order_number = od.order_number