blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chenlu
2025-11-20 9c5c958fed902c674e35ec89382703d37e50e21c 
 north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml


@@ -7,6 +7,10 @@


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


    <resultMap id="selectFinishedGoodsInventory" type="com.example.erp.entity.mm.FinishedGoodsInventory">


        <id column="fid" property="id"/>


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


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


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


        <result column="process_id" property="processId"/>


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


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


        <result column="actual_signal_area" property="actualSignalArea"/>


@@ -20,6 +24,8 @@


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


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


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


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


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




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


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


@@ -85,17 +91,19 @@


        <result column="delivery_id" property="deliveryDetail.deliveryId"/>


        <result column="delivery_number" property="deliveryDetail.deliveryNumber"/>


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


            <result column="delivery_detail_state" property="deliveryDetail.deliveryDetailState"/>


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


        <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>


@@ -124,41 +132,72 @@


    <update id="updateInventoryquantityAllocateInt">


        update mm.finished_goods_inventory


        set inventory=inventory+#{quantity},quantity_available=quantity_available+#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


    </update>




    <update id="updateInventoryquantityAllocateOut">


        update mm.finished_goods_inventory


        set inventory=inventory-#{quantity},quantity_available=quantity_available-#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


    </update>




    <update id="updateInventoryquantityInt">


        update mm.finished_goods_inventory


        set quantity_available=quantity_available+#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


    </update>


    <update id="updateInventoryquantityIntBybox">


        update mm.finished_goods_inventory


        set quantity_available=quantity_available+#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


        <if test="boxNo != null ">


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


        </if>


        <if test="boxNo == null ">


            and box_no  is null


        </if>


    </update>




    <update id="updateInventoryquantityOut">


        update mm.finished_goods_inventory


        set quantity_available=quantity_available-#{quantity},


            update_time=now(),area=actual_signal_area*quantity_available


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


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


        <if test="boxNo != null ">


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


        </if>


        <if test="boxNo == null ">


            and box_no  is null


        </if>


    </update>




    <update id="updateInventoryInventoryInt">


        update mm.finished_goods_inventory


        set inventory=inventory+#{quantity}


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


        <if test="remarks != null ">


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


        </if>


        <if test="remarks == null ">


            and box_no  is null


        </if>


    </update>




    <update id="updateInventoryInventoryOut">


        update mm.finished_goods_inventory


        set inventory=inventory-#{quantity}


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


        <if test="boxNo != null ">


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


        </if>


        <if test="boxNo == null ">


            and box_no  is null


        </if>




    </update>




    <select id="getSelectAllocate"  resultMap="selectDeliveryFinishedGoodsInventory">


@@ -283,12 +322,18 @@


        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 trim(box_no) = trim(#{remarks})


        </if>


        <if test="remarks == null ">


            and box_no  is null


        </if>


    </update>




    <update id="updateInventoryquantityavailable">


        update mm.finished_goods_inventory


        set inventory=0,quantity_available=0,


        update_time=now(),area=0,status=1


        update_time=now(),area=0,status=1,compute_gross_area=0


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


    </update>




@@ -302,13 +347,13 @@


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


        <where>


                and dd.delivery_detail_state=1


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


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


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


            </if>


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


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


                and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}


            </if>


            <if test="orderDetail.order.project != null and orderDetail.order.project != ''">


            <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">


                and o.project regexp #{orderDetail.order.project}


            </if>


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


@@ -317,7 +362,7 @@


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


                and od.product_name regexp #{orderDetail.productName}


            </if>


            <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">


                and d.customer_name regexp #{orderDetail.delivery.customerName}


            </if>


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


@@ -326,7 +371,7 @@


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


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


            </if>


            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


                and d.quantity regexp #{orderDetail.delivery.quantity}


            </if>


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


@@ -335,19 +380,19 @@


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


                and od.building_number regexp #{orderDetail.buildingNumber}


            </if>


            <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">


                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')


            </if>


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


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


                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}


            </if>


            <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">


                and d.creator regexp #{orderDetail.delivery.creator}


            </if>


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


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


                and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}


            </if>


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


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


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


            </if>


        </where>


@@ -369,7 +414,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,


