src/main/java/com/ruoyi/account/bean/dto/financial/AccountSubjectDto.java
文件名从 src/main/java/com/ruoyi/account/bean/dto/AccountSubjectDto.java 修改 @@ -1,6 +1,6 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.financial; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.pojo.financial.AccountSubject; import lombok.Data; import lombok.EqualsAndHashCode;
文件名从 src/main/java/com/ruoyi/account/bean/dto/AccountSubjectImportDto.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.financial; import com.ruoyi.framework.aspectj.lang.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseInboundDto.java
文件名从 src/main/java/com/ruoyi/account/bean/dto/PurchaseInboundDto.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; src/main/java/com/ruoyi/account/bean/dto/purchase/PurchaseReturnDto.java
文件名从 src/main/java/com/ruoyi/account/bean/dto/PurchaseReturnDto.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.purchase; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; src/main/java/com/ruoyi/account/bean/dto/sales/SalesOutboundDto.java
文件名从 src/main/java/com/ruoyi/account/bean/dto/SalesOutboundDto.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.sales; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
文件名从 src/main/java/com/ruoyi/account/bean/dto/SalesReturnDto.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.dto; package com.ruoyi.account.bean.dto.sales; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; src/main/java/com/ruoyi/account/bean/vo/financial/AccountSubjectVo.java
文件名从 src/main/java/com/ruoyi/account/bean/vo/AccountSubjectVo.java 修改 @@ -1,6 +1,6 @@ package com.ruoyi.account.bean.vo; package com.ruoyi.account.bean.vo.financial; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.pojo.financial.AccountSubject; import lombok.Data; import java.util.ArrayList; src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseInboundVo.java
文件名从 src/main/java/com/ruoyi/account/bean/vo/PurchaseInboundVo.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.vo; package com.ruoyi.account.bean.vo.purchase; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.fasterxml.jackson.annotation.JsonFormat; src/main/java/com/ruoyi/account/bean/vo/purchase/PurchaseReturnVo.java
文件名从 src/main/java/com/ruoyi/account/bean/vo/PurchaseReturnVo.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.vo; package com.ruoyi.account.bean.vo.purchase; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.fasterxml.jackson.annotation.JsonFormat; src/main/java/com/ruoyi/account/bean/vo/sales/SalesOutboundVo.java
文件名从 src/main/java/com/ruoyi/account/bean/vo/SalesOutboundVo.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.vo; package com.ruoyi.account.bean.vo.sales; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.fasterxml.jackson.annotation.JsonFormat; src/main/java/com/ruoyi/account/bean/vo/sales/SalesReturnVo.java
文件名从 src/main/java/com/ruoyi/account/bean/vo/SalesReturnVo.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.bean.vo; package com.ruoyi.account.bean.vo.sales; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.fasterxml.jackson.annotation.JsonFormat; src/main/java/com/ruoyi/account/controller/financial/AccountSubjectController.java
文件名从 src/main/java/com/ruoyi/account/controller/AccountSubjectController.java 修改 @@ -1,10 +1,10 @@ package com.ruoyi.account.controller; package com.ruoyi.account.controller.financial; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.AccountSubjectDto; import com.ruoyi.account.bean.vo.AccountSubjectVo; import com.ruoyi.account.service.AccountSubjectService; import com.ruoyi.account.bean.dto.financial.AccountSubjectDto; import com.ruoyi.account.bean.vo.financial.AccountSubjectVo; import com.ruoyi.account.service.purchase.AccountSubjectService; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.domain.R; src/main/java/com/ruoyi/account/controller/purchase/AccounPurchaseController.java
文件名从 src/main/java/com/ruoyi/account/controller/AccounPurchaseController.java 修改 @@ -1,12 +1,12 @@ package com.ruoyi.account.controller; package com.ruoyi.account.controller.purchase; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.PurchaseInboundDto; import com.ruoyi.account.bean.dto.PurchaseReturnDto; import com.ruoyi.account.bean.vo.PurchaseInboundVo; import com.ruoyi.account.bean.vo.PurchaseReturnVo; import com.ruoyi.account.service.AccountPurchaseService; import com.ruoyi.account.bean.dto.purchase.PurchaseInboundDto; import com.ruoyi.account.bean.dto.purchase.PurchaseReturnDto; import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo; import com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo; import com.ruoyi.account.service.financial.AccountPurchaseService; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.domain.R; src/main/java/com/ruoyi/account/controller/sales/AccountSalesController.java
文件名从 src/main/java/com/ruoyi/account/controller/AccountSalesController.java 修改 @@ -1,12 +1,12 @@ package com.ruoyi.account.controller; package com.ruoyi.account.controller.sales; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.SalesOutboundDto; import com.ruoyi.account.bean.dto.SalesReturnDto; import com.ruoyi.account.bean.vo.SalesOutboundVo; import com.ruoyi.account.bean.vo.SalesReturnVo; import com.ruoyi.account.service.AccountSalesService; import com.ruoyi.account.bean.dto.sales.SalesOutboundDto; import com.ruoyi.account.bean.dto.sales.SalesReturnDto; import com.ruoyi.account.bean.vo.sales.SalesOutboundVo; import com.ruoyi.account.bean.vo.sales.SalesReturnVo; import com.ruoyi.account.service.sales.AccountSalesService; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.domain.R; src/main/java/com/ruoyi/account/mapper/financial/AccountSubjectMapper.java
文件名从 src/main/java/com/ruoyi/account/mapper/AccountSubjectMapper.java 修改 @@ -1,7 +1,7 @@ package com.ruoyi.account.mapper; package com.ruoyi.account.mapper.financial; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.pojo.financial.AccountSubject; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param;
文件名从 src/main/java/com/ruoyi/account/pojo/AccountSubject.java 修改 @@ -1,4 +1,4 @@ package com.ruoyi.account.pojo; package com.ruoyi.account.pojo.financial; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; src/main/java/com/ruoyi/account/service/financial/AccountPurchaseService.java
文件名从 src/main/java/com/ruoyi/account/service/AccountPurchaseService.java 修改 @@ -1,11 +1,11 @@ package com.ruoyi.account.service; package com.ruoyi.account.service.financial; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.PurchaseInboundDto; import com.ruoyi.account.bean.dto.PurchaseReturnDto; import com.ruoyi.account.bean.vo.PurchaseInboundVo; import com.ruoyi.account.bean.vo.PurchaseReturnVo; import com.ruoyi.account.bean.dto.purchase.PurchaseInboundDto; import com.ruoyi.account.bean.dto.purchase.PurchaseReturnDto; import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo; import com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo; import jakarta.servlet.http.HttpServletResponse; /** src/main/java/com/ruoyi/account/service/impl/financial/AccountSubjectServiceImpl.java
文件名从 src/main/java/com/ruoyi/account/service/impl/AccountSubjectServiceImpl.java 修改 @@ -1,15 +1,15 @@ package com.ruoyi.account.service.impl; package com.ruoyi.account.service.impl.financial; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.account.bean.dto.AccountSubjectDto; import com.ruoyi.account.bean.dto.AccountSubjectImportDto; import com.ruoyi.account.bean.vo.AccountSubjectVo; import com.ruoyi.account.mapper.AccountSubjectMapper; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.service.AccountSubjectService; import com.ruoyi.account.bean.dto.financial.AccountSubjectDto; import com.ruoyi.account.bean.dto.financial.AccountSubjectImportDto; import com.ruoyi.account.bean.vo.financial.AccountSubjectVo; import com.ruoyi.account.mapper.financial.AccountSubjectMapper; import com.ruoyi.account.pojo.financial.AccountSubject; import com.ruoyi.account.service.purchase.AccountSubjectService; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; src/main/java/com/ruoyi/account/service/impl/financial/FinVoucherServiceImpl.java
@@ -8,10 +8,10 @@ import com.ruoyi.account.bean.dto.financial.FinVoucherEntryDto; import com.ruoyi.account.bean.dto.financial.FinVoucherPageDto; import com.ruoyi.account.bean.vo.financial.FinVoucherDetailVo; import com.ruoyi.account.mapper.AccountSubjectMapper; import com.ruoyi.account.mapper.financial.AccountSubjectMapper; import com.ruoyi.account.mapper.financial.FinVoucherEntryMapper; import com.ruoyi.account.mapper.financial.FinVoucherMapper; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.pojo.financial.AccountSubject; import com.ruoyi.account.pojo.financial.FinVoucher; import com.ruoyi.account.pojo.financial.FinVoucherEntry; import com.ruoyi.account.service.financial.FinVoucherService; src/main/java/com/ruoyi/account/service/impl/purchase/AccountPurchaseServiceImpl.java
文件名从 src/main/java/com/ruoyi/account/service/impl/AccountPurchaseServiceImpl.java 修改 @@ -1,12 +1,12 @@ package com.ruoyi.account.service.impl; package com.ruoyi.account.service.impl.purchase; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.PurchaseInboundDto; import com.ruoyi.account.bean.dto.PurchaseReturnDto; import com.ruoyi.account.bean.vo.PurchaseInboundVo; import com.ruoyi.account.bean.vo.PurchaseReturnVo; import com.ruoyi.account.service.AccountPurchaseService; import com.ruoyi.account.bean.dto.purchase.PurchaseInboundDto; import com.ruoyi.account.bean.dto.purchase.PurchaseReturnDto; import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo; import com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo; import com.ruoyi.account.service.financial.AccountPurchaseService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper; import com.ruoyi.stock.mapper.StockInRecordMapper; src/main/java/com/ruoyi/account/service/impl/sales/AccountSalesServiceImpl.java
文件名从 src/main/java/com/ruoyi/account/service/impl/AccountSalesServiceImpl.java 修改 @@ -1,12 +1,12 @@ package com.ruoyi.account.service.impl; package com.ruoyi.account.service.impl.sales; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.SalesOutboundDto; import com.ruoyi.account.bean.dto.SalesReturnDto; import com.ruoyi.account.bean.vo.SalesOutboundVo; import com.ruoyi.account.bean.vo.SalesReturnVo; import com.ruoyi.account.service.AccountSalesService; import com.ruoyi.account.bean.dto.sales.SalesOutboundDto; import com.ruoyi.account.bean.dto.sales.SalesReturnDto; import com.ruoyi.account.bean.vo.sales.SalesOutboundVo; import com.ruoyi.account.bean.vo.sales.SalesReturnVo; import com.ruoyi.account.service.sales.AccountSalesService; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.procurementrecord.mapper.ReturnManagementMapper; import com.ruoyi.stock.mapper.StockOutRecordMapper; src/main/java/com/ruoyi/account/service/purchase/AccountSubjectService.java
文件名从 src/main/java/com/ruoyi/account/service/AccountSubjectService.java 修改 @@ -1,10 +1,10 @@ package com.ruoyi.account.service; package com.ruoyi.account.service.purchase; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.AccountSubjectDto; import com.ruoyi.account.bean.vo.AccountSubjectVo; import com.ruoyi.account.pojo.AccountSubject; import com.ruoyi.account.bean.dto.financial.AccountSubjectDto; import com.ruoyi.account.bean.vo.financial.AccountSubjectVo; import com.ruoyi.account.pojo.financial.AccountSubject; import com.baomidou.mybatisplus.extension.service.IService; import jakarta.servlet.http.HttpServletResponse;
文件名从 src/main/java/com/ruoyi/account/service/AccountSalesService.java 修改 @@ -1,11 +1,11 @@ package com.ruoyi.account.service; package com.ruoyi.account.service.sales; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.SalesOutboundDto; import com.ruoyi.account.bean.dto.SalesReturnDto; import com.ruoyi.account.bean.vo.SalesOutboundVo; import com.ruoyi.account.bean.vo.SalesReturnVo; import com.ruoyi.account.bean.dto.sales.SalesOutboundDto; import com.ruoyi.account.bean.dto.sales.SalesReturnDto; import com.ruoyi.account.bean.vo.sales.SalesOutboundVo; import com.ruoyi.account.bean.vo.sales.SalesReturnVo; import jakarta.servlet.http.HttpServletResponse; /** src/main/java/com/ruoyi/procurementrecord/mapper/ReturnManagementMapper.java
@@ -3,8 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.SalesReturnDto; import com.ruoyi.account.bean.vo.SalesReturnVo; import com.ruoyi.account.bean.dto.sales.SalesReturnDto; import com.ruoyi.account.bean.vo.sales.SalesReturnVo; import com.ruoyi.procurementrecord.bean.dto.ReturnManagementDto; import com.ruoyi.procurementrecord.pojo.ReturnManagement; import org.apache.ibatis.annotations.Param; src/main/java/com/ruoyi/purchase/mapper/PurchaseReturnOrdersMapper.java
@@ -3,8 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.PurchaseReturnDto; import com.ruoyi.account.bean.vo.PurchaseReturnVo; import com.ruoyi.account.bean.dto.purchase.PurchaseReturnDto; import com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo; import com.ruoyi.purchase.dto.PurchaseReturnOrderDto; import com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto; import com.ruoyi.purchase.pojo.PurchaseReturnOrders; src/main/java/com/ruoyi/stock/mapper/StockInRecordMapper.java
@@ -3,8 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.PurchaseInboundDto; import com.ruoyi.account.bean.vo.PurchaseInboundVo; import com.ruoyi.account.bean.dto.purchase.PurchaseInboundDto; import com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo; import com.ruoyi.stock.dto.StockInRecordDto; import com.ruoyi.stock.execl.StockInRecordExportData; import com.ruoyi.stock.pojo.StockInRecord; src/main/java/com/ruoyi/stock/mapper/StockOutRecordMapper.java
@@ -3,8 +3,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.account.bean.dto.SalesOutboundDto; import com.ruoyi.account.bean.vo.SalesOutboundVo; import com.ruoyi.account.bean.dto.sales.SalesOutboundDto; import com.ruoyi.account.bean.vo.sales.SalesOutboundVo; import com.ruoyi.stock.dto.StockOutRecordDto; import com.ruoyi.stock.execl.StockOutRecordExportData; import com.ruoyi.stock.pojo.StockOutRecord; src/main/resources/mapper/account/financial/AccountSubjectMapper.xml
文件名从 src/main/resources/mapper/account/AccountSubjectMapper.xml 修改 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.account.mapper.AccountSubjectMapper"> <mapper namespace="com.ruoyi.account.mapper.financial.AccountSubjectMapper"> <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.AccountSubject"> <resultMap id="BaseResultMap" type="com.ruoyi.account.pojo.financial.AccountSubject"> <id column="id" property="id" /> <result column="parent_id" property="parentId" /> <result column="subject_code" property="subjectCode" /> src/main/resources/mapper/procurementrecord/ReturnManagementMapper.xml
@@ -53,7 +53,7 @@ left join sales_ledger sl on si.sales_ledger_id = sl.id where rm.id = #{id} </select> <select id="listPageAccountSalesReturn" resultType="com.ruoyi.account.bean.vo.SalesReturnVo"> <select id="listPageAccountSalesReturn" resultType="com.ruoyi.account.bean.vo.sales.SalesReturnVo"> select rm.id, rm.return_no, c.customer_name, src/main/resources/mapper/purchase/PurchaseReturnOrdersMapper.xml
@@ -54,7 +54,7 @@ where pro.id = #{id} </select> <select id="listPageAccountPurchaseReturn" resultType="com.ruoyi.account.bean.vo.PurchaseReturnVo"> resultType="com.ruoyi.account.bean.vo.purchase.PurchaseReturnVo"> select pro.id, pro.no returnNo, t.inboundBatches, src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -70,7 +70,7 @@ </where> order by sir.id desc </select> <select id="listPageAccountPurchase" resultType="com.ruoyi.account.bean.vo.PurchaseInboundVo"> <select id="listPageAccountPurchase" resultType="com.ruoyi.account.bean.vo.purchase.PurchaseInboundVo"> SELECT sir.id, sir.inbound_batches, src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -86,7 +86,7 @@ order by sor.id desc </select> <select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.SalesOutboundVo"> <select id="listPageAccountSales" resultType="com.ruoyi.account.bean.vo.sales.SalesOutboundVo"> SELECT sor.id, sor.outbound_batches,
