diff --git a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java index 1679feb8..41556ed9 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/oracle/TabOrderMonitorService.java @@ -1232,14 +1232,10 @@ public class TabOrderMonitorService query.setOrderStatuses(cleaned.isEmpty() ? new ArrayList(DEFAULT_ORDER_STATUSES) : cleaned); } - /** Empty or anything other than 0/1 falls back to 1(已收货). */ + /** Always force BL_PICKUP=1; UI no longer exposes this filter. */ private static void normalizeBlPickup(TabOrderMonitorQuery query) { - Integer blPickup = query.getBlPickup(); - if (blPickup == null || (blPickup.intValue() != 0 && blPickup.intValue() != 1)) - { - query.setBlPickup(Integer.valueOf(1)); - } + query.setBlPickup(Integer.valueOf(1)); } /** diff --git a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml index 9f8e7b6c..33d3e605 100644 --- a/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/price/OracleUpstreamOrderMapper.xml @@ -66,14 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND o.PICKUP_DATE <= TO_DATE(#{query.endTime}, 'YYYY-MM-DD HH24:MI:SS') - - - AND o.BL_PICKUP = #{query.blPickup} - - - - - + AND o.BL_PICKUP = 1 AND o.ORDER_STATUS IN @@ -281,14 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{bid} - - - AND o.BL_PICKUP = #{blPickup} - - - - - + AND o.BL_PICKUP = 1 AND o.ORDER_STATUS IN (3, 4, 5, 6, 7, 8, 11) AND o.CUSTOMER_CODE IN diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue index 74a44595..7020a2ae 100644 --- a/bms-front/src/views/monitor/orderSource/index.vue +++ b/bms-front/src/views/monitor/orderSource/index.vue @@ -191,14 +191,8 @@ 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], - blPickup: 1 + orderStatuses: [3, 4, 5, 6, 7, 8, 11] } const searchColumns = [ @@ -248,14 +242,7 @@ const searchColumns = [ collapseTags: true, collapseTagsTooltip: true } - }, - { - label: '收货状态', - prop: 'blPickup', - component: 'select', - options: blPickupOptions, - placeholder: '请选择' - }, + } ] const columns = [ @@ -402,7 +389,6 @@ 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) @@ -435,7 +421,7 @@ function openOrderCompare() { return } proxy.$modal.confirm( - '将按当前客户、提货时间、订单状态和收货状态筛选,异步分页比对上游转单号是否已落库,确认继续?', + '将按当前客户、提货时间和订单状态筛选,异步分页比对上游转单号是否已落库,确认继续?', '二次确认' ).then(() => { // 比对只按客户+时间;不带单号框内容(回填后可能有数千转单号,带上会把比对拖死)