blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-04-16 6d6e2c77e34e7dbae4fba340c423eaafc2b9c231 
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml


@@ -22,6 +22,7 @@


        <result property="completedArea" column="completedArea"/>


        <result property="wornArea" column="wornArea"/>


        <result property="qualityInspector" column="quality_inspector"/>


        <result property="qualityInsTime" column="quality_ins_time"/>




        <association property="order" javaType="com.example.erp.entity.sd.Order">


            <result property="customerId" column="customer_id"/>


@@ -63,6 +64,7 @@




    </resultMap>




<!--    查询当前工序的表头数据-->


    <select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">


        select o.order_id,


               fc.production_id,


@@ -147,7 +149,7 @@


        left join


                (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id


                   from patch_log


                   group by reporting_work_id,order_sort,technology_number) as c


                   group by process_id,order_sort,technology_number) as c


            on c.process_id = fc.process_id


            and c.order_sort = fc.order_number


            and c.technology_number = fc.technology_number


@@ -206,7 +208,7 @@


        left join


            (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id


             from patch_log


             group by reporting_work_id,order_sort,technology_number) as c


             group by process_id,order_sort,technology_number) as c


            on c.process_id = fc.process_id


            and c.order_sort = fc.order_number


            and c.technology_number = fc.technology_number


@@ -320,7 +322,7 @@


            and c.technology_number = a.technology_number




        where


            a.process_id=SUBSTR(#{processId} from 1 for 13)


            a.process_id=SUBSTR(#{processId} from 1 for 14)


            and a.order_number = #{orderNumber}


            and a.technology_number = #{technologyNumber}


    </select>


@@ -344,7 +346,7 @@


                                   and c.technology_number = a.technology_number




        where


            a.process_id=SUBSTR(#{processId} from 1 for 13)


            a.process_id=SUBSTR(#{processId} from 1 for 14)


          and a.order_number = #{orderNumber}


          and a.technology_number = #{technologyNumber}


    </select>


@@ -450,9 +452,9 @@


               o.batch,


               rw.this_process,


               rw.this_completed_quantity,


               (ogd.area * rw.this_completed_quantity) as completedArea,


               round(ogd.area * rw.this_completed_quantity,2) as completedArea,


               rw.this_worn_quantity,


               (ogd.area * rw.this_worn_quantity)      as wornArea,


               round(ogd.area * rw.this_worn_quantity,2)      as wornArea,


               rw.device_name,


               rw.teams_groups_name,


               rw.reviewed_state


@@ -594,6 +596,7 @@


               rw.previous_process,


               rw.next_process,


               rw.quality_inspector,


               rw.quality_ins_time,


               dd.quality_ins_status


        from sd.order as o


                 left join sd.order_glass_detail as ogd on ogd.order_id = o.order_id