From c73effc2f7cd4a99f6d10470d3cfc7557a126b53 Mon Sep 17 00:00:00 2001 From: wuweihua <88888888> Date: Mon, 21 Sep 2026 16:08:53 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=90=E5=8D=95?= =?UTF-8?q?=E5=92=8C=E8=BD=AC=E8=BF=90=E5=8D=95=E6=89=B9=E9=87=8F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/price/BillingController.java | 14 +++++++ .../com/ruoyi/price/domain/PrcOrderBill.java | 4 ++ .../price/mapper/PrcOrderBillMapper.java | 6 +++ .../price/service/IPrcOrderBillService.java | 6 +++ .../service/impl/PrcOrderBillServiceImpl.java | 22 +++++++++++ .../mapper/price/PrcOrderBillMapper.xml | 38 +++++++++++++++++++ bms-back/sql/price/prc_income_bill.sql | 36 ++++++++++++++++++ bms-front/src/api/price/billing.js | 18 +++++++++ bms-front/src/views/price/billing/bill.vue | 22 +++++++++-- 9 files changed, 163 insertions(+), 3 deletions(-) create mode 100644 bms-back/sql/price/prc_income_bill.sql diff --git a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java index 6940a388..89922c24 100644 --- a/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java +++ b/bms-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/price/BillingController.java @@ -89,6 +89,20 @@ public class BillingController extends BaseController return success(prcOrderBillService.listOrderNoOptions(keyword)); } + @PreAuthorize("@ss.hasPermi('price:billing:bill')") + @GetMapping("/bill/trackingNos") + public AjaxResult trackingNoOptions(@RequestParam(value = "keyword", required = false) String keyword) + { + return success(prcOrderBillService.listTrackingNoOptions(keyword)); + } + + @PreAuthorize("@ss.hasPermi('price:billing:bill')") + @GetMapping("/bill/transferNos") + public AjaxResult transferNoOptions(@RequestParam(value = "keyword", required = false) String keyword) + { + return success(prcOrderBillService.listTransferNoOptions(keyword)); + } + @PreAuthorize("@ss.hasPermi('price:billing:bill')") @GetMapping("/bill/{billId}") public AjaxResult getBill(@PathVariable String billId) diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java index 3035f84d..5dc55987 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/domain/PrcOrderBill.java @@ -21,8 +21,12 @@ public class PrcOrderBill extends BaseEntity /** 批量查询：多个订单号精确匹配（仅查询用，非表字段） */ private List orderNos; private String trackingNo; + /** 批量查询：多个运单号精确匹配（仅查询用，非表字段） */ + private List trackingNos; /** transfer order no */ private String transferNo; + /** 批量查询：多个转单号精确匹配（仅查询用，非表字段） */ + private List transferNos; /** 所属销售员 */ private String belongSaler; /** 结算员 */ diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java index 6175630f..2d22ea67 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/mapper/PrcOrderBillMapper.java @@ -20,6 +20,12 @@ public interface PrcOrderBillMapper /** 订单号下拉搜索：按关键词模糊匹配，返回去重后的订单号（按最近创建排序，限量返回） */ public List selectOrderNoOptions(@Param("keyword") String keyword, @Param("limit") int limit); + /** 运单号下拉搜索：按关键词模糊匹配，返回去重后的运单号（按最近创建排序，限量返回） */ + public List selectTrackingNoOptions(@Param("keyword") String keyword, @Param("limit") int limit); + + /** 转单号下拉搜索：按关键词模糊匹配，返回去重后的转单号（按最近创建排序，限量返回） */ + public List selectTransferNoOptions(@Param("keyword") String keyword, @Param("limit") int limit); + /** 应收账单生成读取指定客户截止日期前的未出账订单计费快照。 */ public List selectPrcOrderBillByCustomerPeriod(@Param("customerId") Long customerId, @Param("customerCode") String customerCode, @Param("orderOrTrackingNo") String orderOrTrackingNo, diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java index 951c0cdf..446f00f3 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/IPrcOrderBillService.java @@ -15,6 +15,12 @@ public interface IPrcOrderBillService /** 订单号下拉搜索选项（模糊匹配，去重限量） */ List listOrderNoOptions(String keyword); + /** 运单号下拉搜索选项（模糊匹配，去重限量） */ + List listTrackingNoOptions(String keyword); + + /** 转单号下拉搜索选项（模糊匹配，去重限量） */ + List listTransferNoOptions(String keyword); + TmsPriceQuoteResult getBill(String billId); TmsPriceQuoteResult getBillByOrderNo(String orderNo); diff --git a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java index 5593d878..84780a27 100644 --- a/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java +++ b/bms-back/ruoyi-system/src/main/java/com/ruoyi/price/service/impl/PrcOrderBillServiceImpl.java @@ -103,6 +103,8 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService query.setOrderNos(normalizeCodeList(query.getOrderNos())); query.setCustomerCodes(normalizeCodeList(query.getCustomerCodes())); query.setProductCodes(normalizeCodeList(query.getProductCodes())); + query.setTrackingNos(normalizeCodeList(query.getTrackingNos())); + query.setTransferNos(normalizeCodeList(query.getTransferNos())); return orderBillMapper.selectPrcOrderBillList(query); } @@ -116,6 +118,26 @@ public class PrcOrderBillServiceImpl implements IPrcOrderBillService return orderBillMapper.selectOrderNoOptions(keyword.trim(), 20); } + @Override + public List listTrackingNoOptions(String keyword) + { + if (StringUtils.isBlank(keyword)) + { + return new ArrayList<>(); + } + return orderBillMapper.selectTrackingNoOptions(keyword.trim(), 20); + } + + @Override + public List listTransferNoOptions(String keyword) + { + if (StringUtils.isBlank(keyword)) + { + return new ArrayList<>(); + } + return orderBillMapper.selectTransferNoOptions(keyword.trim(), 20); + } + /** * 批量编码归一化：逐个 trim、拆开误传的逗号/分号/空白分隔串、去空去重 */ diff --git a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml index 7db925c0..5333b9e3 100644 --- a/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml +++ b/bms-back/ruoyi-system/src/main/resources/mapper/price/PrcOrderBillMapper.xml @@ -117,6 +117,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" limit #{limit} + + + +