guoyujie
2025-10-23 cc8efc81d2d35bed40e47d0a5b0920a4b6f8095f
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -26,6 +26,7 @@
            <result column="processing_note" property="processingNote"/>
            <result column="delivery_address" property="deliveryAddress"/>
            <result column="create_time" property="createTime"/>
            <result column="update_time" property="updateTime"/>
        </association>
        <association property="orderDetail" javaType="com.example.erp.entity.sd.OrderDetail">
            <result column="product_id" property="productId"/>
@@ -71,7 +72,8 @@
        a.merge,
        a.rack,
        b.batch,
        b.create_time
        b.create_time,
        b.update_time
        from (select id,order_id,process_id,order_number, quantity,founder,max(layout_status) as layout_status,create_time,max(merge) as merge,rack from flow_card
        group by process_Id,order_number) as a
        left join sd.`order` as b on a.order_Id=b.order_id
@@ -325,7 +327,7 @@
               ods.S03,
               ods.S04,
               ods.S05,
               od.building_number
               od.building_number as 'buildingNumber'
        from sd.order_detail as od
                 left join sd.order_glass_detail as ogd
                           on od.order_id = ogd.order_id and od.order_number = ogd.order_number
@@ -2820,6 +2822,7 @@
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
                              ogd.technology_number = fc.technology_number
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
        group by fc.process_id,od.order_number, width, height
@@ -3054,7 +3057,8 @@
            '文本' as custom3,
            '文本' as custom4,
            '文本' as custom5,
            od.quantity
            od.quantity,
         CONCAT(opt.stock_id,"/",opt.polys_id) as stockPolysId
        from optimize_detail as opt
            left join optimize_layout as opl on opl.project_no=opt.project_no and opl.stock_id=opt.stock_id
                 left join flow_card as fc on opt.project_no=fc.project_no and opt.process_id=fc.process_id and opt.layer=fc.technology_number and opt.order_sort=fc.order_number