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

guoyuji

2024-12-26 a925836fa0ec4d3e5362a289995c5cb3a3942ed7

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

@@ -343,10 +343,10 @@
    </select>
    <select id="selectGlassProcessNum" resultType="java.lang.Integer">
        select
        if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
           0,
           (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
            )
            ),0)
        from flow_card as a
        left join sd.order_process_detail as b
        on