下载客诉时，增加产品类型。

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/SalesOrderService.java

@@ -626,4 +626,7 @@ public interface SalesOrderService {
 
   int printOrder(List<SalesOrder> list, Integer currAdmin);
 
+  List<SalesOrder> testListSalesOrder ();
+
+  List<SalesOrder> testListOther (SalesOrder data);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -2191,6 +2191,28 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         return list.size();
     }
 
+    @Override
+    public List<SalesOrder> testListSalesOrder() {
+        List<SalesOrder> orders = salesOrderMapper.testListSalesOrder();
+        /*for (SalesOrder order : orders) {
+            SalesOrderItem item = new SalesOrderItem();
+            item.setItemOrderId(order.getSalesId());
+            order.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(item));
+        }*/
+        return orders;
+    }
+
+    @Override
+    public List<SalesOrder> testListOther(SalesOrder data) {
+        List<SalesOrder> orders = salesOrderMapper.testListOther(data);
+        for (SalesOrder order : orders) {
+            SalesOrderItem item = new SalesOrderItem();
+            item.setItemOrderId(order.getSalesId());
+            order.setSalesOrderItemList(salesOrderMapper.listSalesOrderItem(item));
+        }
+        return orders;
+    }
+
     /***
      * 计算金额
      * @param salesOrder

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

@@ -568,4 +568,8 @@ public interface SalesOrderMapper {
      *根据第三方平台订单号（京东订单号，天猫/淘宝订单号），更新备注
      */
     Integer updateOrderByExOrder(SalesOrder salesOrder);
+
+    List<SalesOrder> testListSalesOrder();
+
+    List<SalesOrder> testListOther(SalesOrder data);
 }

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

@@ -2800,4 +2800,70 @@
         </set>
         where sales_ex_orderId = #{salesExOrderId}
     </update>
+
+    <select id="testListSalesOrder" resultType="SalesOrder">
+        <![CDATA[
+        SELECT
+        o.sales_id,
+        o.sales_orderId,
+        o.sales_address_name,
+        o.sales_address_tel,
+        o.sales_postage_cost,
+        i.item_product_name,
+        i.item_product_color,
+        i.item_cost_total,
+        i.item_cost,
+        i.item_num,
+        i.item_product_price,
+        i.item_product_discount,
+        i.item_create_time,
+        o.sales_create_time
+        FROM
+        tb_rst_sales_order_info o
+        LEFT JOIN tb_rst_sales_order_item i ON o.sales_id = i.item_order_id
+        WHERE
+        o.sales_order_status = 1
+        AND o.sales_customer_id is NULL
+        AND o.sales_status = 1
+        AND o.sales_shipping_status = 1
+        AND o.sales_warranty_status = 0
+        AND	o.sales_create_time >= '2021-01-01 00:00:00'
+        AND o.sales_create_time <= '2021-07-01 00:00:00'
+        AND i.item_color_id IN (212, 213, 368)
+        ]]>
+    </select>
+
+    <select id="testListOther" parameterType="SalesOrder" resultType="SalesOrder">
+        <![CDATA[
+        SELECT
+               o.sales_id,
+               o.sales_orderId,
+               o.sales_address_name,
+               o.sales_address_tel,
+               o.sales_postage_cost,
+               i.item_product_name,
+               i.item_product_color,
+               i.item_cost_total,
+               i.item_cost,
+               i.item_num,
+               i.item_product_price,
+               i.item_product_discount,
+               i.item_create_time
+        FROM
+             tb_rst_sales_order_info o
+        LEFT JOIN
+             tb_rst_sales_order_item i ON o.sales_id = i.item_order_id
+        WHERE
+          o.sales_order_status = 1
+          and o.sales_address_tel = #{salesAddressTel}
+          AND o.sales_customer_id is NULL
+          AND o.sales_status = 1
+          AND o.sales_shipping_status = 1
+          AND o.sales_warranty_status = 0
+          AND o.sales_create_time >= #{salesCreateTime}
+          AND o.sales_create_time <= #{startDate}
+          AND i.item_color_id IN (212, 213, 368)
+        ]]>
+    </select>
+
 </mapper>

watero-rst-web/src/main/webapp/WEB-INF/views/pts/machine/machine_print_List.ftl

@@ -282,7 +282,7 @@
                         }
                     }else{
                         if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                            if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
+                            if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机" || produceName === "GW-8诺米克OEM净水机"){
                                 $("#printlist").append('<div style="width: 242px;height: 125px;position: relative;">' +
                                         '<span style="position: absolute;left: 10px;font-size: 14px;">即热台式净水器</span>' +
                                         '<span style="position: absolute;left: 162px;font-size: 9px;"><b>&nbsp;&nbsp;&nbsp;扫码购买滤芯</b></span>' +
@@ -531,7 +531,7 @@
                 }
             }else{
                 if(isGeneralQrcode == 1 || berGenerateRules == 2){
-                    if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机"){
+                    if(produceName === "WA-2诺米克OEM净水机" || produceName === "WB-1诺米克OEM净水机" || produceName === "GW-8诺米克OEM净水机"){
                         $("#printlist").append('<div style="width: 242px;height: 126px;position: relative;">' +
                                 '<span style="position: absolute;left: 10px;font-size: 14px;">即热台式净水器</span>' +
                                 '<span style="position: absolute;left: 162px;font-size: 9px;"><b>&nbsp;&nbsp;&nbsp;扫码购买滤芯</b></span>' +