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

guoyuji

2024-09-03 76bf2824bf55e8f4c3ccbc14b3b2719bf8fb219f

 north-glass-erp/src/main/resources/mapper/pp/ReworkMapper.xml

@@ -46,6 +46,7 @@
        on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
         order by r.review_status,r.id desc limit #{offset},#{pageSize};
    </select>
@@ -61,6 +62,7 @@
                                 on r.order_id = ogd.order_id and r.order_sort = ogd.order_number
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
            and o.create_order>0
        </where>
              ) as zu
        limit #{offset},#{pageSize};
@@ -100,7 +102,7 @@
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 order by dd.id desc
        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and o.create_order>0 order by dd.id desc
    </select>