doc/ÄþÏÄ-ÖÐÊ¢½¨²Ä.sql

@@ -510,4 +510,22 @@
    KEY `idx_batch_id` (`batch_id`),
    KEY `idx_product_id` (`product_id`) COMMENT '方便按产品查询历史成本对比'
) ENGINE = InnoDB
  DEFAULT CHARSET = utf8mb4 COMMENT ='生产成本核算对比明细表';
  DEFAULT CHARSET = utf8mb4 COMMENT ='生产成本核算对比明细表';

ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches`
    DROP INDEX `idx_period`;

ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches`
    DROP COLUMN `batch_name`,
    DROP COLUMN `status`;

ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_details`
    DROP COLUMN `actual_qty`,
    DROP COLUMN `actual_price`,
    DROP COLUMN `actual_total`,
    DROP COLUMN `diff_qty`,
    DROP COLUMN `diff_price`,
    DROP COLUMN `diff_total`;

ALTER TABLE `product-inventory-management-zsjc`.`production_settlement_batches`
    MODIFY COLUMN `period_time` varchar(255) NULL DEFAULT NULL COMMENT '核算归属年月' AFTER `id`;

 src/main/java/com/ruoyi/basic/pojo/Customer.java

@@ -38,14 +38,14 @@
    /**
     * è·Ÿè¿›ç¨‹åº¦
     */
    @Excel(name = "跟进程度")
//    @Excel(name = "跟进程度")
    @TableField(exist = false)
    private String followUpLevel;

    /**
     * è·Ÿè¿›æ—¶é—´
     */
    @Excel(name = "跟进时间")
//    @Excel(name = "跟进时间")
    @TableField(exist = false)
    private LocalDateTime followUpTime;

@@ -92,7 +92,7 @@
     * ç»´æŠ¤æ—¶é—´
     */
    @JsonFormat(pattern = "yyyy-MM-dd")
    @Excel(name = "维护时间" , width = 30, dateFormat = "yyyy-MM-dd")
    @Excel(name = "维护时间", width = 30, dateFormat = "yyyy-MM-dd")
    private Date maintenanceTime;

    @TableField(fill = FieldFill.INSERT)

 src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java

@@ -173,17 +173,17 @@
                    c.setAddressPhone(address + "(" + phone + ")");

                    // æŸ¥è¯¢æœ€æ–°çš„跟进记录
                    CustomerFollowUp followUp = customerFollowUpService.getOne(
                            new LambdaQueryWrapper<CustomerFollowUp>()
                                    .eq(CustomerFollowUp::getCustomerId, c.getId())
                                    .orderByDesc(CustomerFollowUp::getFollowUpTime)
                                    .last("LIMIT 1")
                    );

                    if (followUp != null) {
                        c.setFollowUpLevel(followUp.getFollowUpLevel());
                        c.setFollowUpTime(followUp.getFollowUpTime());
                    }
//                    CustomerFollowUp followUp = customerFollowUpService.getOne(
//                            new LambdaQueryWrapper<CustomerFollowUp>()
//                                    .eq(CustomerFollowUp::getCustomerId, c.getId())
//                                    .orderByDesc(CustomerFollowUp::getFollowUpTime)
//                                    .last("LIMIT 1")
//                    );
//
//                    if (followUp != null) {
//                        c.setFollowUpLevel(followUp.getFollowUpLevel());
//                        c.setFollowUpTime(followUp.getFollowUpTime());
//                    }
                })
                .collect(Collectors.toList());


 src/main/java/com/ruoyi/home/controller/HomeController.java

@@ -342,22 +342,10 @@
        return AjaxResult.success(homeService.salesAnalysis(salesDeliveryDto));
    }

    @GetMapping("/salesRanking")
    @ApiOperation("销售统计看板---销量数据-排名分析")
    public AjaxResult salesRanking(SalesDeliveryDto salesDeliveryDto) {
        return AjaxResult.success(homeService.salesRanking(salesDeliveryDto));
    }

    @GetMapping("/salesAmount")
    @ApiOperation("销售统计看板---销售金额分析")
    public AjaxResult salesAmount(SalesDeliveryDto salesDeliveryDto) {
        return AjaxResult.success(homeService.salesAmount(salesDeliveryDto));
    }

    @GetMapping("/salesDataRanking")
    @ApiOperation("销售统计看板---销售额数据-排名分析")
    public AjaxResult salesDataRanking(SalesDeliveryDto salesDeliveryDto) {
        return AjaxResult.success(homeService.salesDataRanking(salesDeliveryDto));
    }

    @GetMapping("/customerTrends")

 src/main/java/com/ruoyi/home/dto/SalesTotalDetailDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
package com.ruoyi.home.dto;

import lombok.Data;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.List;
import java.util.Map;

//销售区数据明细
@Data
public class SalesTotalDetailDto {

    //日期
    private LocalDate date;

    //产品类型(砌块/板材)
    private String type;

    //销售区
    private String area;

    //销量(立方米)/销售额(元)
    private Long salesTotal;


}

 src/main/java/com/ruoyi/home/dto/SalesTotalDto.java

@@ -14,7 +14,7 @@
    //时间坐标
    private List<LocalDate> dates;

    //客户区域分析
    //数据
    private List<Map<String,Long>> customerTrends;



 src/main/java/com/ruoyi/home/service/HomeService.java

@@ -98,13 +98,13 @@

    Map<String,Long> total();

    String salesAnalysis(SalesDeliveryDto salesDeliveryDto);
    SalesTotalDto salesAnalysis(SalesDeliveryDto salesDeliveryDto);

    String salesRanking(SalesDeliveryDto salesDeliveryDto);
    List<SalesTotalDetailDto> salesRanking(SalesDeliveryDto salesDeliveryDto);

    String salesAmount(SalesDeliveryDto salesDeliveryDto);
    SalesTotalDto salesAmount(SalesDeliveryDto salesDeliveryDto);

    String salesDataRanking(SalesDeliveryDto salesDeliveryDto);
    List<SalesTotalDetailDto> salesDataRanking(SalesDeliveryDto salesDeliveryDto);

    SalesTotalDto customerTrends(SalesDeliveryDto salesDeliveryDto);
}

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -2523,8 +2523,8 @@
    @Override
    public Map<String, Long> total() {
        Map<String, Long> map = new HashMap<>();
        //总销售金额
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(null);
        //总销售金额
        BigDecimal sum = salesDeliveries.stream()
                .map(item -> item.getPrice() != null ? new BigDecimal(item.getPrice().toString()) : BigDecimal.ZERO)
                .reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -2545,27 +2545,155 @@
    }

    @Override
    public String salesAnalysis(SalesDeliveryDto salesDeliveryDto) {
    public SalesTotalDto salesAnalysis(SalesDeliveryDto salesDeliveryDto) {
        SalesTotalDto salesTotalDto = new SalesTotalDto();
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        return null;
        List<Map<String, Long>> maps = new ArrayList<>();
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
            salesDeliveries = salesDeliveries
                    .stream()
                    .filter(delivery -> {
                        LocalDate deliveryDate = delivery.getDeliveryDate();
                        return !deliveryDate.isBefore(firstDay) && !deliveryDate.isAfter(finalLastDay);
                    })
                    .collect(Collectors.toList());
            Map<String, Long> regionCountMap = Arrays.stream(AddressRegionEnum.values())
                    .collect(Collectors.toMap(
                            AddressRegionEnum::getRegionName, // åŒºåŸŸåä½œä¸ºkey
                            enumItem -> 0L                    // åˆå§‹å€¼å…¨éƒ¨ä¸º0
                    ));
            if (!CollectionUtils.isEmpty(salesDeliveries)) {
                // æŒ‰åŒºåŸŸåˆ†ç»„，统计每个区域的销量总和
                regionCountMap = salesDeliveries.stream()
                        .filter(delivery -> delivery.getDeliveryPlace() != null)
                        .collect(Collectors.groupingBy(
                                delivery -> {
                                    AddressRegionEnum regionEnum = AddressRegionEnum.matchRegion(delivery.getDeliveryPlace());
                                    return regionEnum != null ? regionEnum.getRegionName() : null;
                                },
                                Collectors.summingLong(delivery -> delivery.getVolume() != null ? delivery.getVolume().longValue() : 0L)
                        ));
            }
            regionCountMap.put("全部", salesDeliveries.stream()
                    .mapToLong(item -> item.getVolume() != null ? item.getVolume().longValue() : 0L)
                    .sum());
            maps.add(regionCountMap);
        }
        salesTotalDto.setDates(dates);
        salesTotalDto.setCustomerTrends(maps);
        return salesTotalDto;
    }

    @Override
    public String salesRanking(SalesDeliveryDto salesDeliveryDto) {
    public List<SalesTotalDetailDto> salesRanking(SalesDeliveryDto salesDeliveryDto) {
        List<SalesTotalDetailDto> salesTotalDetailDtos = new ArrayList<>();
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        return null;
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
            salesDeliveries = salesDeliveries
                    .stream()
                    .filter(delivery -> {
                        LocalDate deliveryDate = delivery.getDeliveryDate();
                        return !deliveryDate.isBefore(firstDay) && !deliveryDate.isAfter(finalLastDay);
                    })
                    .collect(Collectors.toList());
            Map<String, Long> regionCountMap = Arrays.stream(AddressRegionEnum.values())
                    .collect(Collectors.toMap(
                            AddressRegionEnum::getRegionName, // åŒºåŸŸåä½œä¸ºkey
                            enumItem -> 0L                    // åˆå§‹å€¼å…¨éƒ¨ä¸º0
                    ));
            if (!CollectionUtils.isEmpty(salesDeliveries)) {
                // æŒ‰åŒºåŸŸåˆ†ç»„，统计每个区域的销量总和
                regionCountMap = salesDeliveries.stream()
                        .filter(delivery -> delivery.getDeliveryPlace() != null)
                        .collect(Collectors.groupingBy(
                                delivery -> {
                                    AddressRegionEnum regionEnum = AddressRegionEnum.matchRegion(delivery.getDeliveryPlace());
                                    return regionEnum != null ? regionEnum.getRegionName() : null;
                                },
                                Collectors.summingLong(delivery -> delivery.getVolume() != null ? delivery.getVolume().longValue() : 0L)
                        ));
            }
            regionCountMap.put("全部", salesDeliveries.stream()
                    .mapToLong(item -> item.getVolume() != null ? item.getVolume().longValue() : 0L)
                    .sum());
            SalesTotalDetailDto salesTotalDetailDto = new SalesTotalDetailDto();
            salesTotalDetailDto.setDate(date);
            salesTotalDetailDto.setType(salesDeliveryDto.getType());
            salesTotalDetailDtos.add(salesTotalDetailDto);
        }
        return salesTotalDetailDtos;
    }

    @Override
    public String salesAmount(SalesDeliveryDto salesDeliveryDto) {
    public SalesTotalDto salesAmount(SalesDeliveryDto salesDeliveryDto) {
        SalesTotalDto salesTotalDto = new SalesTotalDto();
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        return null;
        List<Map<String, Long>> maps = new ArrayList<>();
        List<SalesDelivery> salesDeliveries = salesDeliveryMapper.selectList(Wrappers.<SalesDelivery>lambdaQuery()
                .eq(SalesDelivery::getProductName,salesDeliveryDto.getType()));
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            LocalDate finalLastDay = lastDay;
            salesDeliveries = salesDeliveries
                    .stream()
                    .filter(delivery -> {
                        LocalDate deliveryDate = delivery.getDeliveryDate();
                        return !deliveryDate.isBefore(firstDay) && !deliveryDate.isAfter(finalLastDay);
                    })
                    .collect(Collectors.toList());
            Map<String, Long> regionCountMap = Arrays.stream(AddressRegionEnum.values())
                    .collect(Collectors.toMap(
                            AddressRegionEnum::getRegionName, // åŒºåŸŸåä½œä¸ºkey
                            enumItem -> 0L                    // åˆå§‹å€¼å…¨éƒ¨ä¸º0
                    ));
            if (!CollectionUtils.isEmpty(salesDeliveries)) {
                // æŒ‰åŒºåŸŸåˆ†ç»„，统计每个区域的销量总和
                regionCountMap = salesDeliveries.stream()
                        .filter(delivery -> delivery.getDeliveryPlace() != null)
                        .collect(Collectors.groupingBy(
                                delivery -> {
                                    AddressRegionEnum regionEnum = AddressRegionEnum.matchRegion(delivery.getDeliveryPlace());
                                    return regionEnum != null ? regionEnum.getRegionName() : null;
                                },
                                Collectors.summingLong(delivery -> delivery.getPrice() != null ? delivery.getPrice().longValue() : 0L)
                        ));
            }
            regionCountMap.put("全部", salesDeliveries.stream()
                    .mapToLong(item -> item.getPrice() != null ? item.getPrice().longValue() : 0L)
                    .sum());
            maps.add(regionCountMap);
        }
        salesTotalDto.setDates(dates);
        salesTotalDto.setCustomerTrends(maps);
        return salesTotalDto;
    }

    @Override
    public String salesDataRanking(SalesDeliveryDto salesDeliveryDto) {
    public List<SalesTotalDetailDto> salesDataRanking(SalesDeliveryDto salesDeliveryDto) {
        List<SalesTotalDetailDto> salesTotalDetailDtos = new ArrayList<>();
        List<LocalDate> dates = convertDateList(salesDeliveryDto.getDays());
        return null;

        return salesTotalDetailDtos;
    }

    @Override
@@ -2576,12 +2704,14 @@
        for (LocalDate date : dates) {
            LocalDate firstDay = date.with(TemporalAdjusters.firstDayOfMonth());
            LocalDate lastDay = date.with(TemporalAdjusters.lastDayOfMonth());
            if (salesDeliveryDto.getDays().equals("å¹´")){
                lastDay = date.with(TemporalAdjusters.lastDayOfYear());
            }
            Date startDate = Date.from(firstDay.atStartOfDay(ZoneId.systemDefault()).toInstant());
            Date endDate = Date.from(lastDay.atTime(23, 59, 59).atZone(ZoneId.systemDefault()).toInstant());
            List<Customer> customers = customerMapper.selectList(Wrappers.<Customer>lambdaQuery()
                    .between(Customer::getMaintenanceTime, startDate, endDate));
            Map<String, Long> regionCountMap = Arrays.stream(AddressRegionEnum.values())
                    .filter(addressRegionEnum -> addressRegionEnum.getRegionName().equals("SELF_PICKUP"))
                    .collect(Collectors.toMap(
                            AddressRegionEnum::getRegionName, // åŒºåŸŸåä½œä¸ºkey
                            enumItem -> 0L                    // åˆå§‹å€¼å…¨éƒ¨ä¸º0
@@ -2598,7 +2728,7 @@
                                Collectors.counting()   // è®¡æ•°
                        ));
            }
            regionCountMap.put("ALLIN",customers.stream().count());
            regionCountMap.put("全部",customers.stream().count());
            maps.add(regionCountMap);
        }
        salesTotalDto.setDates(dates);

 src/main/java/com/ruoyi/production/controller/ProductBomController.java

@@ -12,11 +12,9 @@
import com.ruoyi.production.dto.ProductBomDto;
import com.ruoyi.production.pojo.ProcessRoute;
import com.ruoyi.production.pojo.ProductBom;
import com.ruoyi.production.pojo.ProductProcessRoute;
import com.ruoyi.production.pojo.ProductStructure;
import com.ruoyi.production.service.ProcessRouteService;
import com.ruoyi.production.service.ProductBomService;
import com.ruoyi.production.service.ProductProcessRouteService;
import com.ruoyi.production.service.ProductStructureService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
@@ -50,9 +48,6 @@
    private ProcessRouteService processRouteService;

    @Autowired
    private ProductProcessRouteService productProcessRouteService;

    @Autowired
    private ProductStructureService productStructureService;

    @GetMapping("/listPage")
@@ -82,8 +77,7 @@
    @Log(title = "删除", businessType = BusinessType.DELETE)
    public AjaxResult batchDelete(@RequestBody List<Integer> ids) {
        List<ProcessRoute> list = processRouteService.list(Wrappers.<ProcessRoute>lambdaQuery().in(ProcessRoute::getBomId, ids));
        List<ProductProcessRoute> list2 = productProcessRouteService.list(Wrappers.<ProductProcessRoute>lambdaQuery().in(ProductProcessRoute::getBomId, ids));
        if (list.size() > 0 || list2.size() > 0) {
        if (list.size() > 0) {
            return AjaxResult.error("该BOM已经存在对应的工艺路线,无法进行删除");
        }
        if (CollectionUtils.isEmpty(ids)) {

 src/main/java/com/ruoyi/production/controller/ProductProcessParamController.java

@@ -1,8 +1,11 @@
package com.ruoyi.production.controller;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
import com.ruoyi.production.pojo.ProductProcessParam;
import com.ruoyi.production.service.ProductProcessParamService;
@@ -33,8 +36,9 @@
    @GetMapping("/list/{productProcessId}")
    @Log(title = "根据工序ID查询对应的参数", businessType = BusinessType.OTHER)
    @ApiOperation("根据工序ID查询对应的参数")
    public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId) {
        return AjaxResult.success(productProcessParamService.listByProcessId(productProcessId));
    public AjaxResult listByProcessId(@PathVariable("productProcessId") Long productProcessId, Page<ProductProcessParamDto> page) {
        IPage<ProductProcessParamDto> list = productProcessParamService.listByProcessId(productProcessId, page);
        return AjaxResult.success(list);
    }

    @PostMapping("/add")

 src/main/java/com/ruoyi/production/controller/ProductionSettlementBatchesController.java

@@ -1,19 +1,22 @@
package com.ruoyi.production.controller;


import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.production.dto.ProductionSettlementDetailsDto;
import com.ruoyi.production.dto.ProductionSettlementDto;
import com.ruoyi.production.dto.ProductionSettlementTotalDto;
import com.ruoyi.production.dto.SettlementImportDto;
import com.ruoyi.production.service.IProductionSettlementBatchesService;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDate;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -33,9 +36,45 @@

    @PostMapping("/import")
    @ApiOperation("导入生产成本核算表")
    public AjaxResult importProductionSettlement(@RequestParam("file") MultipartFile file, @RequestParam(required = false) LocalDate periodTime, @RequestParam(required = false) String batchName) {
        productionSettlementBatchesService.importProductionSettlement(file, periodTime, batchName);
    public AjaxResult importProductionSettlement(@RequestParam("file") MultipartFile file, ProductionSettlementDto dto) {
        productionSettlementBatchesService.importProductionSettlement(file, dto);
        return AjaxResult.success();
    }

    @GetMapping("/downloadTemplate")
    @ApiOperation("生产成本核算导入模板")
    public void export(HttpServletResponse response) {
        ExcelUtil<SettlementImportDto> excelUtil = new ExcelUtil<>(SettlementImportDto.class);
        excelUtil.importTemplateExcel(response, "生产成本核算导入模板");
    }

    @GetMapping("/getSettlement")
    @ApiOperation("获取生产成本核算数据")
    public AjaxResult getSettlement(ProductionSettlementDto dto) {
        Map<String, List<ProductionSettlementDetailsDto>> map = productionSettlementBatchesService.getSettlement(dto);
        return AjaxResult.success(map);
    }

    @GetMapping("/getProductTypes")
    @ApiOperation("获取对应月份导入的产品类别")
    public AjaxResult getProductTypes(ProductionSettlementDto dto) {
        List<String> list = productionSettlementBatchesService.getProductTypes(dto);
        return AjaxResult.success(list);
    }

    @GetMapping("/getSubjectNames")
    @ApiOperation("获取对应月份导入的科目类别")
    public AjaxResult getSubjectNames(ProductionSettlementDto dto) {
        List<String> list = productionSettlementBatchesService.getSubjectNames(dto);
        return AjaxResult.success(list);
    }

    @GetMapping("/getTotalCosts")
    @ApiOperation("获取成本合计数据")
    public AjaxResult getTotalCosts(ProductionSettlementDto dto) {
        ProductionSettlementTotalDto totalCosts = productionSettlementBatchesService.getTotalCosts(dto);
        return AjaxResult.success(totalCosts);
    }


}

 src/main/java/com/ruoyi/production/dto/ProductMaterialSkuImportDto.java

@@ -27,6 +27,10 @@
    @Excel(name = "规格型号")
    private String model;

    @ApiModelProperty("物料编码")
    @Excel(name = "物料编码")
    private String materialCode;

    @ApiModelProperty("供应方式（自制，外购）")
    @Excel(name = "供应方式")
    private String supplyType;

 src/main/java/com/ruoyi/production/dto/ProductionSettlementDetailsDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
package com.ruoyi.production.dto;

import com.ruoyi.production.pojo.ProductionSettlementDetails;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;

/**
 * <br>
 *
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01 9:16
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class ProductionSettlementDetailsDto extends ProductionSettlementDetails {

    @ApiModelProperty(value = "实际耗量")
    private BigDecimal actualQty;

    @ApiModelProperty(value = "实际单价")
    private BigDecimal actualPrice;

    @ApiModelProperty(value = "实际总成本")
    private BigDecimal actualTotal;

    @ApiModelProperty(value = "耗量差异")
    private String diffQty;

    @ApiModelProperty(value = "单价差异")
    private String diffPrice;

    @ApiModelProperty(value = "总成本差异")
    private String diffTotal;

}

 src/main/java/com/ruoyi/production/dto/ProductionSettlementDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
package com.ruoyi.production.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * <br>
 * ç”Ÿäº§æˆæœ¬æ ¸ç®—查询参数Dto
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "ProductionSettlementDto", description = "生产成本核算查询参数Dto")
public class ProductionSettlementDto {

    @ApiModelProperty("核算成本日期")
        private String periodTime;

    @ApiModelProperty("核算产品类型")
    private String productType;

    @ApiModelProperty("核算成本科目")
    private String subjectName;

    @ApiModelProperty("核算成本类型")
    private String costType;
}

 src/main/java/com/ruoyi/production/dto/ProductionSettlementTotalDto.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ruoyi.production.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;

/**
 * <br>
 * ç”Ÿäº§æˆæœ¬æ ¸ç®—合计数据 Dto
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/04/01
 */
@Data
@ApiModel(value = "ProductionSettlementTotalDto", description = "生产成本核算合计数据")
public class ProductionSettlementTotalDto {

    @ApiModelProperty("标准成本合计")
    private BigDecimal budgetTotal;

    @ApiModelProperty("实际成本合计")
    private BigDecimal actualTotal;

    @ApiModelProperty("差异合计")
    private BigDecimal diffTotal;

    @ApiModelProperty("差异率")
    private String diffRate;
}

 src/main/java/com/ruoyi/production/enums/ProductionSettlementEnum.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
package com.ruoyi.production.enums;

import lombok.Getter;

/**
 * <br>
 * äº§å“ç±»åž‹-科目名称
 * </br>
 *
 * @author deslrey
 * @version 1.0
 * @since 2026/03/31
 */
@Getter
public enum ProductionSettlementEnum {
    MATERIAL_COST("材料成本", true),
    ENERGY_COST("能耗成本", false);

    private final String name;
    private final boolean requiresProduct;

    ProductionSettlementEnum(String name, boolean requiresProduct) {
        this.name = name;
        this.requiresProduct = requiresProduct;
    }

    /**
     * åˆ¤æ–­æ˜¯å¦ä¸ºææ–™æˆæœ¬
     *
     * @param name ç§‘目名称
     * @return boolean
     */
    public static boolean isMaterialCost(String name) {
        for (ProductionSettlementEnum e : values()) {
            if (e.getName().equals(name)) {
                return e.isRequiresProduct();
            }
        }
        return false;
    }

}

 src/main/java/com/ruoyi/production/mapper/ProductProcessParamMapper.java

@@ -1,11 +1,12 @@
package com.ruoyi.production.mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.pojo.ProductProcessParam;
import org.apache.ibatis.annotations.Param;

import java.util.List;


/**
 * <br>
@@ -18,7 +19,7 @@
 */
public interface ProductProcessParamMapper extends BaseMapper<ProductProcessParam> {

    List<ProductProcessParamDto> selectDtoListByProcessId(@Param("processId") Long processId);
    IPage<ProductProcessParamDto> selectDtoListByProcessId(@Param("page") IPage<ProductProcessParamDto> page, @Param("processId") Long processId);


}

 src/main/java/com/ruoyi/production/pojo/ProductionSettlementBatches.java

@@ -1,11 +1,11 @@
package com.ruoyi.production.pojo;

import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.*;

import java.time.LocalDate;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("production_settlement_batches")
@ApiModel(value="ProductionSettlementBatches对象", description="生产成本核算批次主表")
@ApiModel(value = "ProductionSettlementBatches对象", description = "生产成本核算批次主表")
public class ProductionSettlementBatches implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -34,21 +34,17 @@
    private Long id;

    @ApiModelProperty(value = "核算归属月份")
    private LocalDate periodTime;

    @ApiModelProperty(value = "批次名称")
    private String batchName;

    @ApiModelProperty(value = "状态：0-仅预算，1-结算计算中，2-已完成结算，3-已锁定")
    private Integer status;
    private String periodTime;

    @ApiModelProperty(value = "导入用户")
    private String createUser;

    @ApiModelProperty(value = "创建日期")
    @TableField(value = "create_time", fill = FieldFill.INSERT)
    private LocalDateTime createTime;

    @ApiModelProperty(value = "租户ID")
    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
    private Long tenantId;



 src/main/java/com/ruoyi/production/pojo/ProductionSettlementDetails.java

@@ -1,10 +1,11 @@
package com.ruoyi.production.pojo;

import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

import com.baomidou.mybatisplus.annotation.*;

import java.io.Serializable;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("production_settlement_details")
@ApiModel(value="ProductionSettlementDetails对象", description="生产成本核算对比明细表")
@ApiModel(value = "ProductionSettlementDetails对象", description = "生产成本核算对比明细表")
public class ProductionSettlementDetails implements Serializable {

    private static final long serialVersionUID = 1L;
@@ -56,26 +57,8 @@
    @ApiModelProperty(value = "预算总成本")
    private BigDecimal budgetTotal;

    @ApiModelProperty(value = "实际耗量")
    private BigDecimal actualQty;

    @ApiModelProperty(value = "实际单价")
    private BigDecimal actualPrice;

    @ApiModelProperty(value = "实际总成本")
    private BigDecimal actualTotal;

    @ApiModelProperty(value = "耗量差异")
    private BigDecimal diffQty;

    @ApiModelProperty(value = "单价差异")
    private BigDecimal diffPrice;

    @ApiModelProperty(value = "总成本差异")
    private BigDecimal diffTotal;

    @ApiModelProperty(value = "租户ID")
    @TableField(value = "tenant_id", fill = FieldFill.INSERT)
    private Long tenantId;


}

 src/main/java/com/ruoyi/production/service/IProductionSettlementBatchesService.java

@@ -1,10 +1,14 @@
package com.ruoyi.production.service;

import com.ruoyi.production.dto.ProductionSettlementDetailsDto;
import com.ruoyi.production.dto.ProductionSettlementDto;
import com.ruoyi.production.dto.ProductionSettlementTotalDto;
import com.ruoyi.production.pojo.ProductionSettlementBatches;
import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDate;
import java.util.List;
import java.util.Map;

/**
 * <p>
@@ -16,6 +20,13 @@
 */
public interface IProductionSettlementBatchesService extends IService<ProductionSettlementBatches> {

    void importProductionSettlement(MultipartFile file, LocalDate periodTime, String batchName);
    void importProductionSettlement(MultipartFile file, ProductionSettlementDto dto);

    Map<String, List<ProductionSettlementDetailsDto>> getSettlement(ProductionSettlementDto dto);

    List<String> getProductTypes(ProductionSettlementDto dto);

    List<String> getSubjectNames(ProductionSettlementDto dto);

    ProductionSettlementTotalDto getTotalCosts(ProductionSettlementDto dto);
}

 src/main/java/com/ruoyi/production/service/ProductProcessParamService.java

@@ -1,5 +1,7 @@
package com.ruoyi.production.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
@@ -18,7 +20,7 @@
 */
public interface ProductProcessParamService extends IService<ProductProcessParam> {

    List<ProductProcessParamDto> listByProcessId(Long processId);
    IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page);

    void add(ProductProcessParam productProcessParam);


 src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java

@@ -20,11 +20,7 @@
import org.springframework.web.multipart.MultipartFile;

import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -153,7 +149,7 @@

        ProductMaterial material = productMaterialMapper.selectById(materialId);
        if (material == null) {
            throw new ServiceException("物料不存在");
            throw new ServiceException("主物料信息不存在");
        }

        ExcelUtil<ProductMaterialSkuImportDto> excelUtil = new ExcelUtil<>(ProductMaterialSkuImportDto.class);
@@ -164,70 +160,81 @@
            log.error("导入物料规格Excel解析失败", e);
            throw new ServiceException("Excel解析失败");
        }

        if (importList == null || importList.isEmpty()) {
            throw new ServiceException("Excel没有数据");
            throw new ServiceException("Excel中未检测到有效数据");
        }
        List<Integer> emptyCodeRows = new ArrayList<>();
        int currentRow = 1;

        Map<String, ProductMaterialSkuImportDto> specMap = new LinkedHashMap<>();
        for (ProductMaterialSkuImportDto dto : importList) {
            if (dto == null || StringUtils.isEmpty(dto.getModel())) {
            currentRow++;
            if (dto == null) continue;
            //  ç‰©æ–™ç¼–码不能为空
            if (StringUtils.isEmpty(dto.getMaterialCode())) {
                emptyCodeRows.add(currentRow);
                continue;
            }
            String specification = dto.getModel().trim();
            if (specification.isEmpty()) {
            if (StringUtils.isEmpty(dto.getModel())) {
                continue;
            }
            specMap.putIfAbsent(specification, dto);

            String modelKey = dto.getModel().trim();
            specMap.putIfAbsent(modelKey, dto);
        }

        if (!emptyCodeRows.isEmpty()) {
            throw new ServiceException("导入失败,以下行号的【物料编码】为空：" + emptyCodeRows.toString());
        }
        if (specMap.isEmpty()) {
            throw new ServiceException("Excel没有有效的规格数据");
            throw new ServiceException("Excel没有有效的规格型号数据");
        }

        Set<String> specifications = specMap.keySet();

        Set<String> modelSet = specMap.keySet();
        List<ProductMaterialSku> existList = this.list(new LambdaQueryWrapper<ProductMaterialSku>()
                .eq(ProductMaterialSku::getProductId, materialId)
                .in(ProductMaterialSku::getModel, specifications));
        Map<String, ProductMaterialSku> existMap = existList.stream()
                .collect(Collectors.toMap(ProductMaterialSku::getModel, sku -> sku, (a, b) -> a));
                .in(ProductMaterialSku::getModel, modelSet));

        Map<String, ProductMaterialSku> existMap = existList.stream().collect(Collectors.toMap(ProductMaterialSku::getModel, sku -> sku, (a, b) -> a));
        LocalDateTime now = LocalDateTime.now();
        List<ProductMaterialSku> saveList = new ArrayList<>();
        List<ProductMaterialSku> updateList = new ArrayList<>();

        for (Map.Entry<String, ProductMaterialSkuImportDto> entry : specMap.entrySet()) {
            String specification = entry.getKey();
            String model = entry.getKey();
            ProductMaterialSkuImportDto dto = entry.getValue();
            String supplyType = StringUtils.isNotEmpty(dto.getSupplyType()) ? dto.getSupplyType().trim() : null;

            ProductMaterialSku exist = existMap.get(specification);
            if (exist == null) {
                ProductMaterialSku sku = new ProductMaterialSku();
                sku.setProductId(materialId);
                sku.setModel(specification);
                sku.setSupplyType(supplyType);
                sku.setCreateTime(now);
                sku.setUpdateTime(now);
                saveList.add(sku);
            String excelMaterialCode = dto.getMaterialCode().trim();
            String excelSupplyType = StringUtils.isNotEmpty(dto.getSupplyType()) ? dto.getSupplyType().trim() : null;
            ProductMaterialSku existSku = existMap.get(model);
            if (existSku == null) {
                ProductMaterialSku newSku = new ProductMaterialSku();
                newSku.setProductId(materialId);
                newSku.setModel(model);
                newSku.setMaterialCode(excelMaterialCode);
                newSku.setSupplyType(excelSupplyType);
                newSku.setCreateTime(now);
                newSku.setUpdateTime(now);
                saveList.add(newSku);
            } else {
                boolean needUpdate = false;
                if (supplyType != null && !supplyType.equals(exist.getSupplyType())) {
                    exist.setSupplyType(supplyType);
                if (!Objects.equals(excelMaterialCode, existSku.getMaterialCode())) {
                    existSku.setMaterialCode(excelMaterialCode);
                    needUpdate = true;
                }
                if (!Objects.equals(excelSupplyType, existSku.getSupplyType())) {
                    existSku.setSupplyType(excelSupplyType);
                    needUpdate = true;
                }
                if (needUpdate) {
                    exist.setUpdateTime(now);
                    updateList.add(exist);
                    existSku.setUpdateTime(now);
                    updateList.add(existSku);
                }
            }
        }

        if (saveList.isEmpty() && updateList.isEmpty()) {
            throw new ServiceException("Excel与现有数据一致，无需导入");
            throw new ServiceException("Excel内容与现有数据完全一致");
        }

        if (!saveList.isEmpty()) {
            this.saveBatch(saveList);
        }
@@ -235,6 +242,6 @@
            this.updateBatchById(updateList);
        }

        log.info("物料规格导入完成 materialId={}, æ–°å¢ž{}条，更新{}条", materialId, saveList.size(), updateList.size());
        log.info("物料规格导入完成! materialId={}, æ–°å¢ž{}条，更新{}条", materialId, saveList.size(), updateList.size());
    }
}

 src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.production.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
@@ -226,23 +227,11 @@
            throw new RuntimeException("只有【待开始、已取消】状态的订单才可以删除");
        }

        //  æ˜¯å¦å·²ç”Ÿäº§
        List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(Wrappers.<ProductWorkOrder>lambdaQuery().eq(ProductWorkOrder::getProductOrderId, id));

        if (!productWorkOrders.isEmpty()) {
            List<Long> workOrderIds = productWorkOrders.stream()
                    .map(ProductWorkOrder::getId)
                    .collect(Collectors.toList());

            List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery().in(ProductionProductMain::getWorkOrderId, workOrderIds));
            if (!productionProductMains.isEmpty()) {
                throw new RuntimeException("生产订单已经开始生产,不能删除");
            }

            //  åˆ é™¤å·¥å•
            productWorkOrderMapper.delete(Wrappers.<ProductWorkOrder>lambdaQuery().eq(ProductWorkOrder::getProductOrderId, id));
        //  æ˜¯å¦æœ‰æŠ¥å·¥æ•°æ®
        List<ProductionProductMain> productMains = productionProductMainMapper.selectList(new LambdaQueryWrapper<ProductionProductMain>().eq(ProductionProductMain::getProductOrderId, id));
        if (!productMains.isEmpty()) {
            throw new RuntimeException("生产订单已经开始生产,不能删除");
        }

        //  å›žé€€ç”Ÿäº§è®¡åˆ’
        List<ProductOrderPlan> productOrderPlans = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().eq(ProductOrderPlan::getProductOrderId, id));


 src/main/java/com/ruoyi/production/service/impl/ProductProcessParamServiceImpl.java

@@ -1,9 +1,10 @@
package com.ruoyi.production.service.impl;

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.basic.mapper.BaseParamMapper;
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.production.dto.ProductProcessParamDto;
import com.ruoyi.production.dto.ProductProcessParamSortDTO;
import com.ruoyi.production.mapper.ProductProcessParamMapper;
@@ -34,11 +35,11 @@
    BaseParamMapper baseParamMapper;

    @Override
    public List<ProductProcessParamDto> listByProcessId(Long processId) {
    public IPage<ProductProcessParamDto> listByProcessId(Long processId, Page<ProductProcessParamDto> page) {
        if (processId == null) {
            throw new IllegalArgumentException("工序ID不能为空");
        }
        return baseMapper.selectDtoListByProcessId(processId);
        return baseMapper.selectDtoListByProcessId(page, processId);
    }

    @Override

 src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java

@@ -4,22 +4,35 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.energy.pojo.Energy;
import com.ruoyi.energy.pojo.EnergyConsumptionDetail;
import com.ruoyi.energy.service.EnergyConsumptionDetailService;
import com.ruoyi.energy.service.EnergyService;
import com.ruoyi.production.dto.ProductionSettlementDetailsDto;
import com.ruoyi.production.dto.ProductionSettlementDto;
import com.ruoyi.production.dto.ProductionSettlementTotalDto;
import com.ruoyi.production.dto.SettlementImportDto;
import com.ruoyi.production.pojo.ProductionSettlementBatches;
import com.ruoyi.production.enums.ProductionSettlementEnum;
import com.ruoyi.production.pojo.*;
import com.ruoyi.production.mapper.ProductionSettlementBatchesMapper;
import com.ruoyi.production.pojo.ProductionSettlementDetails;
import com.ruoyi.production.service.IProductionSettlementBatchesService;
import com.ruoyi.production.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.production.service.IProductionSettlementDetailsService;
import com.ruoyi.project.system.domain.SysDictData;
import com.ruoyi.project.system.mapper.SysDictDataMapper;
import com.ruoyi.production.utils.UnitUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.time.YearMonth;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -31,58 +44,453 @@
 * @since 2026-03-30
 */
@Service
@Slf4j
public class ProductionSettlementBatchesServiceImpl extends ServiceImpl<ProductionSettlementBatchesMapper, ProductionSettlementBatches> implements IProductionSettlementBatchesService {

    @Autowired
    private IProductionSettlementDetailsService productionSettlementDetailsService;

    @Autowired
    private ProductMaterialService productMaterialService;

    @Autowired
    private ProductMaterialSkuService productMaterialSkuService;

    @Autowired
    private ProductionProductMainService productionProductMainService;

    @Autowired
    private ProductionProductInputService productionProductInputService;

    @Autowired
    private IProductionOrderStructureService productionOrderStructureService;

    @Autowired
    private ProductOrderService productOrderService;

    @Autowired
    private IProductionOrderRouteService productionOrderRouteService;

    @Autowired
    private EnergyService energyService;

    @Autowired
    private EnergyConsumptionDetailService energyConsumptionDetailService;

    @Autowired
    private SysDictDataMapper sysDictDataMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void importProductionSettlement(MultipartFile file, LocalDate periodTime, String batchName) {
    public void importProductionSettlement(MultipartFile file, ProductionSettlementDto dto) {
        if (file == null || file.isEmpty()) {
            throw new ServiceException("导入失败，文件不能为空");
        }
        // æ ¸ç®—月份，如果不填则默认为当前月
        String finalPeriodTime = parsePeriodTime(dto != null ? dto.getPeriodTime() : null);

        List<SettlementImportDto> list;
        try {
            ExcelUtil<SettlementImportDto> util = new ExcelUtil<>(SettlementImportDto.class);
            list = util.importExcel(file.getInputStream());
            list = new ExcelUtil<>(SettlementImportDto.class).importExcel(file.getInputStream());
        } catch (Exception e) {
            log.error("导入生产成本核算失败", e);
            log.error("解析Excel失败", e);
            throw new ServiceException("解析Excel文件失败：" + e.getMessage());
        }

        if (StringUtils.isEmpty(list)) {
        if (list == null || list.isEmpty()) {
            throw new ServiceException("导入数据不能为空！");
        }

        // å¦‚果该月批次已存在，先清除旧批次及其明细，再重新导入
        ProductionSettlementBatches existBatch = this.lambdaQuery()
                .eq(ProductionSettlementBatches::getPeriodTime, finalPeriodTime)
                .one();
        if (existBatch != null) {
            productionSettlementDetailsService.lambdaUpdate()
                    .eq(ProductionSettlementDetails::getBatchId, existBatch.getId())
                    .remove();
            this.removeById(existBatch.getId());
            log.info("已清除 {} æœˆä»½çš„旧核算数据，批次ID：{}", finalPeriodTime, existBatch.getId());
        }

        ProductionSettlementBatches batch = new ProductionSettlementBatches();
        batch.setBatchName(StringUtils.isNotEmpty(batchName) ? batchName : periodTime + "成本核算导入");
        batch.setPeriodTime(periodTime != null ? periodTime : LocalDate.now());
        batch.setStatus(0);
        batch.setCreateTime(LocalDateTime.now());
        batch.setPeriodTime(finalPeriodTime);
        batch.setCreateUser(SecurityUtils.getUsername());
        this.save(batch);

        List<ProductionSettlementDetails> detailList = list.stream().map(dto -> {
        String lastProductType = "";
        String lastCategory = "";

        List<ProductionSettlementDetails> detailList = new ArrayList<>();
        int rowIndex = 2;
        for (SettlementImportDto importDto : list) {
            ProductionSettlementDetails detail = new ProductionSettlementDetails();
            detail.setBatchId(batch.getId());
            detail.setProductType(dto.getProductType());
            detail.setCategory(dto.getCategory());
            detail.setSubjectName(dto.getSubjectName());
            detail.setBudgetQty(dto.getBudgetQty());
            detail.setBudgetPrice(dto.getBudgetPrice());
            detail.setBudgetTotal(dto.getBudgetTotal());
            detail.setActualQty(BigDecimal.ZERO);
            detail.setActualPrice(BigDecimal.ZERO);
            detail.setActualTotal(BigDecimal.ZERO);
            detail.setDiffQty(BigDecimal.ZERO);
            detail.setDiffPrice(BigDecimal.ZERO);
            detail.setDiffTotal(BigDecimal.ZERO);

            return detail;
        }).collect(Collectors.toList());
            if (StringUtils.isNotBlank(importDto.getProductType())) {
                lastProductType = importDto.getProductType();
            }
            if (StringUtils.isNotBlank(importDto.getCategory())) {
                lastCategory = importDto.getCategory();
            }

            detail.setProductType(lastProductType);
            detail.setCategory(lastCategory);
            detail.setSubjectName(importDto.getSubjectName());
            detail.setBudgetQty(importDto.getBudgetQty() != null ? importDto.getBudgetQty() : BigDecimal.ZERO);
            detail.setBudgetPrice(importDto.getBudgetPrice() != null ? importDto.getBudgetPrice() : BigDecimal.ZERO);
            detail.setBudgetTotal(importDto.getBudgetTotal() != null ? importDto.getBudgetTotal() : BigDecimal.ZERO);

            if (ProductionSettlementEnum.isMaterialCost(detail.getCategory())) {
                ProductMaterial product = productMaterialService.lambdaQuery()
                        .eq(ProductMaterial::getProductName, importDto.getSubjectName())
                        .one();
                if (product != null) {
                    detail.setProductId(product.getId());
                } else {
                    log.warn("第 {} è¡Œï¼Œæœªæ‰¾åˆ°ç§‘目产品：{}", rowIndex, importDto.getSubjectName());
                }
            }
            detailList.add(detail);
            rowIndex++;
        }

        productionSettlementDetailsService.saveBatch(detailList);
    }

    @Override
    public Map<String, List<ProductionSettlementDetailsDto>> getSettlement(ProductionSettlementDto dto) {
        String finalPeriodTime = parsePeriodTime(dto != null ? dto.getPeriodTime() : null);

        YearMonth yearMonth = YearMonth.parse(finalPeriodTime, DateTimeFormatter.ofPattern("yyyy-MM"));
        LocalDate date = yearMonth.atDay(1);
        ProductionSettlementBatches batch = this.lambdaQuery()
                .eq(ProductionSettlementBatches::getPeriodTime, finalPeriodTime)
                .one();

        if (batch == null) {
            return new HashMap<>();
        }

        String filterProductType = dto != null ? dto.getProductType() : null;
        String filterSubjectName = dto != null ? dto.getSubjectName() : null;
        String filterCostType    = dto != null ? dto.getCostType()    : null;

        List<ProductionSettlementDetails> details = productionSettlementDetailsService.lambdaQuery()
                .eq(ProductionSettlementDetails::getBatchId, batch.getId())
                .eq(StringUtils.isNotBlank(filterProductType), ProductionSettlementDetails::getProductType, filterProductType)
                .eq(StringUtils.isNotBlank(filterSubjectName), ProductionSettlementDetails::getSubjectName, filterSubjectName)
                .eq(StringUtils.isNotBlank(filterCostType),    ProductionSettlementDetails::getCategory,    filterCostType)
                .list();

        List<ProductionSettlementDetailsDto> dtoList = details.stream().map(d -> {
            ProductionSettlementDetailsDto detailDto = new ProductionSettlementDetailsDto();
            detailDto.setBatchId(d.getBatchId());
            detailDto.setProductId(d.getProductId());
            detailDto.setProductType(d.getProductType());
            detailDto.setCategory(d.getCategory());
            detailDto.setSubjectName(d.getSubjectName());
            detailDto.setBudgetQty(d.getBudgetQty());
            detailDto.setBudgetPrice(d.getBudgetPrice());
            detailDto.setBudgetTotal(d.getBudgetTotal());
            return detailDto;
        }).collect(Collectors.toList());

        LocalDateTime start = date.atStartOfDay();
        LocalDateTime end = start.plusMonths(1);

        //  èŽ·å–产品分类
        List<SysDictData> sysDictDataList = sysDictDataMapper.selectDictDataByType("product_type");
        Map<Long, String> dictCodeMap = sysDictDataList.stream()
                .collect(Collectors.toMap(SysDictData::getDictCode, SysDictData::getDictLabel, (k1, k2) -> k1));

        // èŽ·å–物料消耗数据
        List<ProductionProductMain> mains = productionProductMainService.lambdaQuery()
                .ge(ProductionProductMain::getCreateTime, start)
                .lt(ProductionProductMain::getCreateTime, end)
                .list();

        List<Long> mainIds = mains.stream().map(ProductionProductMain::getId).collect(Collectors.toList());
        List<Long> orderIds = mains.stream().map(ProductionProductMain::getProductOrderId).distinct().collect(Collectors.toList());

        Map<Long, List<ProductionProductInput>> inputsByMain = new HashMap<>();
        Map<Long, ProductOrder> orderMap = new HashMap<>();
        Map<Long, ProductionOrderRoute> orderRouteMap = new HashMap<>();
        Map<Long, List<ProductionOrderStructure>> structuresByOrder = new HashMap<>();

        if (!mainIds.isEmpty()) {
            inputsByMain = productionProductInputService.lambdaQuery()
                    .in(ProductionProductInput::getProductMainId, mainIds)
                    .list()
                    .stream()
                    .collect(Collectors.groupingBy(ProductionProductInput::getProductMainId));
        }

        if (!orderIds.isEmpty()) {
            orderMap = productOrderService.lambdaQuery()
                    .in(ProductOrder::getId, orderIds)
                    .list()
                    .stream()
                    .collect(Collectors.toMap(ProductOrder::getId, o -> o));

            orderRouteMap = productionOrderRouteService.lambdaQuery()
                    .in(ProductionOrderRoute::getOrderId, orderIds)
                    .list()
                    .stream()
                    .collect(Collectors.toMap(ProductionOrderRoute::getOrderId, r -> r, (k1, k2) -> k1));

            structuresByOrder = productionOrderStructureService.lambdaQuery()
                    .in(ProductionOrderStructure::getOrderId, orderIds)
                    .list()
                    .stream()
                    .collect(Collectors.groupingBy(ProductionOrderStructure::getOrderId));
        }

        // èŽ·å–能耗数据
        LocalDate startDate = date;
        LocalDate endDate = date.plusMonths(1);
        List<EnergyConsumptionDetail> energyDetails = energyConsumptionDetailService.lambdaQuery()
                .ge(EnergyConsumptionDetail::getMeterReadingDate, startDate)
                .lt(EnergyConsumptionDetail::getMeterReadingDate, endDate)
                .list();

        List<Energy> energies = energyService.list();
        Map<String, Energy> energyMap = new HashMap<>();
        for (Energy energy : energies) {
            if (energy.getEnergyName() != null) {
                energyMap.put(energy.getEnergyName(), energy);
            }
        }

        List<ProductMaterialSku> allSkus = productMaterialSkuService.list();
        Map<Long, Long> skuToMaterialMap = allSkus.stream()
                .filter(sku -> sku.getProductId() != null)
                .collect(Collectors.toMap(ProductMaterialSku::getId, ProductMaterialSku::getProductId, (k1, k2) -> k1));

        // è®¡ç®—实际值
        for (ProductionSettlementDetailsDto detail : dtoList) {
            BigDecimal actualQty = BigDecimal.ZERO;
            BigDecimal actualTotalCost = BigDecimal.ZERO;

            if (ProductionSettlementEnum.isMaterialCost(detail.getCategory())) {
                if (detail.getProductId() != null) {
                    for (ProductionProductMain main : mains) {
                        ProductOrder order = orderMap.get(main.getProductOrderId());
                        if (order == null) continue;

                        String targetType = detail.getProductType() != null ? detail.getProductType().trim() : "";
                        boolean typeMatch = "综合".equals(targetType);

                        if (!typeMatch) {
                            ProductionOrderRoute route = orderRouteMap.get(main.getProductOrderId());
                            if (route != null && route.getDictCode() != null) {
                                String dictLabel = dictCodeMap.get(route.getDictCode());
                                if (dictLabel != null && dictLabel.trim().equals(targetType)) {
                                    typeMatch = true;
                                }
                            }
                        }

                        if (!typeMatch && order.getStrength() != null && order.getStrength().trim().equals(targetType)) {
                            typeMatch = true;
                        }

                        if (typeMatch) {
                            List<ProductionProductInput> mainInputs = inputsByMain.get(main.getId());
                            if (mainInputs != null) {
                                for (ProductionProductInput input : mainInputs) {
                                    Long inputMaterialId = skuToMaterialMap.get(input.getProductId());
                                    if (Objects.equals(inputMaterialId, detail.getProductId())) {
                                        BigDecimal rawQty = input.getQuantity() != null ? input.getQuantity() : BigDecimal.ZERO;

                                        List<ProductionOrderStructure> orderStructures = structuresByOrder.get(order.getId());
                                        BigDecimal unitPrice = BigDecimal.ZERO;
                                        String unit = "";
                                        if (orderStructures != null) {
                                            for (ProductionOrderStructure structure : orderStructures) {
                                                Long structureMaterialId = skuToMaterialMap.get(structure.getProductModelId());
                                                if (Objects.equals(structureMaterialId, detail.getProductId())) {
                                                    unitPrice = structure.getUnitPrice() != null ? structure.getUnitPrice() : BigDecimal.ZERO;
                                                    unit = structure.getUnit();
                                                    break;
                                                }
                                            }
                                        }
                                        actualTotalCost = actualTotalCost.add(rawQty.multiply(unitPrice));
                                        BigDecimal tonnage = UnitUtils.convertValueToTon(rawQty, unit);
                                        actualQty = actualQty.add(tonnage);
                                    }
                                }
                            }
                        }
                    }
                }

                detail.setActualQty(actualQty);
                detail.setActualTotal(actualTotalCost);
                if (actualQty.compareTo(BigDecimal.ZERO) > 0) {
                    detail.setActualPrice(actualTotalCost.divide(actualQty, 15, RoundingMode.HALF_UP));
                } else {
                    detail.setActualPrice(BigDecimal.ZERO);
                }

            } else if ("能耗成本".equals(detail.getCategory())) {
                Energy energy = energyMap.get(detail.getSubjectName());
                if (energy != null) {
                    BigDecimal unitPrice = energy.getUnitPrice() != null ? energy.getUnitPrice() : BigDecimal.ZERO;
                    for (EnergyConsumptionDetail eDetail : energyDetails) {
                        if (Objects.equals(eDetail.getEnergyId(), energy.getId())) {
                            actualQty = actualQty.add(eDetail.getDosage() != null ? eDetail.getDosage() : BigDecimal.ZERO);
                        }
                    }
                    detail.setActualQty(actualQty);
                    detail.setActualPrice(unitPrice);
                    detail.setActualTotal(actualQty.multiply(unitPrice));
                } else {
                    detail.setActualQty(BigDecimal.ZERO);
                    detail.setActualPrice(BigDecimal.ZERO);
                    detail.setActualTotal(BigDecimal.ZERO);
                }
            } else {
                detail.setActualQty(BigDecimal.ZERO);
                detail.setActualPrice(BigDecimal.ZERO);
                detail.setActualTotal(BigDecimal.ZERO);
            }

            // å·®å¼‚值百分比计算
            detail.setDiffQty(calculatePercentage(detail.getActualQty(), detail.getBudgetQty()));
            detail.setDiffPrice(calculatePercentage(detail.getActualPrice(), detail.getBudgetPrice()));
            detail.setDiffTotal(calculatePercentage(detail.getActualTotal(), detail.getBudgetTotal()));
        }

        return dtoList.stream().collect(Collectors.groupingBy(ProductionSettlementDetailsDto::getCategory));
    }

    @Override
    public List<String> getProductTypes(ProductionSettlementDto dto) {
        String finalPeriodTime = parsePeriodTime(dto != null ? dto.getPeriodTime() : null);

        ProductionSettlementBatches batch = this.lambdaQuery()
                .eq(ProductionSettlementBatches::getPeriodTime, finalPeriodTime)
                .one();
        if (batch == null) {
            return new ArrayList<>();
        }

        return productionSettlementDetailsService.lambdaQuery()
                .eq(ProductionSettlementDetails::getBatchId, batch.getId())
                .list()
                .stream()
                .map(ProductionSettlementDetails::getProductType)
                .filter(StringUtils::isNotBlank)
                .distinct()
                .collect(Collectors.toList());
    }


    @Override
    public List<String> getSubjectNames(ProductionSettlementDto dto) {
        String finalPeriodTime = parsePeriodTime(dto != null ? dto.getPeriodTime() : null);

        ProductionSettlementBatches batch = this.lambdaQuery()
                .eq(ProductionSettlementBatches::getPeriodTime, finalPeriodTime)
                .one();
        if (batch == null) {
            return new ArrayList<>();
        }

        return productionSettlementDetailsService.lambdaQuery()
                .eq(ProductionSettlementDetails::getBatchId, batch.getId())
                .list()
                .stream()
                .map(ProductionSettlementDetails::getSubjectName)
                .filter(StringUtils::isNotBlank)
                .distinct()
                .collect(Collectors.toList());
    }

    /**
     * æ ¸ç®—月份，为空时默认取当前月，格式为 yyyy-MM
     */
    private String parsePeriodTime(String periodTime) {
        if (StringUtils.isBlank(periodTime)) {
            return YearMonth.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
        }
        try {
            return YearMonth.parse(periodTime, DateTimeFormatter.ofPattern("yyyy-MM"))
                    .format(DateTimeFormatter.ofPattern("yyyy-MM"));
        } catch (Exception e) {
            throw new ServiceException("日期格式错误，请使用 yyyy-MM æ ¼å¼");
        }
    }

    private String calculatePercentage(BigDecimal actual, BigDecimal budget) {
        if (budget == null || budget.compareTo(BigDecimal.ZERO) == 0) {
            return actual.compareTo(BigDecimal.ZERO) > 0 ? "100%" : "0%";
        }
        BigDecimal diff = actual.subtract(budget);
        BigDecimal percentage = diff.divide(budget, 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100"));
        return percentage.stripTrailingZeros().toPlainString() + "%";
    }

    @Override
    public ProductionSettlementTotalDto getTotalCosts(ProductionSettlementDto dto) {
        // å¤ç”¨ getSettlement èŽ·å–含实际值的明细列表
        Map<String, List<ProductionSettlementDetailsDto>> settlementMap = getSettlement(dto);

        List<ProductionSettlementDetailsDto> allDetails = settlementMap.values().stream()
                .flatMap(List::stream)
                .collect(Collectors.toList());

        // æŒ‰ dto ä¸­çš„其余条件在内存中过滤
        if (dto != null) {
            if (StringUtils.isNotBlank(dto.getProductType())) {
                String targetType = dto.getProductType().trim();
                allDetails = allDetails.stream()
                        .filter(d -> targetType.equals(d.getProductType() != null ? d.getProductType().trim() : ""))
                        .collect(Collectors.toList());
            }
            if (StringUtils.isNotBlank(dto.getSubjectName())) {
                String targetSubject = dto.getSubjectName().trim();
                allDetails = allDetails.stream()
                        .filter(d -> targetSubject.equals(d.getSubjectName() != null ? d.getSubjectName().trim() : ""))
                        .collect(Collectors.toList());
            }
            if (StringUtils.isNotBlank(dto.getCostType())) {
                String targetCostType = dto.getCostType().trim();
                allDetails = allDetails.stream()
                        .filter(d -> targetCostType.equals(d.getCategory() != null ? d.getCategory().trim() : ""))
                        .collect(Collectors.toList());
            }
        }

        // æ±‡æ€»æ ‡å‡†æˆæœ¬ä¸Žå®žé™…成本
        BigDecimal budgetTotal = allDetails.stream()
                .map(d -> d.getBudgetTotal() != null ? d.getBudgetTotal() : BigDecimal.ZERO)
                .reduce(BigDecimal.ZERO, BigDecimal::add);

        BigDecimal actualTotal = allDetails.stream()
                .map(d -> d.getActualTotal() != null ? d.getActualTotal() : BigDecimal.ZERO)
                .reduce(BigDecimal.ZERO, BigDecimal::add);

        BigDecimal diffTotal = actualTotal.subtract(budgetTotal);

        // å·®å¼‚率：带正负号
        String diffRate;
        if (budgetTotal.compareTo(BigDecimal.ZERO) == 0) {
            diffRate = actualTotal.compareTo(BigDecimal.ZERO) > 0 ? "+100%" : "0%";
        } else {
            BigDecimal rate = diffTotal.divide(budgetTotal, 4, RoundingMode.HALF_UP)
                    .multiply(new BigDecimal("100"));
            String sign = rate.compareTo(BigDecimal.ZERO) >= 0 ? "+" : "";
            diffRate = sign + rate.stripTrailingZeros().toPlainString() + "%";
        }

        ProductionSettlementTotalDto result = new ProductionSettlementTotalDto();
        result.setBudgetTotal(budgetTotal);
        result.setActualTotal(actualTotal);
        result.setDiffTotal(diffTotal);
        result.setDiffRate(diffRate);
        return result;
    }
}

 src/main/java/com/ruoyi/productionPlan/service/impl/ProductionPlanServiceImpl.java

@@ -120,6 +120,10 @@
        //  æŸ¥è¯¢ä¸»ç”Ÿäº§è®¡åˆ’
        List<ProductionPlanDto> plans = productionPlanMapper.selectWithMaterialByIds(productionPlanDto.getIds());

        if (plans == null || plans.isEmpty()) {
            throw new ServiceException("下发失败,生产计划不存在");
        }

        //  æ ¡éªŒæ˜¯å¦å­˜åœ¨ä¸åŒçš„产品名称
        String firstProductName = plans.get(0).getProductName();
        if (plans.stream().anyMatch(p -> p.getProductName() == null || !p.getProductName().equals(firstProductName))) {
@@ -148,7 +152,7 @@
        productOrder.setPlanCompleteTime(productionPlanDto.getPlanCompleteTime());
        productOrder.setStatus(ProductOrderStatusEnum.WAIT.getCode());
        productOrder.setStrength(productionPlanDto.getStrength());
        productOrder.setProductMaterialSkuId(productionPlanDto.getProductMaterialSkuId());
        productOrder.setProductMaterialSkuId(plans.get(0).getProductMaterialSkuId());

        Long orderId = productOrderService.insertProductOrder(productOrder);

@@ -230,9 +234,17 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean update(ProductionPlanDto productionPlanDto) {
        if (productionPlanDto == null) {
            throw new ServiceException("编辑失败,数据不能为空");
        }
        ProductionPlan productionPlan = getById(productionPlanDto.getId());
        if (productionPlan == null) {
            throw new ServiceException("编辑失败,主生产计划不存在");
        }

        // å·²ä¸‹å‘状态，不能编辑
        if (productionPlanDto.getStatus() != 0) {
            throw new BaseException("已下发或部分下发状态，不能编辑");
        if (productionPlan.getStatus() != 0) {
            throw new BaseException("编辑失败,该生产计划已下发或部分下发状态,禁止编辑");
        }
        // æŸ¥è¯¢æ˜¯å¦æœ‰å…³è”订单
        boolean hasProductOrderPlan = productOrderPlanMapper.selectList(Wrappers.<ProductOrderPlan>lambdaQuery().eq(ProductOrderPlan::getProductionPlanId, productionPlanDto.getId())).stream().anyMatch(p -> p.getProductOrderId() != null);

 src/main/java/com/ruoyi/productionPlan/service/impl/SalesDeliveryServiceImpl.java

@@ -7,7 +7,10 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.framework.util.AliDingUtils;
import com.ruoyi.production.pojo.ProductMaterial;
import com.ruoyi.production.pojo.ProductMaterialSku;
import com.ruoyi.production.service.ProductMaterialService;
import com.ruoyi.production.service.ProductMaterialSkuService;
import com.ruoyi.productionPlan.enums.DataSourceTypeEnum;
import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.productionPlan.pojo.SalesDelivery;
@@ -41,6 +44,12 @@

    @Autowired
    private SalesDeliveryMapper salesDeliveryMapper;

    @Autowired
    private ProductMaterialSkuService productMaterialSkuService;

    @Autowired
    private ProductMaterialService productMaterialService;

    @Autowired
    private AliDingConfig aliDingConfig;
@@ -125,18 +134,24 @@
                salesDelivery.setSalesman(formData.getString("textField_ladnkyu1"));//业务员
                salesDelivery.setDeliveryMethod(formData.getString("radioField_ldoc0027"));//发货方式
                String materialCode = row.getString("textField_l92dg1tc");
                // æ ¹æ®ç‰©æ–™ç¼–码查询物料信息表，关联物料ID
//                if (StringUtils.isNotEmpty(materialCode)) {
//                    LambdaQueryWrapper<ProductMaterialSku> skuQueryWrapper = new LambdaQueryWrapper<>();
//                    skuQueryWrapper.eq(ProductMaterialSku::getMaterialCode, materialCode);
//                    ProductMaterialSku sku = productMaterialSkuService.getOne(skuQueryWrapper);
//                    if (sku != null) {
//                        salesDelivery.setProductMaterialSkuId(sku.getId());
//                    }
//                }
                String productName = row.getString("textField_l96srw8x");
                String model = row.getString("textField_l9tljfl8");
                // å¦‚果名字为空编码不为空
                if (StringUtils.isNotEmpty(materialCode) && StringUtils.isEmpty(productName)) {
                    LambdaQueryWrapper<ProductMaterialSku> skuQueryWrapper = new LambdaQueryWrapper<>();
                    skuQueryWrapper.eq(ProductMaterialSku::getMaterialCode, materialCode);
                    ProductMaterialSku sku = productMaterialSkuService.getOne(skuQueryWrapper);
                    if (sku != null) {
                        ProductMaterial material = productMaterialService.getById(sku.getProductId());
                        productName=material.getProductName();
                        model=sku.getModel();
                    }
                }else if (StringUtils.isEmpty(productName) && StringUtils.isEmpty(materialCode)){
                    continue;
                }
                salesDelivery.setMaterialCode(materialCode);//物料编码
                salesDelivery.setProductName(row.getString("textField_l96srw8x"));//产品名称
                salesDelivery.setModel(row.getString("textField_l9tljfl8"));//产品规格
                salesDelivery.setProductName(productName);//产品名称
                salesDelivery.setModel(model);//产品规格
                salesDelivery.setVolume(row.getBigDecimal("numberField_kt8b0qsg_value"));//方量
                salesDelivery.setUnitPrice(row.getBigDecimal("numberField_la0tb2x9_value"));//单价
                salesDelivery.setPrice(row.getBigDecimal("numberField_l9w2piwf"));//ä»·æ ¼

 src/main/java/com/ruoyi/productionPlan/task/SalesDeliveryTask.java

@@ -16,7 +16,7 @@
    @Autowired
    private SalesDeliveryService salesDeliveryService;

    @Scheduled(cron = "0 0 0 * * ?")
    @Scheduled(cron = "0 22 10 * * ?")
    public void syncSalesDeliveryJob() {
        salesDeliveryService.syncSalesDeliveryJob();
    }