blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-07-22 b9e4e2edbb3767ee347a91d2238544ae736b53c0 
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml


@@ -18,10 +18,16 @@


        <result column="remark" property="remark"/>


        <result column="update_time" property="updateTime"/>


        <result column="end_time" property="endTime"/>


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


        <result column="weight" property="weight"/>




        <result column="order_id" property="order.orderId"/>


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


        <result column="order_type" property="order.orderType"/>


        <result column="customer_id" property="order.customerId"/>


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


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


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






        <result column="order_number" property="orderDetail.orderNumber"/>


@@ -29,6 +35,7 @@


        <result column="height" property="orderDetail.height"/>


        <result column="product_name" property="orderDetail.productName"/>


        <result column="product_id" property="orderDetail.productId"/>


        <result column="building_number" property="orderDetail.buildingNumber"/>




    </resultMap>


    <!--映射成品入库-->


@@ -46,6 +53,7 @@


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


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


        <result column="order_quantity" property="order.quantity"/>


        <result column="calculate_type" property="order.calculateType"/>




        <result column="building_number" property="orderDetail.buildingNumber"/>


        <result column="width" property="orderDetail.width"/>


@@ -53,6 +61,12 @@


        <result column="product_name" property="orderDetail.productName"/>


        <result column="product_id" property="orderDetail.productId"/>


        <result column="quantity" property="orderDetail.quantity"/>




        <result column="price" property="orderDetail.price"/>


        <result column="areas" property="orderDetail.area"/>


        <result column="gross_area" property="orderDetail.grossArea"/>


        <result column="compute_area" property="orderDetail.computeArea"/>


        <result column="compute_gross_area" property="orderDetail.computeGrossArea"/>


    </resultMap>




    <!--映射成品出库-->


@@ -72,12 +86,13 @@


        <result column="delivery_detail_remakes" property="deliveryDetail.deliveryDetailRemakes"/>


        <result column="order_id" property="deliveryDetail.orderId"/>


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


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




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




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


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


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


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


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






@@ -162,7 +177,7 @@


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


                 left join sd.`order` o on fgi.order_id = o.order_id


        <where>


                and fgi.quantity_available>0


                and fgi.status = 0 and fgi.quantity_available>0


            <if test="orderDetail.finishedGoodsInventory.orderId != null and orderDetail.finishedGoodsInventory.orderId != ''">


                and fgi.order_id regexp #{orderDetail.finishedGoodsInventory.orderId}


            </if>


@@ -265,7 +280,7 @@


    <update id="updateDeliveryDetailState">


        update sd.delivery_detail


        set delivery_detail_state=#{state}


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


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


    </update>




    <update id="updateInventoryquantityavailable">


@@ -276,7 +291,7 @@


    </update>






    <select id="getseletdeliveryDetailPageTotal"  >


    <select id="getSelectDeliveryDetailPageTotal"  >


        select CEILING(count(dd.id)/#{pageSize}) as 'pageTotal',


        count(dd.id) as 'total'


        from sd.delivery_detail dd


@@ -334,12 +349,12 @@


                and dd.delivery_detail_remakes regexp #{orderDetail.deliveryDetail.deliveryDetailRemakes}


            </if>


        </where>


        order by dd.id


        order by dd.id desc




        limit #{offset},#{pageSize};


    </select>




    <select id="getseletdeliveryDetail"  resultMap="selectDelivery">


    <select id="getSelectDeliveryDetail"  resultMap="selectDelivery">


        select dd.delivery_id,


               dd.order_number,


               dd.order_id,


@@ -349,7 +364,7 @@


               d.customer_name,


               od.width,


               od.height,


               d.quantity,


               dd.quantity as dd_quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


@@ -363,7 +378,7 @@


                 left join sd.`order` o on o.order_id = dd.order_id




        <where>


                and dd.delivery_detail_state=1


                and dd.delivery_detail_state=1 and d.delivery_state=2


            <if test="orderDetail.deliveryDetail.deliveryId != null and orderDetail.deliveryDetail.deliveryId != ''">


                and dd.delivery_id regexp #{orderDetail.deliveryDetail.deliveryId}


            </if>


@@ -414,7 +429,7 @@


            </if>


        </where>




        order by dd.id


        order by dd.id desc




        limit #{offset},#{pageSize};


    </select>


@@ -427,12 +442,20 @@


        select sum(warehouse_num) from sd.order_detail where order_id=#{orderId}


    </select>




    <select id="findOrderDeliveryQuantitySum"  >


        select sum(delivery_num) from sd.order_detail where order_id=#{orderId}


    </select>




    <select id="findDeliveryQuantity" >


        select quantity from sd.`delivery`  where delivery_id=#{deliveryId}


    </select>




    <select id="findOrderDelivery" >


        select * from sd.`delivery`  where order_id=#{orderId}


    </select>




    <select id="findDeliverydetailsum"  >


        select sum(quantity) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}


        select ifnull(sum(quantity),0) from sd.`delivery_detail`  where delivery_id=#{deliveryId} and delivery_detail_state=#{deliveryDetailState}


    </select>




    <update id="updateOrderWarehousingState">