@@ -382,13 +427,13 @@




        <where>


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


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


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


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


            </if>


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


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


                and dd.order_id regexp #{orderDetail.deliveryDetail.orderId}


            </if>


            <if test="orderDetail.order.project != null and orderDetail.order.project != ''">


            <if test="orderDetail.order != null and orderDetail.order.project != null and orderDetail.order.project != ''">


                and o.project regexp #{orderDetail.order.project}


            </if>


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


@@ -397,7 +442,7 @@


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


                and od.product_name regexp #{orderDetail.productName}


            </if>


            <if test="orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.customerName != null and orderDetail.delivery.customerName != ''">


                and d.customer_name regexp #{orderDetail.delivery.customerName}


            </if>


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


@@ -406,7 +451,7 @@


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


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


            </if>


            <if test="orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.quantity != null and orderDetail.delivery.quantity != ''">


                and d.quantity regexp #{orderDetail.delivery.quantity}


            </if>


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


@@ -415,19 +460,19 @@


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


                and od.building_number regexp #{orderDetail.buildingNumber}


            </if>


            <if test="orderDetail.delivery.area != null and orderDetail.delivery.area != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.area != null and orderDetail.delivery.area != ''">


                and d.area regexp REGEXP_REPLACE(#{orderDetail.delivery.area},'\\.0+$','')


            </if>


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


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


                and dd.order_number regexp #{orderDetail.deliveryDetail.orderNumber}


            </if>


            <if test="orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">


            <if test="orderDetail.delivery != null and orderDetail.delivery.creator != null and orderDetail.delivery.creator != ''">


                and d.creator regexp #{orderDetail.delivery.creator}


            </if>


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


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


                and dd.create_time regexp #{orderDetail.deliveryDetail.createTime}


            </if>


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


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


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


            </if>


        </where>


@@ -459,6 +504,10 @@




    <select id="findDeliverydetailsum"  >


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


    </select>




    <select id="findFinishedOperateLogQuantity"  >


        select sum(quantity) from mm.finished_operate_log  where operate_type='出库' and status='未审核' and order_id=#{orderId}


    </select>




    <update id="updateOrderWarehousingState">


@@ -494,7 +543,7 @@




    <update id="updateOrderNumberConut">


        update sd.order_detail


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


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


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


    </update>




@@ -506,31 +555,44 @@




    <update id="updateflowcardOut">


        update pp.flow_card


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


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


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


    </update>




    <update id="updateInventory">


        update mm.finished_goods_inventory


        set inventory=inventory+${flowCard.inventoryQuantity},quantity_available=quantity_available+${flowCard.inventoryQuantity},


            update_time=now(),area=actual_signal_area*quantity_available


            update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


            , storage_region= #{storageRegion}


        </if>


        <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} and box_no= #{container}


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


        <if test="container != null ">


            and box_no= #{container}


        </if>


        <if test="container == null ">


            and box_no  is null


        </if>




    </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


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


        update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


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


            and box_no=#{finishedOperateLog.remarks}


        </if>


        <if test="finishedOperateLog.remarks == null ">


            and box_no  is null


        </if>


    </update>




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


@@ -548,27 +610,42 @@


                                                 box_no,


                                                 update_time,


                                                 end_time,


                                                 remark


                                                 remark,


                                                 compute_area,


                                                 compute_gross_area




        )


        values (


                   #{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(),#{container},now(),null,#{remark}


                0,now(),#{container},now(),null,#{remark},#{getComputeArea},#{getComputeArea}*#{flowCard.inventoryQuantity}


               )


    </insert>




    <select id="findOrderNumberdcount" >


        select count(*)


        from  mm.`finished_goods_inventory`


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


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


        <if test="boxNo != null ">


            and box_no=#{boxNo}


        </if>


        <if test="boxNo == null ">


            and box_no  is null


        </if>




    </select>




    <select id="findOrderNumberdContainercount" >


        select count(*)


        from  mm.`finished_goods_inventory`


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


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


        <if test="container != null ">


            and box_no=#{container}


        </if>


        <if test="container == null ">


            and box_no  is null


        </if>




    </select>




@@ -656,43 +733,43 @@


        o.order_id=fc.order_id


        <where>


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


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


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


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


            </if>


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


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


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


            </if>


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


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


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


            </if>


            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">


            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">


                and od.product_name regexp #{flowCard.orderDetail.productName}


            </if>


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


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


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


            </if>


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


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


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


            </if>


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


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


                and o.creator regexp #{flowCard.order.creator}


            </if>


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


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


                and o.project regexp #{flowCard.order.project}


            </if>


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


                and fc.order_number regexp #{flowCard.orderNumber}


            </if>


            <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">


            <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">


                and od.quantity regexp #{flowCard.orderDetail.quantity}


            </if>


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


                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}


            </if>


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


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


                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')


            </if>


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


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


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


            </if>


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


