Merge branch 'master' of http://bore.pub:10439/r/ERP_override

廖井涛

2024-07-23 761aa895b2955a13a8d3d56405336404bca18451

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

@@ -781,7 +781,8 @@
               pl.patch_processes,
               od.product_name,
               ogd.glass_child,
               fc.print_status
               fc.print_status,
               pl.reporting_work_id
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -914,7 +915,7 @@
    </select>

    <select id="selectorderOtherMoney">
        select * from sd.basic_other_money where (id=21 or id>31)
        select * from sd.basic_other_money where id between 21 and 35
    </select>

    <select id="selectReworkPrintMp">
@@ -935,7 +936,8 @@
               pl.rework_reason,
               pl.rework_processes,
               od.product_name,
               ogd.glass_child
               ogd.glass_child,
               pl.reporting_work_id
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -945,8 +947,8 @@
                 left join rework as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and
                                           pl.order_sort = fc.order_number and
                                           pl.technology_number = fc.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0
        GROUP BY fc.process_id, ogd.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2}
        GROUP BY fc.process_id, ogd.technology_number,pl.reporting_work_id
        order by pl.id desc,fc.process_id, ogd.technology_number
    </select>

@@ -1037,6 +1039,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
        and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1104,6 +1107,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1171,6 +1175,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1237,6 +1242,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>