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

廖井涛

2024-07-16 9d8f1ecf0dcdf7de5fe9db39a125540640d83a25

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

@@ -125,12 +125,13 @@
            fc.quantity AS quantity_card,
            ogd.child_width,
            ogd.child_height,
            od.shape,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num  as quantity,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num  as completedQuantity,
            odpd.reporting_work_num as completed,
            odpd.broken_num as onceBroken,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns
        FROM
            sd.order_detail AS od
        LEFT JOIN sd.order_glass_detail AS ogd
@@ -163,7 +164,7 @@
            fc.quantity AS quantity_card,
            ogd.child_width,
            ogd.child_height,
            od.shape,
        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            if((odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num ) < 0,
                0,
        odpds.reporting_work_num_count + ifnull(c.patchNumSum,0) -odpd.reporting_work_num_count -odpd.broken_num) as quantity,
@@ -173,8 +174,8 @@
            odpd.reporting_work_num as completed,
            odpd.broken_num as onceBroken,
            ogd.`group`,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交

            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
            od.other_columns

        FROM
            sd.order_detail AS od
@@ -382,7 +383,7 @@
            c.quantity as quantity_card,
            d.child_width,
            d.child_height,
            e.shape,
            if(e.shape=1,'普形',if(e.shape=2,'异形','')) as shape,
            if(ifnull(a.completed_quantity+a.breakage_quantity,0)=0,
                c.quantity-ifnull(a.completed_quantity+a.breakage_quantity,0),
                ifnull(a.completed_quantity+a.breakage_quantity,0)) as 'quantity', -- 可报工数
@@ -390,6 +391,7 @@
            ifnull(a.breakage_quantity,0) as 'breakageQuantity', -- 破损数
            ifnull(f.completed_quantity,0) as thisQuantitySum ,-- 本工序完工和
            if(c.quantity-f.completed_quantity = 0 ,true,false) as saveFlag,
            e.other_columns,
            <if test="nextProcess != null and nextProcess != ''">  -- 非最后一道工序
                ifnull(g.completed_quantity,0) as nextQuantitySum,  -- 后工序已完成
                if((f.completed_quantity
@@ -418,7 +420,7 @@
        right join  flow_card as c
        on c.process_id = b.process_id

        left join reporting_work_detail as a
        right join reporting_work_detail as a
        on  a.reporting_work_id = b.reporting_work_id
        and c.order_number=a.order_number
        and c.technology_number = a.technology_number
@@ -702,7 +704,7 @@
        update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
        set dd.quality_ins_status = 2,
            rw.quality_inspector=#{username},
            rw.examine_time=NOW()
            rw.quality_ins_time=NOW()
        where rw.reporting_work_id = #{reportingWorkId}
    </update>

@@ -741,4 +743,9 @@
        GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
        ORDER BY rwd.order_number
    </select>

    <select id="selectLayerByReportingWorkId">
        select  REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
        where rwd.reporting_work_id=#{reportingWorkId}
    </select>
</mapper>