rst修改

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -137,6 +137,9 @@
                 <if test="itemProductName !=null and itemProductName !=''">
                     AND (oi.item_product_color like CONCAT('%',#{itemProductName},'%') OR oi.item_product_name LIKE CONCAT('%',#{itemProductName},'%'))
                 </if>
+                <if test="colorId !=null and colorId !=''">
+                    AND oi.item_color_id = #{colorId}
+                </if>
                 <if test="salesIds != null and salesIds != ''">
                     AND sales_id IN
                     <foreach collection="salesIds" item="node" index="index" separator="," open="(" close=")">
@@ -221,6 +224,9 @@
       <if test="itemProductName !=null and itemProductName !=''">
           AND oi.item_product_color like CONCAT('%',#{itemProductName},'%')
       </if>
+      <if test="colorId !=null and colorId !=''">
+            AND oi.item_color_id = #{colorId}
+      </if>
       <if test="startDate != null and startDate != ''">
         AND sales_create_time <![CDATA[>=]]> #{startDate}
       </if>
@@ -1277,9 +1283,12 @@
         LEFT JOIN tb_rst_sales_order_item oi ON t.sales_id = oi.item_order_id
         <where>
             t.sales_batch_id != 'KS00000000000001'
-            <if test="salesShippingStatus !=null">
+            <if test="salesShippingStatus !=null and salesShippingStatus !='' and salesShippingStatus != 12">
                 AND t.sales_shipping_status =  #{salesShippingStatus}
             </if>
+            <if test="salesShippingStatus !=null and salesShippingStatus !='' and salesShippingStatus == 12">
+                AND t.sales_shipping_status > 0
+            </if>
             <if test="salesDeliver !=null">
                 AND t.sales_deliver = #{salesDeliver}
             </if>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -558,6 +558,7 @@ public class AwaitSendController {
             //今日
             allSalesOrder.setStartDate(calendarStart.getTime());
             allSalesOrder.setEndDate(calendarEnd.getTime());
+            allSalesOrder.setSalesShippingStatus(12);//不查询未发货未确认订单
 
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());
@@ -571,6 +572,7 @@ public class AwaitSendController {
 
             allSalesOrder.setStartDate(calendarStart.getTime());
             allSalesOrder.setEndDate(calendarEnd.getTime());
+            allSalesOrder.setSalesShippingStatus(12);//不查询未发货未确认订单
 
             waitSalesOrder.setStartDate(calendarStart.getTime());
             waitSalesOrder.setEndDate(calendarEnd.getTime());