补交

廖井涛

6 天以前 583b80a582f9280a262ee72506d31d1bfa46f734

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

@@ -37,7 +37,7 @@

    <select id="getSelectFinishedGlassShelfInformationInventoryArea">
        SELECT
            MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)) AS maxDindex
            ifnull(MAX(CAST(REGEXP_REPLACE(glass_shelf_number, '[^0-9]', '')AS UNSIGNED)),0) AS maxDindex
        FROM
            finished_glass_shelf_information
        WHERE
@@ -182,9 +182,13 @@
            fed.emit_number as emitNumber
        from
            mm.finished_glass_shelf_emit_details fed left join
            (select count(*) as quantity,max_weight,max_width,max_height
             from mm.finished_glass_shelf_information where state=0 group by max_weight,max_width,max_height) fi
            on fed.max_weight=fi.max_weight and fed.max_weight=fi.max_weight and fed.max_width=fi.max_width
            (select count(*) as quantity,max_weight,max_width,max_height,glass_shelf_name,unit,price
             from mm.finished_glass_shelf_information
             where state=0
             group by max_weight,max_width,max_height,glass_shelf_name,unit,price
             ) fi
            on fed.max_weight=fi.max_weight and fed.max_weight=fi.max_weight and fed.max_width=fi.max_width and
               fed.glass_shelf_name=fi.glass_shelf_name and fed.unit=fi.unit and fed.price=fi.price
        where emit_id=#{emitId}
    </select>

@@ -224,10 +228,10 @@

    <insert id="insertFinishedGlassShelfEmitDetailsLog"  useGeneratedKeys="true" >
        insert into mm.finished_glass_shelf_log(document_id,document_number,type,quantity,price,money,unit,
                                                remarks,create_time,max_weight,max_width,max_height,glass_shelf_name)
                                                remarks,create_time,max_weight,max_width,max_height,glass_shelf_name,operator)
        values (
                   #{emitId},#{emitNumber},#{type},#{quantity},#{price},#{money},#{unit},
                #{remarks},now(),#{maxWeight},#{maxWidth},#{maxHeight},#{glassShelfName}
                #{remarks},now(),#{maxWeight},#{maxWidth},#{maxHeight},#{glassShelfName},#{operator}
               )
    </insert>