调整订单同步查询条件

bms-front/src/views/monitor/orderSource/components/OrderSourceSyncDialog.vue

@@ -240,6 +240,7 @@ function submit(skipConfirm) {
       orgOrderId: q.orgOrderId || undefined,
       transferOrderId: q.transferOrderId || undefined,
       orderStatuses: Array.isArray(q.orderStatuses) && q.orderStatuses.length ? q.orderStatuses : undefined,
+      blPickup: q.blPickup === 0 || q.blPickup === 1 ? q.blPickup : 1,
       batchSize: 100
     }).then(res => {
       const asyncTaskId = res.data?.asyncTaskId || res.data

bms-front/src/views/monitor/orderSource/index.vue

@@ -191,8 +191,14 @@ const orderStatusMap = {
 
 const orderStatusOptions = Object.keys(orderStatusMap).map(k => ({ label: orderStatusMap[k], value: Number(k) }))
 
+const blPickupOptions = [
+  { label: '已收货', value: 1 },
+  { label: '未收货', value: 0 }
+]
+
 const defaultParams = {
-  orderStatuses: [3, 4, 5, 6, 7, 8, 11]
+  orderStatuses: [3, 4, 5, 6, 7, 8, 11],
+  blPickup: 1
 }
 
 const searchColumns = [
@@ -243,6 +249,13 @@ const searchColumns = [
       collapseTagsTooltip: true
     }
   },
+  {
+    label: '收货状态',
+    prop: 'blPickup',
+    component: 'select',
+    options: blPickupOptions,
+    placeholder: '请选择'
+  },
 ]
 
 const columns = [
@@ -389,6 +402,7 @@ function queryList(params) {
     const customers = splitLines(src.customerKeywords)
     const fillQuery = { orderIdentifiers: identifiers }
     if (customers.length) fillQuery.customerKeywords = customers
+    fillQuery.blPickup = src.blPickup === 0 || src.blPickup === 1 ? src.blPickup : 1
     fillQuery.pageNum = params.pageNum
     fillQuery.pageSize = params.pageSize
     return listOrderSourceByTransferNos(fillQuery)
@@ -421,7 +435,7 @@ function openOrderCompare() {
     return
   }
   proxy.$modal.confirm(
-    '将按当前客户、提货时间与订单状态筛选，异步分页比对上游转单号是否已落库，确认继续？',
+    '将按当前客户、提货时间、订单状态和收货状态筛选，异步分页比对上游转单号是否已落库，确认继续？',
     '二次确认'
   ).then(() => {
     // 比对只按客户+时间；不带单号框内容（回填后可能有数千转单号，带上会把比对拖死）