修改order列表

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -176,6 +176,7 @@ public class SalesOrder implements Serializable {
     private Integer salesReturnGoods;//该字段控制订单项是否有退货的产品   1：没有  2：有
 
     private Date orderCaseDate;//揽件时间
+    private Integer orderHasCaseDate;//是否已经有揽件时间  1：有  2：没有
 
     public Integer getSalesOldOrderStatus() {
         return salesOldOrderStatus;
@@ -1039,4 +1040,12 @@ public class SalesOrder implements Serializable {
     public void setOrderCaseDate(Date orderCaseDate) {
         this.orderCaseDate = orderCaseDate;
     }
+
+    public Integer getOrderHasCaseDate() {
+        return orderHasCaseDate;
+    }
+
+    public void setOrderHasCaseDate(Integer orderHasCaseDate) {
+        this.orderHasCaseDate = orderHasCaseDate;
+    }
 }

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

@@ -40,7 +40,7 @@
         sales_address_name,sales_amount,sales_pay_money,sales_pay_type,sales_wait_money,sales_last_money,sales_shipping_fee,sales_pay_time,
         sales_create_time,sales_admin_remark,sales_user_remark,sales_pay_number,sales_store_id,sales_company_id,sales_type,sales_deal_code,sales_order_status,
         sales_status,sales_shipping_status,sales_pay_status,sales_process_status,sales_is_send,sales_is_locked,sales_is_separate,sales_is_download,sales_main_order_id,
-        sales_batch_id,sales_add_type,sales_admin_id,sales_deliver,sales_address_postcode
+        sales_batch_id,sales_add_type,sales_admin_id,sales_deliver,sales_address_postcode,order_case_date
   </sql>
 
   <!-- 根据id查询订单信息 -->
@@ -173,6 +173,12 @@
                 <if test="procTypeId != null  and procTypeId !=''">
                     AND pt.proc_type_id = #{procTypeId}
                 </if>
+                <if test="orderHasCaseDate != null  and orderHasCaseDate == 1">
+                    AND order_case_date is not null
+                </if>
+                <if test="orderHasCaseDate != null  and orderHasCaseDate == 2">
+                    AND order_case_date is null
+                </if>
             </where>
             GROUP BY
             soi.sales_id
@@ -491,6 +497,12 @@
             <if test="procTypeId != null  and procTypeId !=''">
                 AND pt.proc_type_id = #{procTypeId}
             </if>
+            <if test="orderHasCaseDate != null  and orderHasCaseDate == 1">
+                AND order_case_date is not null
+            </if>
+            <if test="orderHasCaseDate != null  and orderHasCaseDate == 2">
+                AND order_case_date is null
+            </if>
         </where>
     </select>