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

guoyuji

2024-07-23 2d08dd898a276296cb5a41890faa79a8cac34be4

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

@@ -195,7 +195,7 @@
            ogd.`group`,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns,
            ogd.id
            ogd.id as 'glassId'

        FROM
            sd.order_detail AS od