提交 流程卡撤回

guoyujie

2025-08-25 c8db4741002fa18d0e70eb37b38a7d7cc025bdfd

 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"/>
@@ -18,10 +22,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 +39,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>
    <!--映射成品入库-->
@@ -38,6 +49,7 @@
        <result column="inventory_quantity" property="inventoryQuantity"/>
        <result column="process_id" property="processId"/>
        <result column="received_quantity" property="receivedQuantity"/>
        <result column="fc_quantity" property="quantity"/>


        <result column="order_id" property="order.orderId"/>
@@ -80,6 +92,7 @@
        <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="project" property="order.project"/>

@@ -132,24 +145,30 @@
            update_time=now(),area=actual_signal_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
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
    </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}
        where order_id=#{orderId}  and order_number=#{orderNumber}  and trim(box_no) = trim(#{boxNo})
    </update>

    <update id="updateInventoryInventoryInt">
        update mm.finished_goods_inventory
        set inventory=inventory+#{quantity}
        where order_number=#{orderNumber}  and order_id=#{orderId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{remarks})
    </update>

    <update id="updateInventoryInventoryOut">
        update mm.finished_goods_inventory
        set inventory=inventory-#{quantity}
        where order_number=#{orderNumber}  and order_id=#{orderId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
    </update>

    <select id="getSelectAllocate"  resultMap="selectDeliveryFinishedGoodsInventory">
@@ -211,7 +230,7 @@
                and fgi.storage_region regexp #{orderDetail.finishedGoodsInventory.storageRegion}
            </if>
        </where>
        group by fgi.order_id, fgi.order_number
        group by fgi.order_id, fgi.order_number,fgi.box_no

        limit #{offset},#{pageSize};
    </select>
@@ -273,7 +292,7 @@
    <update id="updateDeliveryDetailState">
        update sd.delivery_detail
        set delivery_detail_state=#{state}
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId}
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
    </update>

    <update id="updateInventoryquantityavailable">
@@ -364,7 +383,8 @@
               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
@@ -513,7 +533,7 @@
        <if test="container != null and container != ''">
            , box_no= #{container}
        </if>
        where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId}
        where order_number=#{flowCard.orderNumber}  and order_id=#{flowCard.order.orderId} and box_no= #{container}
    </update>

    <update id="updateInventoryOut">
@@ -521,6 +541,7 @@
        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}
        and box_no=#{finishedOperateLog.remarks}
    </update>

    <insert id="insertFinishedGoodsInventory"  useGeneratedKeys="true"  >
@@ -551,7 +572,14 @@
    <select id="findOrderNumberdcount" >
        select count(*)
        from  mm.`finished_goods_inventory`
        where order_number = #{orderNumber} and order_id=#{orderId};
        where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{boxNo};

    </select>

    <select id="findOrderNumberdContainercount" >
        select count(*)
        from  mm.`finished_goods_inventory`
        where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{container};

    </select>

@@ -576,6 +604,38 @@

    </select>

    <select id="getSelectWarehousingByProcessId" 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 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
@@ -590,6 +650,7 @@
        o.project,
        fc.order_number,
        od.quantity,
        fc.quantity as fc_quantity,
        fc.inventory_quantity-fc.received_quantity as inventory_quantity,
        o.area,
        fc.process_id,
@@ -716,14 +777,22 @@


    <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,
        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,
@@ -734,10 +803,13 @@
        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 o.create_order>0
            <if test="finishedGoodsInventory.orderDetail.width != null and finishedGoodsInventory.orderDetail.width != ''">
@@ -752,6 +824,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>
@@ -761,6 +836,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>
@@ -797,19 +886,25 @@
            <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.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>
@@ -826,6 +921,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>
@@ -835,6 +933,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>
@@ -871,11 +983,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.update_time desc
        limit #{offset},#{pageSize}
        <!-- limit #{offset},#{pageSize} as 'pageTotal', -->
        ;
    </select>

@@ -921,7 +1036,11 @@

    <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
        and trim(#{boxNo}) =box_no
    </select>

    <select id="getSelectDeliveryDetailDeliveryId"  resultMap="selectDelivery">
@@ -952,4 +1071,86 @@
    </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(od.width * od.height * fol.quantity_available / 1000000) , 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>
</mapper>