5 天以前 d09c672bbb00e318991e74e1d286630807b87f20
refactor(account): 重构财务模块DTO包结构并添加总账科目功能

- 将DTO类从com.ruoyi.account.dto移动到com.ruoyi.account.bean.dto包
- 新增总账科目相关实体、控制器、服务和映射器
- 实现总账科目的增删改查和导入导出功能
- 更新数据库连接配置
- 优化代码结构和依赖引入
已修改2个文件
18 ■■■■ 文件已修改
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.common.enums.FileNameType;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.device.mapper.DeviceRepairMapper;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
@@ -24,6 +25,7 @@
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.impl.PurchaseLedgerServiceImpl;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.mapper.SalesQuotationMapper;
@@ -33,6 +35,7 @@
import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.pojo.ShippingInfo;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import com.ruoyi.sales.service.impl.ShippingInfoServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -73,6 +76,9 @@
    @Autowired
    private ShippingInfoMapper shippingInfoMapper;
    @Autowired
    private ShippingInfoServiceImpl shippingInfoService;
    @Autowired
    private CommonFileServiceImpl commonFileService;
@@ -246,6 +252,10 @@
            if(shippingInfo != null){
                if(status.equals(2)){
                    shippingInfo.setStatus("审核通过");
                    ShippingInfoDto shippingInfoDto = new ShippingInfoDto();
                    BeanUtils.copyProperties(shippingInfo, shippingInfoDto);
                    shippingInfoService.deductStock(shippingInfoDto);
                    shippingInfo.setStatus("已发货");
                }else if(status.equals(3)){
                    shippingInfo.setStatus("审核拒绝");
                }else if(status.equals(1)){
src/main/java/com/ruoyi/stock/controller/StockInventoryController.java
@@ -54,8 +54,12 @@
    @PostMapping("/addstockInventory")
    @ApiOperation("新增库存")
    public R addstockInventory(@RequestBody StockInventoryDto stockInventoryDto) {
        stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
        stockInventoryDto.setRecordId(0L);
        if (stockInventoryDto.getRecordType() == null || stockInventoryDto.getRecordType().trim().isEmpty()) {
            stockInventoryDto.setRecordType(String.valueOf(StockInQualifiedRecordTypeEnum.CUSTOMIZATION_STOCK_IN.getCode()));
        }
        if (stockInventoryDto.getRecordId() == null) {
            stockInventoryDto.setRecordId(0L);
        }
        return R.ok(stockInventoryService.addstockInventory(stockInventoryDto));
    }