@@ -453,9 +476,10 @@


        where delivery_id=#{deliveryId}


    </update>






    <update id="updateIntOrderNumberConut">


        update sd.order_detail


        set warehouse_num=warehouse_num+${quantity}


        set warehouse_num=warehouse_num+${quantity},update_time=now()


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


    </update>




@@ -465,10 +489,22 @@


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


    </update>




    <update id="updateOrderNumberConut">


        update sd.order_detail


        set warehouse_num=${quantity},update_time=now()


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


    </update>




    <update id="updateflowcard">


        update pp.flow_card


        set received_quantity=received_quantity+${inventoryQuantity}


        set received_quantity=received_quantity+${inventoryQuantity},storage_time=now()


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


    </update>




    <update id="updateflowcardOut">


        update pp.flow_card


        set received_quantity=received_quantity-${finishedOperateLog.quantity},storage_time=now()


        where order_number=#{finishedOperateLog.operationNumber} and process_id=#{finishedOperateLog.processId} and order_id=#{finishedOperateLog.orderId}


    </update>




    <update id="updateInventory">


@@ -481,12 +517,23 @@


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


            , remark= #{remark}


        </if>


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


            , box_no= #{container}


        </if>


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


    </update>




    <update id="updateInventoryOut">


        update mm.finished_goods_inventory


        set inventory=inventory-${finishedOperateLog.quantity},quantity_available=quantity_available-${finishedOperateLog.quantity},


        update_time=now(),area=actual_signal_area*quantity_available


        where order_number=#{finishedOperateLog.operationNumber}  and order_id=#{finishedOperateLog.orderId}


    </update>




    <insert id="insertFinishedGoodsInventory"  useGeneratedKeys="true"  >


        insert into mm.finished_goods_inventory (order_id,


                                                 order_number,


                                                 process_id,


                                                 inventory,


                                                 actual_signal_area,


                                                 area,


@@ -495,21 +542,36 @@


                                                 storage_region,


                                                 `status`,


                                                 enter_storage_time,


                                                 box_no,


                                                 update_time,


                                                 end_time,


                                                 remark


        )


        values (


                   #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),


                   #{flowCard.order.orderId} ,#{flowCard.orderNumber},#{flowCard.processId},#{flowCard.inventoryQuantity},ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}/1000000,2),


                   ROUND(#{flowCard.orderDetail.width}*#{flowCard.orderDetail.height}*#{flowCard.inventoryQuantity}/1000000,2),


                #{flowCard.inventoryQuantity},null,#{storageRegion},


                0,now(),now(),null,#{remark}


                0,now(),#{container},now(),null,#{remark}


               )


    </insert>




    <select id="findOrderNumberdcount" >


        select count(*)


        from  mm.`finished_goods_inventory`


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




    </select>




    <select id="findOrderNumberd" >


        select *


        from  mm.`finished_goods_inventory`


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




    </select>




    <select id="findOrderDetailNumberd" >


        select *


        from  sd.`order_detail`


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




    </select>


@@ -521,8 +583,7 @@




    </select>






    <select id="getseletwarehousing" resultMap="selectFlowCard">


    <select id="getSelectWarehousingByProcessId" resultMap="selectFlowCard">


        select


        fc.id,


        o.order_id,


@@ -535,15 +596,55 @@


        o.project,


        fc.order_number,


        od.quantity,


        fc.inventory_quantity,


        fc.inventory_quantity-fc.received_quantity as inventory_quantity,


        o.area,


        fc.process_id,


        fc.received_quantity,


        o.batch


        from pp.flow_card fc left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on


        o.batch,


        o.calculate_type,


        od.compute_area,


        od.price,


        od.area as areas,


        od.gross_area,


        od.compute_gross_area


        from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card  group by  order_id,order_number,process_id) as fc


        left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on


        o.order_id=fc.order_id


        where fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0 and


            fc.order_id=#{order_id} and fc.order_number=#{order_number} and fc.process_id=#{process_id};




    </select>






    <select id="getSelectWarehousing" resultMap="selectFlowCard">


        select


        fc.id,


        o.order_id,


        od.building_number,


        od.product_id,


        od.product_name,


        od.width,


        od.height,


        o.creator,


        o.project,


        fc.order_number,


        od.quantity,


        fc.inventory_quantity-fc.received_quantity as inventory_quantity,


        o.area,


        fc.process_id,


        fc.received_quantity,


        o.batch,


        o.calculate_type,


        od.compute_area,


        od.price,


        od.area as areas,


        od.gross_area,


        od.compute_gross_area


        from (select *,min(inventory_quantity) as min_inventory_quantity from pp.flow_card  group by  order_id,order_number,process_id) as fc


        left join sd.order_detail od on fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on


        o.order_id=fc.order_id


        <where>


                and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity


                and fc.received_quantity <![CDATA[<]]> fc.min_inventory_quantity and o.create_order>0


            <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">


                and o.order_id regexp #{flowCard.order.orderId}


            </if>


