Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-10-23 cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f

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

@@ -24,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"/>
@@ -93,13 +95,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>
@@ -128,47 +131,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
        where order_number=#{orderNumber}  and order_id=#{orderId} and trim(box_no) = trim(#{boxNo})
            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_id=#{orderId}  and order_number=#{orderNumber}  and trim(box_no) = trim(#{boxNo})
            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} and trim(box_no) = trim(#{remarks})
        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} and trim(box_no) = trim(#{boxNo})
        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">
@@ -292,13 +320,19 @@
    <update id="updateDeliveryDetailState">
        update sd.delivery_detail
        set delivery_detail_state=#{state}
        where order_number=#{orderNumber}  and order_id=#{orderId} and delivery_id=#{deliveryId} and trim(box_no) = trim(#{remarks})
        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>

@@ -379,7 +413,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,
@@ -471,6 +505,10 @@
        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">
        update sd.`order`
        set warehousing=#{state}
@@ -523,25 +561,37 @@
    <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
        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}
        and box_no=#{finishedOperateLog.remarks}
        <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"  >
@@ -559,27 +609,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>

@@ -805,6 +870,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
@@ -861,6 +928,12 @@
            </if>
            <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+$','')
@@ -962,6 +1035,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>
@@ -1012,20 +1091,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
        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>

@@ -1040,7 +1123,12 @@
          and order_id=#{orderId}
          and delivery_id=#{deliveryId}
          and delivery_detail_state=0
        and trim(#{boxNo}) =box_no
        <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">
@@ -1056,11 +1144,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
@@ -1074,11 +1163,11 @@
    <select id="getPrintTitleByBox">
        select kkk.*,
               rw.teams_groups_name as teams_groups_name2
        from(select  o.order_id,
        from(select #{orderId} as order_id,
                 o.customer_name,
                 o.customer_id,
                 o.project,
                 (select p.batch from sd.`order` p where p.order_id =#{orderId}) as batch,
                 (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,
@@ -1134,7 +1223,7 @@
            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(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
@@ -1153,4 +1242,10 @@
        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>
</mapper>