报表：订单明细新增筛选条件；订单明细分类：区分为三类：有价订单明细、库存订单明细、未锁规格订单明细 1、有价订单明细：经销、外贸库存合同统计无需生产订货单，经…

…销、外贸未锁规合同无需生产和需要生产订货单都统计、经销、外贸、加工标准合同需要生产订货单2、库存订单明细：经销、外贸库存合同需要生产订货单3、未锁规格订单明细：经销、外贸未锁规合同-无需生产订货单
 只统计已审核通过的订单数据

@@ -61,6 +61,9 @@ public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("导出类型")
     @ApiModelProperty("导出类型")
     private String exportType;
     private String exportType;
 
 
+    @ApiModelProperty("订单分类：有价订单明细、库存订单明细、未锁规格订单明细")
+    private String orderCategory;
+
     /**
     /**
      * 排序
      * 排序
      */
      */

@@ -301,6 +301,29 @@
                 )
                 )
                 )
                 )
             </if>
             </if>
+            <if test="vo.orderCategory != null and vo.orderCategory != ''">
+                AND poi.examine_status = 'PASS'
+                <choose>
+                    <when test="vo.orderCategory == 'PRICED'">
+                        AND (
+                            (c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT') AND poi.type = 'NO_PRODUCTION')
+                            OR (c.type IN ('DRAFT_DIST_AGMT', 'INTL_OPEN_SPEC_AGMT') AND poi.type IN ('PRODUCTION', 'NO_PRODUCTION'))
+                            OR (c.type IN ('DISTRIB_STD', 'INTL_STD_CONTRACT', 'PROCESS_STD_AGMT') AND poi.type = 'PRODUCTION')
+                        )
+                    </when>
+                    <when test="vo.orderCategory == 'INVENTORY'">
+                        AND c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
+                        AND poi.type = 'PRODUCTION'
+                    </when>
+                    <when test="vo.orderCategory == 'OPEN_SPEC'">
+                        AND c.type IN ('DRAFT_DIST_AGMT', 'INTL_OPEN_SPEC_AGMT')
+                        AND poi.type = 'NO_PRODUCTION'
+                    </when>
+                    <otherwise>
+                        AND 1 = 0
+                    </otherwise>
+                </choose>
+            </if>
         </where>
         </where>
         ) t
         ) t
         ORDER BY
         ORDER BY