@@ -591,16 +692,17 @@


            </if>




        </where>


        group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time


        group by fc.order_id,fc.order_number,fc.process_id order by fc.create_time desc


        limit #{offset},#{pageSize};


    </select>


    <select id="getseletwarehousingPageTotal" >


    <select id="getSelectWarehousingPageTotal" >


        select


        CEILING(count(zu.order_number)/#{pageSize}) as 'pageTotal',


        count(zu.order_number) as 'total' from (


        select fc.order_number as order_number,fc.process_id from pp.flow_card fc left join sd.order_detail od on


        fc.order_id=od.order_id and fc.order_number=od.order_number inner join sd.`order` o on o.order_id=fc.order_id


        <where>


            and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity


            and fc.received_quantity <![CDATA[<]]> fc.inventory_quantity and o.create_order>0


            <if test="flowCard.order.orderId != null and flowCard.order.orderId != ''">


                and o.order_id regexp #{flowCard.order.orderId}


            </if>


@@ -657,10 +759,15 @@


        o.order_id,


        o.project,


        o.order_type,


        o.customer_id,


        o.customer_name,


        o.batch,


        o.salesman,


        od.product_name,


        od.product_id,


        od.width,


        od.height,


        od.building_number,


        fgi.inventory,


        fgi.quantity_available,


        fgi.actual_signal_area,


@@ -671,12 +778,15 @@


        fgi.update_time,


        fgi.enter_storage_time,


        fgi.end_time,


        fgi.remark


        fgi.remark,


        fgi.box_no,


        round(fgi.area*p.total_thickness*2.5/1000,5) as weight


        from finished_goods_inventory fgi


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


        left join sd.`order` o on fgi.order_id = o.order_id


        left join sd.product p on p.id=od.product_id


        <where>


                and fgi.status = 0 and fgi.quantity_available>0


                and fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0


            <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">


                and od.width regexp #{finishedGoodsInventory.orderDetail.width}


            </if>


@@ -689,6 +799,9 @@


            <if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">


                and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}


            </if>


            <if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">


                and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}


            </if>


            <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">


                and o.order_id regexp #{finishedGoodsInventory.order.orderId}


            </if>


@@ -698,6 +811,20 @@


            <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">


                and o.order_type regexp #{finishedGoodsInventory.order.orderType}


            </if>




            <if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">


                and o.customer_id regexp #{finishedGoodsInventory.order.customerId}


            </if>


            <if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">


                and o.customer_name regexp #{finishedGoodsInventory.order.customerName}


            </if>


            <if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">


                and o.batch regexp #{finishedGoodsInventory.order.batch}


            </if>


            <if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">


                and o.salesman regexp #{finishedGoodsInventory.order.salesman}


            </if>




            <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">


                and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')


            </if>


@@ -734,12 +861,14 @@


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


                and fgi.remark regexp #{finishedGoodsInventory.remark}


            </if>


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


                and fgi.box_no regexp #{finishedGoodsInventory.boxNo}


            </if>




        </where>


        order by fgi.id


        order by fgi.update_time desc




        limit #{offset},#{pageSize}


        ;


        limit #{offset},#{pageSize};


    </select>






@@ -751,7 +880,7 @@


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


        left join sd.`order` o on fgi.order_id = o.order_id


        <where>


                and fgi.status = 0 and  fgi.quantity_available>0


                and fgi.status = 0 and  fgi.quantity_available>0 and o.create_order>0


            <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">


                and od.width regexp #{finishedGoodsInventory.orderDetail.width}


            </if>


