销售订单 面辅料不分组

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -9,7 +9,7 @@
         FROM
             sy_order_data_item
         WHERE
-            sy_order_data_id = #{syOrderDataId}
+            sy_order_data_id = #{syOrderDataId} and inventory_ccode like '19%'
         GROUP BY
             pack_id,
             small_po,
@@ -20,6 +20,17 @@
             inventory_code,
             colour,
             coding_rules
+
+        union all
+
+        SELECT
+            sy_order_data_id,item_number,pre_delivery_date,pre_completion_date,pack_id,small_po,distribution_point,
+            inventory_code,inventory_name,specification_and_model,colour,coding_rules,guangpei_gate_width,box_number,
+            sum(quantity) as quantity,master_metering,unit_price_including_tax,sum(total_price_and_tax) as total_price_and_tax,tax_rate,remarks,bank_closed_by
+        FROM
+            sy_order_data_item
+        WHERE
+            sy_order_data_id = #{syOrderDataId}  and inventory_ccode not like '19%'
     </select>
 
     <select id="querySupplier" resultType="Map">