blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
廖井涛
2024-09-25 b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 
 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml


@@ -10,6 +10,7 @@


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


        <result column="create_time" property="createTime"/>


        <result column="layout_status" property="layoutStatus"/>


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


        <!--接收其他外键实体类数据-->


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


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


@@ -64,8 +65,9 @@


        a.founder,


        c.processing_note,


        b.customer_name,


        if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status


        from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time from flow_card


        if(a.layout_status=0,'不可排版',if(a.layout_status=1,'可排版','已排版')) as layout_status,


        a.merge


        from (select id,order_id,process_id,order_number, quantity,founder,layout_status,create_time,merge from flow_card


        group by process_Id,order_number) as a left join sd.`order` as b on a.order_Id=b.order_id


        left join sd.order_detail as c on a.order_Id=c.order_id and a.order_Number=c.order_number


        where a.create_time between #{selectTime1} and #{selectTime2}


@@ -93,6 +95,9 @@


        </if>


        <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and  flowCard.layoutStatus == '已排版'">


            and a.layout_status regexp 2


        </if>


        <if test="flowCard.merge != null">


            and a.merge regexp #{flowCard.merge}


        </if>


        <if test="flowCard.order.customerName != null and flowCard.order.customerName!= ''">


            and b.customer_name regexp #{flowCard.order.customerName}


@@ -134,6 +139,9 @@


        </if>


        <if test="flowCard.layoutStatus != null and flowCard.layoutStatus != '' and  flowCard.layoutStatus == '已排版'">


            and a.layout_status regexp 2


        </if>


        <if test="flowCard.merge != null">


            and a.merge regexp #{flowCard.merge}


        </if>




        ORDER BY a.id desc


@@ -246,10 +254,10 @@


               ROUND(od.quantity-IFNULL(sum(fc.quantity)/count(fc.technology_number),0))           as baiscQuantity,


               od.compute_gross_area as 'computeGrossArea',


               p.total_thickness     AS 'totalThickness',


               p.thickness,


               ifnull(p.thickness,'') as thickness,


               od.weight,


               od.remarks,


               od.bend_radius,


               ifnull(od.bend_radius,'') as bend_radius,


               ods.S01,


               ods.S02,


               ods.S03,


@@ -463,7 +471,7 @@


        where create_time between #{selectTime1} and #{selectTime2}


          and position(#{orderId} in order_id)


          and position(#{project} in project)


          and processing_card = 2


          and processing_card >0


        order by create_time desc


    </select>




@@ -788,6 +796,38 @@


        group by od.order_number, od.width, od.height


    </select>




    <select id="getPrintLabelDetail">


        select o.order_id,


               o.project,


               o.customer_id,


               ogd.child_width                as width,


               ogd.child_height               as height,


               fc.quantity,


               od.order_number                as orderNumber,


               fc.technology_number           as technologyNumber,


               ogd.glass_child,


               ogd.process,


               c.customer_abbreviation        as customer_name,


               ifnull(od.processing_note, '') as processing_note,


               bgt.type_name,


               od.other_columns,


               od.building_number,


               od.bend_radius


        from sd.order as o


                 left join sd.order_detail as od on o.order_id = od.order_id


                 left join sd.order_glass_detail as ogd


                           on ogd.order_id = od.order_id and ogd.order_number = od.order_number


                 left join pp.flow_card as fc on o.order_id = fc.order_id and


                                                 od.order_number = fc.order_number and


                                                 fc.technology_number = ogd.technology_number


                 left join sd.product pt on pt.id = od.product_id


                 left join sd.customer c on c.id = o.customer_id


                 left join sd.basic_glass_type bgt on bgt.type_id = pt.type_id


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


        group by od.order_number, od.width, od.height


    </select>




    <select id="printFlowCardDetailsMp">


        SELECT fc.process_id,


               fc.order_number,


@@ -800,7 +840,8 @@


               ifnull(fcs.sort, '')                                                 as sort,


               ogd.glass_child,


               #{process}                                                           as process,


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber


               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber,


               od.bend_radius


        FROM flow_card AS fc


                 LEFT JOIN sd.order_glass_detail AS ogd ON fc.order_id = ogd.order_id


            AND fc.order_number = ogd.order_number


@@ -1233,7 +1274,12 @@


               round(ogd.child_width)                                         as width,


               round(ogd.child_height)                                        as height,


               pd.separation,


               fc.technology_number


               fc.technology_number,


               pl.patch_type,


               pl.patch_reason,


               pl.patch_processes,


               pl.responsible_team,


               pl.responsible_personnel


        from flow_card as fc


                 left join sd.order_glass_detail as ogd


                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and


@@ -1247,7 +1293,8 @@


          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


        and pl.patch_reason = #{patchReason}


        group by fc.process_id, fc.order_number, fc.technology_number,pl.id


        order by IF(sort != NULL and sort != '', sort, fc.order_number)


    </select>




@@ -1301,7 +1348,8 @@


        where fc.process_id = #{processId}


          and fc.order_number = #{orderNumber}


          and fc.technology_number = #{technologyNumber}


          and rw.reporting_work_id = #{reportingWorkId}


          and pl.reporting_work_id = #{reportingWorkId}


          and dd.breakage_reason = #{patchReason}


        group by fc.process_id, fc.technology_number


    </select>




@@ -1354,7 +1402,8 @@


               dd.responsible_process,


               dd.responsible_team,


               concat('对应我司单号', o.batch)                 AS otherRemarks,


               dd.responsible_personnel


               dd.responsible_personnel,


               pl.rework_id as  patch_id


        from flow_card as fc


                 left join sd.order_glass_detail as ogd


                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and


@@ -1399,7 +1448,13 @@


               round(ogd.child_width)                                       as width,


               round(ogd.child_height)                                      as height,


               pd.separation,


               fc.technology_number


               fc.technology_number,


               pl.rework_type as patch_type,


               pl.rework_reason as patch_reason,


               pl.rework_processes as patch_processes,


               pl.responsible_team,


               pl.rework_team,


               pl.responsible_personnel


        from flow_card as fc


                 left join sd.order_glass_detail as ogd


                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and