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

廖井涛

2024-06-14 fb8ec3f6a555f8ca1d02b305b08088d07dd5e709

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

@@ -225,7 +225,7 @@
               o.project,
               o.order_id,
               o.batch,
               od.shape,
               if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
               ogd.order_number,
               ogd.technology_number,
               ogd.process,
@@ -526,7 +526,7 @@
            ogd.child_height as childHeight,
            fc.quantity,
            round( ogd.child_width * ogd.child_height * fc.quantity / 1000000, 2 ) as area,
            od.shape,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            od.remarks
        FROM
            sd.ORDER AS o
@@ -614,7 +614,7 @@
    <select id="productionScheduleMp">
        select
            a.order_number,
            a.shape,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            a.product_name,
            b.child_width,
            b.child_height,
@@ -967,7 +967,7 @@
               o.project,
               o.order_id,
               o.batch,
               od.shape,
               if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
               ogd.order_number,
               ogd.technology_number,
               ogd.process,
@@ -1180,7 +1180,7 @@
            rwd.order_number,
            MAX( ogd.child_width ) as width,
            MAX( ogd.child_height ) as height,
            od.shape,
        if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            sum( pd.thickness ) as thickness,
            od.edging_type,
            rwd.completed_quantity,