|
|
@@ -152,7 +152,7 @@ public class ExportOrderController extends BladeController {
|
|
|
if ("1".equals(order.getTabType())) {
|
|
|
lambdaQueryWrapper.eq(Order::getDocumentaryStatus, "寄单");
|
|
|
} else if ("2".equals(order.getTabType())) {
|
|
|
- lambdaQueryWrapper.apply("(documentary_status is null or documentary_status != '寄单' ) and order_status != '已取消'");
|
|
|
+ lambdaQueryWrapper.apply("(documentary_status is null or documentary_status != '寄单' ) and order_status != '已取消' and order_status != '录入'");
|
|
|
} else if ("3".equals(order.getTabType())) {
|
|
|
lambdaQueryWrapper.eq(Order::getOrderStatus, "已取消");
|
|
|
}else if ("4".equals(order.getTabType())) {
|