@@ -764,6 +893,9 @@


            <if test="finishedGoodsInventory.orderDetail.productId != null and finishedGoodsInventory.orderDetail.productId != ''">


                and od.product_id regexp #{finishedGoodsInventory.orderDetail.productId}


            </if>


            <if test="finishedGoodsInventory.orderDetail.buildingNumber != null and finishedGoodsInventory.orderDetail.buildingNumber != ''">


                and od.building_number regexp #{finishedGoodsInventory.orderDetail.buildingNumber}


            </if>


            <if test="finishedGoodsInventory.order.orderId != null and finishedGoodsInventory.order.orderId != ''">


                and o.order_id regexp #{finishedGoodsInventory.order.orderId}


            </if>


@@ -773,6 +905,20 @@


            <if test="finishedGoodsInventory.order.orderType != null and finishedGoodsInventory.order.orderType != ''">


                and o.order_type regexp #{finishedGoodsInventory.order.orderType}


            </if>




            <if test="finishedGoodsInventory.order.customerId != null and finishedGoodsInventory.order.customerId != ''">


                and o.customer_id regexp #{finishedGoodsInventory.order.customerId}


            </if>


            <if test="finishedGoodsInventory.order.customerName != null and finishedGoodsInventory.order.customerName != ''">


                and o.customer_name regexp #{finishedGoodsInventory.order.customerName}


            </if>


            <if test="finishedGoodsInventory.order.batch != null and finishedGoodsInventory.order.batch != ''">


                and o.batch regexp #{finishedGoodsInventory.order.batch}


            </if>


            <if test="finishedGoodsInventory.order.salesman != null and finishedGoodsInventory.order.salesman != ''">


                and o.salesman regexp #{finishedGoodsInventory.order.salesman}


            </if>




            <if test="finishedGoodsInventory.orderDetail.height != null and finishedGoodsInventory.orderDetail.height != ''">


                and od.height regexp REGEXP_REPLACE(#{finishedGoodsInventory.orderDetail.height},'\\.0+$','')


            </if>


@@ -809,12 +955,88 @@


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


                and fgi.remark regexp #{finishedGoodsInventory.remark}


            </if>


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


                and fgi.box_no regexp #{finishedGoodsInventory.boxNo}


            </if>




        </where>




        order by fgi.id desc


        order by fgi.update_time desc


        limit #{offset},#{pageSize}


        ;


    </select>




    <select id="getSelectOrderDetail" >


        select * from sd.order_detail where order_id=#{orderId}


    </select>




    <insert id="insertOrderFinishedGoodsInventory"  useGeneratedKeys="true"  >


        insert into mm.finished_goods_inventory (order_id,


                                                 order_number,


                                                 process_id,


                                                 inventory,


                                                 actual_signal_area,


                                                 area,


                                                 quantity_available,


                                                 warehouse_number,


                                                 storage_region,


                                                 `status`,


                                                 enter_storage_time,


                                                 update_time,


                                                 end_time,


                                                 remark


        )


        values (


                   #{orderDetail.orderId} ,#{orderDetail.orderNumber},"",#{orderDetail.quantity},#{orderDetail.computeArea},


                   #{orderDetail.computeGrossArea},


                   #{orderDetail.quantity},null,"",


                   0,now(),now(),null,""


               )


    </insert>




    <update id="updateOrderInventory">


        update mm.finished_goods_inventory


        set inventory=${orderDetail.quantity},quantity_available=${orderDetail.quantity},


        update_time=now(),area=actual_signal_area*quantity_available


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


    </update>




    <select id="findFlowCard">


        select * from pp.flow_card


        where order_number=#{orderNumber} and process_id=#{processId} and order_id=#{order.orderId} group by process_id


    </select>




    <select id="findDeliverydetail">


        select * from sd.delivery_detail


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


    </select>




    <select id="getSelectDeliveryDetailDeliveryId"  resultMap="selectDelivery">


        select dd.delivery_id,


               dd.order_number,


               dd.order_id,


               o.project,


               od.product_id,


               od.product_name,


               d.customer_name,


               od.width,


               od.height,


               dd.quantity as dd_quantity,


               od.warehouse_num,


               od.delivery_num,


               d.area,


               od.building_number,


               d.creator,


               dd.delivery_detail_remakes,


               dd.create_time


        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


                 left join sd.`order` o on o.order_id = dd.order_id




        where dd.delivery_id= #{deliveryId}




    </select>






</mapper>