diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java index 6d56562..9ce4f65 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/InvoiceController.java @@ -115,4 +115,11 @@ public class InvoiceController { List invoice = invoiceService.getOrderYfInvoice(code); return success(invoice); } + @GetMapping("/pages") + @Operation(summary = "获得财务发票分页") + @PreAuthorize("@ss.hasPermission('heli:invoice:query')") + public CommonResult> getInvoicePages(@Valid InvoicePageReqVO pageReqVO) { + PageResult pageResult = invoiceService.getInvoicePages(pageReqVO); + return success(BeanUtils.toBean(pageResult, InvoiceRespVO.class)); + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoicePageReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoicePageReqVO.java index 4a55f72..3db6f9f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoicePageReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoicePageReqVO.java @@ -15,6 +15,8 @@ import static com.chanko.yunxi.mes.framework.common.util.date.DateUtils.FORMAT_Y @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) public class InvoicePageReqVO extends PageParam { + @Schema(description = "id", example = "30302") + private Long Id; @Schema(description = "业务类型 FINANCE_MAKE|FINANCE_RECEIVE 开票|收票", example = "2") private String businessType; @@ -64,5 +66,5 @@ public class InvoicePageReqVO extends PageParam { @Schema(description = "订单编号", example = "30302") private String orderCode; - + private Long cgOrderIdId; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java index 766b6a4..5e6f1c6 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/invoice/vo/InvoiceSaveReqVO.java @@ -71,5 +71,5 @@ public class InvoiceSaveReqVO { @Schema(description = "操作意见") private String activeOpinion; - + private Long cgOrderIdId; } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/OrderYfController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/OrderYfController.java index 41455cb..78ee134 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/OrderYfController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/OrderYfController.java @@ -11,6 +11,7 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; +import java.math.BigDecimal; import java.util.*; import java.io.IOException; @@ -87,8 +88,43 @@ public class OrderYfController { HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = orderYfService.getOrderYfPage(pageReqVO).getList(); + for (OrderYfDO order : list) { + BigDecimal cgYifu = order.getCgYifu(); + BigDecimal cgYf = order.getCgYf(); + + // 快速失败检查:任一为null或分母为0 + if (cgYifu == null || cgYf == null || cgYf.signum() == 0) { + order.setYfRatio("0%"); + continue; + } + + // 使用double直接计算避免BigDecimal开销 + double numerator = cgYifu.doubleValue(); + double denominator = cgYf.doubleValue(); + + // 直接计算百分比并四舍五入取整 + int percent = (int) Math.round((numerator / denominator) * 100); + order.setYfRatio(percent + "%"); + + BigDecimal amount = order.getAmount(); + + // 快速失败检查:任一为null或分母为0 + if (amount == null || cgYf == null || cgYf.signum() == 0) { + order.setYkRatio("0%"); + continue; + } + + // 使用double直接计算避免BigDecimal开销 + double numerator1 = amount.doubleValue(); + double denominator1 = cgYf.doubleValue(); + + // 直接计算百分比并四舍五入取整 + int percent1 = (int) Math.round((numerator1 / denominator1) * 100); + order.setYkRatio(percent1 + "%"); + + } // 导出 Excel - ExcelUtils.write(response, "应付记录.xls", "数据", OrderYfRespVO.class, + ExcelUtils.write(response, "应付记录.xlsx", "数据", OrderYfRespVO.class, BeanUtils.toBean(list, OrderYfRespVO.class)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java index 5db2ec1..05dd3b1 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderyf/vo/OrderYfRespVO.java @@ -1,6 +1,8 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo; import com.baomidou.mybatisplus.annotation.TableField; +import com.chanko.yunxi.mes.framework.excel.core.annotations.DictFormat; +import com.chanko.yunxi.mes.framework.excel.core.convert.DictConvert; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; @@ -39,17 +41,27 @@ public class OrderYfRespVO { @Schema(description = "已付金额") @ExcelProperty("已付金额(元)") private BigDecimal cgYifu; + @Schema(description = "已付款比例") + @ExcelProperty("已付款比例") + private String yfRatio; @Schema(description = "已开票金额") @ExcelProperty("已开票金额(元)") private BigDecimal amount; - + @Schema(description = "已开票比例") + @ExcelProperty("已开票比例") + private String ykRatio; @Schema(description = "付款状态") - @ExcelProperty("付款状态") + @ExcelProperty(value = "付款状态", converter = DictConvert.class) + @DictFormat("heli_yingfu_money") private Integer cgTypee; - + @Schema(description = "订单状态") + @ExcelProperty(value = "订单状态", converter = DictConvert.class) + @DictFormat("heli_purchase_receiving_status") + private Integer receivingStatus; @Schema(description = "备注") @ExcelProperty("备注") private String rem; - + private Long projectId; + private String projectCode; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java index 538c7d6..478dd6f 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/OrderYsController.java @@ -1,5 +1,6 @@ package com.chanko.yunxi.mes.module.heli.controller.admin.orderys; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyf.OrderYfDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -11,6 +12,7 @@ import io.swagger.v3.oas.annotations.Operation; import javax.validation.constraints.*; import javax.validation.*; import javax.servlet.http.*; +import java.math.BigDecimal; import java.util.*; import java.io.IOException; @@ -86,8 +88,43 @@ public class OrderYsController { HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); List list = orderYsService.getOrderYsPage(pageReqVO).getList(); + for (OrderYsDO order : list) { + BigDecimal yishou = order.getCgYishou(); + BigDecimal cgYs = order.getCgYs(); + + // 快速失败检查:任一为null或分母为0 + if (yishou == null || cgYs == null || cgYs.signum() == 0) { + order.setYsRatio("0%"); + continue; + } + + // 使用double直接计算避免BigDecimal开销 + double numerator = yishou.doubleValue(); + double denominator = cgYs.doubleValue(); + + // 直接计算百分比并四舍五入取整 + int percent = (int) Math.round((numerator / denominator) * 100); + order.setYsRatio(percent + "%"); + + BigDecimal amount = order.getAmount(); + + // 快速失败检查:任一为null或分母为0 + if (amount == null || cgYs == null || cgYs.signum() == 0) { + order.setYkRatio("0%"); + continue; + } + + // 使用double直接计算避免BigDecimal开销 + double numerator1 = amount.doubleValue(); + double denominator1 = cgYs.doubleValue(); + + // 直接计算百分比并四舍五入取整 + int percent1 = (int) Math.round((numerator1 / denominator1) * 100); + order.setYkRatio(percent1 + "%"); + + } // 导出 Excel - ExcelUtils.write(response, "应收记录.xls", "数据", OrderYsExportVO.class, + ExcelUtils.write(response, "应收记录.xlsx", "数据", OrderYsExportVO.class, BeanUtils.toBean(list, OrderYsExportVO.class)); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java index 743e999..260735e 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsExportVO.java @@ -38,13 +38,22 @@ public class OrderYsExportVO { @Schema(description = "已收金额") @ExcelProperty("已收金额") private BigDecimal cgYishou; + @Schema(description = "已收款比例") + @ExcelProperty("已收款比例") + private String ysRatio; @Schema(description = "已开票金额") @ExcelProperty("已开票金额") private BigDecimal amount; + @Schema(description = "已开票比例") + @ExcelProperty("已开票比例") + private String ykRatio; @Schema(description = "回款状态") @ExcelProperty(value = "回款状态", converter = DictConvert.class) @DictFormat("heli_yingfu_money") private Integer cgTypee; + @ExcelProperty(value = "发货状态", converter = DictConvert.class) + @DictFormat("heli_delivery_status") + private Integer deliveryStatus; @Schema(description = "备注") @ExcelProperty("备注") private String rem; diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java index 9d3c378..95ef7de 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/controller/admin/orderys/vo/OrderYsRespVO.java @@ -68,5 +68,7 @@ public class OrderYsRespVO { private BigDecimal fourFuKuan; private BigDecimal fiveFuKuan; private BigDecimal sixFuKuan; - + private Integer deliveryStatus; + private Long projectId; + private String projectCode; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java index 229e708..b09f7fe 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/invoice/InvoiceDO.java @@ -82,6 +82,7 @@ public class InvoiceDO extends BaseDO { * 作废时间 */ private LocalDateTime cancelTime; + private Long cgOrderIdId; /** * 单据状态 已保存|已提交|已作废 1|2|3 */ diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java index 2288a00..20df4bc 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderyf/OrderYfDO.java @@ -60,5 +60,16 @@ public class OrderYfDO extends BaseDO { private String rem; @TableField(exist = false) private BigDecimal amount; + @TableField(exist = false) + private Integer receivingStatus; + @TableField(exist = false) + private Long projectId; + @TableField(exist = false) + private String projectCode; + @TableField(exist = false) + private String yfRatio; + @TableField(exist = false) + private String ykRatio; -} \ No newline at end of file + +} diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java index 1615774..5d193be 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/dataobject/orderys/OrderYsDO.java @@ -81,7 +81,16 @@ public class OrderYsDO extends BaseDO { private BigDecimal fiveFuKuan; @TableField(exist = false) private BigDecimal sixFuKuan; - + @TableField(exist = false) + private Integer deliveryStatus; + @TableField(exist = false) + private Long projectId; + @TableField(exist = false) + private String projectCode; + @TableField(exist = false) + private String ysRatio; + @TableField(exist = false) + private String ykRatio; } \ No newline at end of file diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/invoice/InvoiceMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/invoice/InvoiceMapper.java index 4885479..e557536 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/invoice/InvoiceMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/invoice/InvoiceMapper.java @@ -74,4 +74,13 @@ public interface InvoiceMapper extends BaseMapperX { } return selectOne(query); } + + default PageResult selectPages(InvoicePageReqVO pageReqVO){ + MPJLambdaWrapper query = new MPJLambdaWrapper<>(); + query.selectAll(InvoiceDO.class); + query.eq(InvoiceDO::getCgOrderIdId, pageReqVO.getId()); + query.eq(InvoiceDO::getBusinessType, pageReqVO.getType()); + return selectPage(pageReqVO, query); + + } } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java index 3725455..e5b6523 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderyf/OrderYfMapper.java @@ -9,6 +9,8 @@ import com.chanko.yunxi.mes.module.heli.controller.admin.orderys.vo.OrderYsPageR import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderyf.OrderYfDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.orderys.OrderYsDO; import com.chanko.yunxi.mes.module.heli.dal.dataobject.projectorder.ProjectOrderDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseorderno.PurchaseOrderNoDO; +import com.chanko.yunxi.mes.module.heli.dal.dataobject.purchaseordernodetail.PurchaseOrderNoDetailDO; import com.github.yulichang.wrapper.MPJLambdaWrapper; import org.apache.ibatis.annotations.Mapper; import com.chanko.yunxi.mes.module.heli.controller.admin.orderyf.vo.*; @@ -27,8 +29,16 @@ public interface OrderYfMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(OrderYfDO.class) .select("sum(i.amount) as amount") + .select("CASE " + + " WHEN COUNT(d.id) = 0 THEN 1 " + // 无子记录 + " WHEN SUM(CASE d.receiving_status WHEN 3 THEN 0 ELSE 1 END) = 0 THEN 3 " + // 全部为3 + " WHEN SUM(CASE d.receiving_status WHEN 1 THEN 1 ELSE 0 END) = COUNT(d.id) THEN 1 " + // 全部为1 + " ELSE 2 " + // 其他情况 + "END AS receivingStatus") .leftJoin( "finance_invoice i ON i.order_code = t.cg_order_num AND i.business_type = 'FINANCE_RECEIVE_INVOICE' AND i.status !='3'") + .leftJoin(PurchaseOrderNoDO.class,"p", PurchaseOrderNoDO::getPurchaseNo, OrderYfDO::getCgOrderNum) + .leftJoin(PurchaseOrderNoDetailDO.class,"d", PurchaseOrderNoDetailDO::getPurchaseOrderId, PurchaseOrderNoDO::getId) .disableSubLogicDel() .groupBy(OrderYfDO::getId) .orderByDesc(OrderYfDO::getCreateTime); @@ -45,8 +55,10 @@ public interface OrderYfMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(OrderYfDO.class) .select("sum(i.amount) as amount") + .select("p.id as projectId","p.purchase_no as projectCode") .leftJoin( "finance_invoice i ON i.order_code = t.cg_order_num AND i.business_type = 'FINANCE_RECEIVE_INVOICE' AND i.status !='3'") + .leftJoin(PurchaseOrderNoDO.class,"p", PurchaseOrderNoDO::getPurchaseNo, OrderYfDO::getCgOrderNum) .disableSubLogicDel(); query .eq( OrderYsDO::getId, id); diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java index 113b57b..b8f2e22 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/dal/mysql/orderys/OrderYsMapper.java @@ -31,8 +31,10 @@ public interface OrderYsMapper extends BaseMapperX { MPJLambdaWrapper query = new MPJLambdaWrapper<>(); query.selectAll(OrderYsDO.class) .select("sum(i.amount) as amount") + .select("p.delivery_status as deliveryStatus") .leftJoin( "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'") + .leftJoin(ProjectOrderDO.class,"p", ProjectOrderDO::getCode, OrderYsDO::getCode) .disableSubLogicDel() .groupBy(OrderYsDO::getId) .orderByDesc(OrderYsDO::getCreateTime); @@ -52,6 +54,7 @@ public interface OrderYsMapper extends BaseMapperX { .select("sum(i.amount) as amount") .select("p.shou_Fu_Kuan as shouFuKuan","p.two_Fu_Kuan as twoFuKuan","p.three_Fu_Kuan as threeFuKuan") .select("p.four_Fu_Kuan as fourFuKuan","p.five_Fu_Kuan as fiveFuKuan","p.six_Fu_Kuan as sixFuKuan") + .select("p.code as projectCode,p.id as projectId") .leftJoin( "finance_invoice i ON i.order_code = t.code AND i.business_type = 'FINANCE_MAKE_INVOICE' AND i.status !='3'") .leftJoin(ProjectOrderDO.class, "p", ProjectOrderDO::getCode, OrderYsDO::getCode) diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java index 6bdceb8..c2bf07a 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceService.java @@ -58,4 +58,6 @@ public interface InvoiceService { List getOrderYsInvoice(String code); List getOrderYfInvoice(String code); + + PageResult getInvoicePages(InvoicePageReqVO pageReqVO); } diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java index 3ba70be..79772b5 100644 --- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java +++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/invoice/InvoiceServiceImpl.java @@ -121,4 +121,9 @@ public class InvoiceServiceImpl implements InvoiceService { return invoiceMapper.selectList(wrapper); } + @Override + public PageResult getInvoicePages(InvoicePageReqVO pageReqVO) { + return invoiceMapper.selectPages(pageReqVO); + } + } diff --git a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts index 7f398e9..becc427 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts +++ b/mes-ui/mes-ui-admin-vue3/src/api/heli/invoice/index.ts @@ -59,3 +59,8 @@ export const getOrderYsInvoice = async (code: string) => { export const getOrderYfInvoice = async (code: string) => { return await request.get({ url: `/heli/invoice/getOrderYfInvoice?code=` + code }) } + +// 查询财务发票分页 +export const getInvoicePages = async (params) => { + return await request.get({ url: `/heli/invoice/pages`, params }) +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue index 8e4c1bf..5d086a7 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderyf/OrderYfForm.vue @@ -105,6 +105,9 @@ 删除 + + 开票 + @@ -118,16 +121,18 @@ 取 消 + + + + diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue index b589c8e..a1bf910 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/orderys/OrderYsForm.vue @@ -171,9 +171,14 @@ 删除 + + 开票 + + + @@ -184,14 +189,20 @@ 取 消 + + + +