@@ -714,43 +791,43 @@


        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 o.create_order>0


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


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


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


            </if>


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


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


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


            </if>


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


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


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


            </if>


            <if test="flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">


            <if test="flowCard.orderDetail != null and flowCard.orderDetail.productName != null and flowCard.orderDetail.productName != ''">


                and od.product_name regexp #{flowCard.orderDetail.productName}


            </if>


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


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


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


            </if>


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


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


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


            </if>


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


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


                and o.creator regexp #{flowCard.order.creator}


            </if>


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


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


                and o.project regexp #{flowCard.order.project}


            </if>


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


                and fc.order_number regexp #{flowCard.orderNumber}


            </if>


            <if test="flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">


            <if test="flowCard.orderDetail != null and flowCard.orderDetail.quantity != null and flowCard.orderDetail.quantity != ''">


                and od.quantity regexp #{flowCard.orderDetail.quantity}


            </if>


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


                and fc.inventory_quantity regexp #{flowCard.inventoryQuantity}


            </if>


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


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


                and o.area regexp REGEXP_REPLACE(#{flowCard.order.area},'\\.0+$','')


            </if>


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


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


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


            </if>


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


@@ -766,7 +843,10 @@






    <select id="defaultfinishedGoods" resultMap="selectFinishedGoodsInventory">


        select od.order_number,


        select


        fgi.id,


        fgi.process_id,


        od.order_number,


        o.order_id,


        o.project,


        o.order_type,


@@ -791,6 +871,8 @@


        fgi.end_time,


        fgi.remark,


        fgi.box_no,


        fgi.compute_area,


        fgi.compute_gross_area,


        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


@@ -848,6 +930,12 @@


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


                and fgi.actual_signal_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.actualSignalArea},'\\.0+$','')


            </if>


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


                and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')


            </if>


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


                and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')


            </if>


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


                and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')


            </if>


@@ -879,15 +967,18 @@


        </where>


        order by fgi.update_time desc




        limit #{offset},#{pageSize};


        <!-- limit #{offset},#{pageSize}-->


        ;


    </select>






    <select id="getPageTotal">


        select


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


        1  as 'pageTotal',


        <!-- CEILING(count(fgi.id)/#{pageSize}) as 'pageTotal', -->




        count(fgi.id) as 'total'


        from finished_goods_inventory fgi


        from mm.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


        <where>


@@ -945,6 +1036,12 @@


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


                and fgi.area regexp REGEXP_REPLACE(#{finishedGoodsInventory.area},'\\.0+$','')


            </if>


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


                and fgi.compute_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeArea},'\\.0+$','')


            </if>


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


                and fgi.compute_gross_area regexp REGEXP_REPLACE(#{finishedGoodsInventory.computeGrossArea},'\\.0+$','')


            </if>


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


                and fgi.warehouse_number regexp #{finishedGoodsInventory.warehouseNumber}


            </if>


@@ -973,7 +1070,7 @@


        </where>




        order by fgi.update_time desc


        limit #{offset},#{pageSize}


        <!-- limit #{offset},#{pageSize} as 'pageTotal', -->


        ;


    </select>




@@ -995,20 +1092,24 @@


                                                 enter_storage_time,


                                                 update_time,


                                                 end_time,


                                                 remark


                                                 remark,


                                                 compute_area,


                                                 compute_gross_area




        )


        values (


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


                   #{orderDetail.computeGrossArea},


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


                   #{orderDetail.grossArea},


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


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


                   0,now(),now(),null,"",#{orderDetail.computeArea},


                   #{orderDetail.computeGrossArea}


               )


    </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


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


        update_time=now(),area=actual_signal_area*quantity_available,compute_gross_area=compute_area*quantity_available


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


    </update>




