From 24b0cd66c51cdb99daf5c8b65321eac6bf393597 Mon Sep 17 00:00:00 2001 From: XinanXf <959700191@qq.com> Date: Thu, 19 Jun 2025 10:33:14 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=80=A7=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sale/out/SaleOutSheetExportModel.java | 32 ++++--------------- .../sale/returned/SaleReturnExportModel.java | 21 ++---------- .../sc/vo/sale/out/QuerySaleOutSheetVo.java | 5 +++ .../vo/sale/returned/QuerySaleReturnVo.java | 5 +++ .../mappers/sale/SaleOutSheetMapper.xml | 7 ++++ .../mappers/sale/SaleReturnMapper.xml | 7 ++++ 6 files changed, 33 insertions(+), 44 deletions(-) diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java index ade9d2e..4eb001c 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/out/SaleOutSheetExportModel.java @@ -27,21 +27,9 @@ public class SaleOutSheetExportModel extends BaseBo implements Exc /** * 单号 */ - @ExcelProperty("业务单据号") + @ExcelProperty("单据号") private String code; - /** - * 仓库编号 - */ - @ExcelProperty("仓库编号") - private String scCode; - - /** - * 仓库名称 - */ - @ExcelProperty("仓库名称") - private String scName; - /** * 客户编号 */ @@ -54,18 +42,18 @@ public class SaleOutSheetExportModel extends BaseBo implements Exc @ExcelProperty("客户名称") private String customerName; - /** - * 销售员姓名 - */ - @ExcelProperty("销售员") - private String salerName; - /** * 单据总金额 */ @ExcelProperty("单据总金额") private BigDecimal totalAmount; + /** + * 销售员姓名 + */ + @ExcelProperty("销售员") + private String salerName; + /** * 商品数量 */ @@ -145,10 +133,6 @@ public class SaleOutSheetExportModel extends BaseBo implements Exc @Override protected void afterInit(SaleOutSheet dto) { - - StoreCenterService storeCenterService = ApplicationUtil.getBean(StoreCenterService.class); - StoreCenter sc = storeCenterService.findById(dto.getScId()); - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); Customer customer = customerService.findById(dto.getCustomerId()); @@ -163,8 +147,6 @@ public class SaleOutSheetExportModel extends BaseBo implements Exc } this.setCode(dto.getCode()); - this.setScCode(sc.getCode()); - this.setScName(sc.getName()); this.setCustomerCode(customer.getCode()); this.setCustomerName(customer.getName()); this.setSalerName(saler == null ? null : saler.getName()); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java index 438a2a7..8539003 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/excel/sale/returned/SaleReturnExportModel.java @@ -27,20 +27,9 @@ public class SaleReturnExportModel extends BaseBo implements ExcelMo /** * 单号 */ - @ExcelProperty("业务单据号") + @ExcelProperty("单据号") private String code; - /** - * 仓库编号 - */ - @ExcelProperty("仓库编号") - private String scCode; - - /** - * 仓库名称 - */ - @ExcelProperty("仓库名称") - private String scName; /** * 客户编号 @@ -94,7 +83,7 @@ public class SaleReturnExportModel extends BaseBo implements ExcelMo /** * 审核状态 */ - @ExcelProperty("审核状态") + @ExcelProperty("状态") private String status; /** @@ -145,10 +134,6 @@ public class SaleReturnExportModel extends BaseBo implements ExcelMo @Override protected void afterInit(SaleReturn dto) { - - StoreCenterService storeCenterService = ApplicationUtil.getBean(StoreCenterService.class); - StoreCenter sc = storeCenterService.findById(dto.getScId()); - CustomerService customerService = ApplicationUtil.getBean(CustomerService.class); Customer customer = customerService.findById(dto.getCustomerId()); @@ -163,8 +148,6 @@ public class SaleReturnExportModel extends BaseBo implements ExcelMo } this.setCode(dto.getCode()); - this.setScCode(sc.getCode()); - this.setScName(sc.getName()); this.setCustomerCode(customer.getCode()); this.setCustomerName(customer.getName()); this.setSalerName(saler == null ? null : saler.getName()); diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java index 9694d4d..8141822 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/out/QuerySaleOutSheetVo.java @@ -6,6 +6,8 @@ import com.lframework.xingyun.sc.enums.SaleOutSheetStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; +import java.util.List; + import lombok.Data; @Data @@ -13,6 +15,9 @@ public class QuerySaleOutSheetVo extends SortPageVo { private static final long serialVersionUID = 1L; + @ApiModelProperty("订单Id列表") + private List orderIds; + /** * 单号 */ diff --git a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java index 028620a..f753227 100644 --- a/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java +++ b/xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/sale/returned/QuerySaleReturnVo.java @@ -6,6 +6,8 @@ import com.lframework.xingyun.sc.enums.SaleReturnStatus; import com.lframework.xingyun.sc.enums.SettleStatus; import io.swagger.annotations.ApiModelProperty; import java.time.LocalDateTime; +import java.util.List; + import lombok.Data; @Data @@ -13,6 +15,9 @@ public class QuerySaleReturnVo extends SortPageVo { private static final long serialVersionUID = 1L; + + @ApiModelProperty("订单Id列表") + private List orderIds; /** * 单号 */ diff --git a/xingyun-sc/src/main/resources/mappers/sale/SaleOutSheetMapper.xml b/xingyun-sc/src/main/resources/mappers/sale/SaleOutSheetMapper.xml index 6b57fb2..f09e386 100644 --- a/xingyun-sc/src/main/resources/mappers/sale/SaleOutSheetMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/sale/SaleOutSheetMapper.xml @@ -191,6 +191,13 @@ AND s.settle_status = #{vo.settleStatus} + + AND s.id IN + + #{id} + + ORDER BY s.create_time DESC diff --git a/xingyun-sc/src/main/resources/mappers/sale/SaleReturnMapper.xml b/xingyun-sc/src/main/resources/mappers/sale/SaleReturnMapper.xml index b7c3fc1..1490566 100644 --- a/xingyun-sc/src/main/resources/mappers/sale/SaleReturnMapper.xml +++ b/xingyun-sc/src/main/resources/mappers/sale/SaleReturnMapper.xml @@ -141,6 +141,13 @@ AND r.settle_status = #{vo.settleStatus} + + AND s.id IN + + #{id} + + ORDER BY r.create_time DESC