diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java index b4f08bc..13c3613 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/service/saleorder/SaleOrderServiceImpl.java @@ -257,7 +257,19 @@ public class SaleOrderServiceImpl implements SaleOrderService { saleOrderMapper.selectPageV2(page,pageReqVO); PageResult saleOrderDOPageResult = new PageResult<>(page.getRecords(), page.getTotal()); saleOrderDOPageResult.setOtherMap(MapUtil.of("querySumTotalQty",BigDecimal.ZERO)); - if(!StringUtils.isAllBlank(pageReqVO.getCustomerName(),pageReqVO.getBrandName(),pageReqVO.getMaterialName())){ + if( + StringUtils.isNotBlank(pageReqVO.getBillno()) + ||StringUtils.isNotBlank(pageReqVO.getBillStatus()) + ||StringUtils.isNotBlank(pageReqVO.getPhone()) + ||StringUtils.isNotBlank(pageReqVO.getRemarks()) + ||ObjectUtil.isNotEmpty(pageReqVO.getBizdate()) + ||ObjectUtil.isNotEmpty(pageReqVO.getPlansenddate()) + ||ObjectUtil.isNotEmpty(pageReqVO.getConfirmdate()) + ||StringUtils.isNotBlank(pageReqVO.getOrderStatus()) + ||StringUtils.isNotBlank(pageReqVO.getCustomerName()) + ||StringUtils.isNotBlank(pageReqVO.getBrandName()) + ||StringUtils.isNotBlank(pageReqVO.getMaterialName()) + ){ long sumTotalQty = saleOrderMapper.querySumTotalQty(pageReqVO); saleOrderDOPageResult.setOtherMap(MapUtil.of("querySumTotalQty",sumTotalQty)); } @@ -863,7 +875,7 @@ public class SaleOrderServiceImpl implements SaleOrderService { saleOrderMapper.insert(order); saleOrderEntryMapper.insertBatch(entryList); skuOrderSkuMapper.insertBatch(skuList); - + saleOrderMapper.updateSumQtyOrAmount(Collections.singletonList(order.getId())); updateCustomerInvoiceData(order); diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml index d3b0edf..3f098b5 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources/mapper/saleorder/SaleOrderMapper.xml @@ -93,15 +93,24 @@ diff --git a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue index 0aa31c0..9eb83c1 100644 --- a/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue +++ b/hangtag-ui/hangtag-ui-admin/src/views/oms/saleorder/index.vue @@ -35,10 +35,10 @@ class="!w-240px" /> - +
-

条件查询汇总订单数量:{{querySumTotalQty}}

+

查询条件汇总订单数量:{{querySumTotalQty}} PCS

@@ -432,6 +432,7 @@ const tabsData = ref([ const queryParams = reactive({ pageNo: 1, pageSize: 10, + isOpenQuery: 0, billno: undefined, customerId: undefined, customerName: undefined, @@ -476,9 +477,22 @@ const getList = async () => { const data = await SaleOrderApi.getSaleOrderPage(queryParams) list.value = data.list total.value = data.total - if((queryParams.customerName && queryParams.customerName.trim().length>0) || (queryParams.brandName && queryParams.brandName.trim().length>0) || (queryParams.materialName && queryParams.materialName.trim().length>0)){ + if( + (queryParams.billno && queryParams.billno.trim().length>0) + || (queryParams.customerName && queryParams.customerName.trim().length>0) + || (queryParams.brandName && queryParams.brandName.trim().length>0) + || (queryParams.materialName && queryParams.materialName.trim().length>0) + || (queryParams.phone && queryParams.phone.trim().length>0) + || (queryParams.remarks && queryParams.remarks.trim().length>0) + || (queryParams.bizdate && queryParams.bizdate.trim().length>0) + || (queryParams.confirmdate && queryParams.confirmdate.trim().length>0) + || (queryParams.plansenddate && queryParams.plansenddate.trim().length>0) + ){ querySumTotalQtyOpen.value = true querySumTotalQty.value = data.otherMap['querySumTotalQty'] + }else { + querySumTotalQtyOpen.value = false + querySumTotalQty.value = 0 } } finally { loading.value = false @@ -504,6 +518,7 @@ const getTabsCount = async () => { /** 搜索按钮操作 */ const handleQuery = () => { queryParams.pageNo = 1 + queryParams.isOpenQuery = 1 getList() }