@@ -1019,7 +1120,16 @@




    <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


        where order_number=#{orderNumber}


          and order_id=#{orderId}


          and delivery_id=#{deliveryId}


          and delivery_detail_state=0


        <if test="boxNo != null ">


            and  box_no=trim(#{boxNo})


        </if>


        <if test="boxNo == null ">


            and  box_no is null


        </if>


    </select>




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


@@ -1035,11 +1145,13 @@


               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.delivery_detail_state,


               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


@@ -1050,4 +1162,134 @@


    </select>






    <select id="getPrintTitleByBox">


        select kkk.*,


               rw.teams_groups_name as teams_groups_name2


        from(select #{orderId} as order_id,


                 o.customer_name,


                 o.customer_id,


                 o.project,


                 (select batch from sd.`order` pp1 where pp1.order_id =#{orderId} ) as batch,


                 fol.box_no as 'remarks',


                 SUM(fol.quantity_available) as quantity,


                 ROUND( sum(od.width * od.height * fol.quantity_available) / 1000000, 2 ) as area,


                 ROUND( sum(od.width * od.height * fol.quantity_available*p.total_thickness*2.5) / 1000000, 2 ) as weight,


                 fol.process_id,


                 aaa.teams_groups_name,


                 aaa.previous_process,


                 date( aaa.reporting_work_time) as reporting_work_time


         from (SELECT *


               FROM mm.finished_goods_inventory aa


               where aa.box_no=#{boxNo}


               and aa.quantity_available>0


                   ) as fol


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


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


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


          left join (select teams_groups_name,process_id,previous_process,reporting_work_time from pp.reporting_work  where this_process='包装' group by process_id) aaa on  aaa.process_id=fol.process_id


         where o.customer_id=#{customerId}


           and o.project=#{project}




         group by fol.box_no,o.customer_name,o.project


         ) as kkk


        left join  pp.reporting_work rw on rw.process_id=kkk.process_id and rw.this_process=kkk.previous_process


        group by kkk.remarks,kkk.customer_id,kkk.project




    </select>


    


    <select id="getorderProductByBoxNo">


        SELECT


            od.product_id,


            od.product_name,


            pro.thickness


        FROM


            ( SELECT * FROM mm.finished_goods_inventory aa


              WHERE aa.order_id = #{orderId}


                AND aa.box_no = #{boxNo}


                AND aa.quantity_available > 0 ) fol




                LEFT JOIN sd.order_detail od ON fol.order_id = od.order_id


                AND fol.order_number = od.order_number


                left join sd.product as pro


                          on pro.id = od.product_id


                LEFT JOIN sd.`order` o ON o.order_id = fol.order_id


        group by


            od.product_id




    </select>


    <select id="getPrintDetail">


        SELECT


            ifnull(od.building_number,ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'')) as building_number,


            od.width,


            od.height,


            sum(fol.quantity_available) as quantity,


            od.product_name,


            od.product_id,


            ROUND(sum(fol.compute_area * fol.quantity_available) , 2 ) as area,


            ROUND(sum(od.width * od.height * fol.quantity_available / 1000000) , 2 )*#{thickness}*2.5 as weight


        FROM


            ( SELECT * FROM mm.finished_goods_inventory aa


              WHERE aa.order_id = #{orderId}


                AND aa.box_no = #{boxNo}


                AND aa.quantity_available > 0 ) fol




        LEFT JOIN sd.order_detail od


            ON fol.order_id = od.order_id


            AND fol.order_number = od.order_number


        LEFT JOIN sd.`order` o


            ON o.order_id = fol.order_id


        WHERE


            od.product_id=#{productId}


        group by od.order_id,od.order_number


        ORDER BY


            od.order_number


    </select>




    <delete id="deleteFinishedGoodsInventoryDate" >


        delete fgi from mm.finished_goods_inventory fgi left join sd.`order` o on o.order_id=fgi.order_id


               where o.create_time &lt; DATE_SUB(CURDATE(), INTERVAL 6 MONTH)


               and o.delivery=2 and fgi.inventory=0


    </delete>








    <select id="getFinishedGoodsInventoryList" resultMap="selectFinishedGoodsInventory">


        select


        fgi.id,


        fgi.process_id,


        od.order_number,


        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,


        fgi.area,


        fgi.warehouse_number,


        fgi.storage_region,


        fgi.`status`,


        fgi.update_time,


        fgi.enter_storage_time,


        fgi.end_time,


        fgi.remark,


        fgi.box_no,


        fgi.compute_area,


        fgi.compute_gross_area,


        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 fgi.status = 0 and fgi.quantity_available>0 and o.create_order>0


        order by fgi.update_time desc;


    </select>


</mapper>