DeXun/xgy-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化成本计算问题，加入辅料备件分摊页面

Browse Source
This commit is contained in:
86156
2026-01-26 19:29:11 +08:00
parent 50fa87115d
commit d5cbaab645
14 changed files with 1754 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klp-ems/src/main/java/com/klp/ems/controller/EnergyCostReportController.java
View File

@@ -17,6 +17,8 @@ import com.klp.ems.domain.vo.EnergyCostSummaryVo;
import com.klp.ems.domain.vo.WarehouseProductionCoilVo;
import com.klp.ems.domain.vo.WarehouseProductionStatVo;
import com.klp.ems.domain.vo.WmsEnergyCoilDailyVo;
import com.klp.ems.domain.vo.AuxMaterialBreakdownVo;
import com.klp.ems.domain.vo.SparePartBreakdownVo;
import com.klp.ems.service.IEnergyCostReportService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -111,4 +113,16 @@ public class EnergyCostReportController extends BaseController {
}).collect(Collectors.toList());
ExcelUtil.exportExcel(exportList, "入场卷成本汇总", CoilTotalMergedExportVo.class, response);
}
@Log(title = "辅料分摊构成", businessType = BusinessType.OTHER)
@GetMapping("/material/aux/breakdown")
public TableDataInfo<AuxMaterialBreakdownVo> auxMaterialBreakdown(CoilTotalCostBo bo, PageQuery pageQuery) {
return reportService.auxMaterialBreakdown(bo, pageQuery);
}
@Log(title = "备件分摊构成", businessType = BusinessType.OTHER)
@GetMapping("/material/spare/breakdown")
public TableDataInfo<SparePartBreakdownVo> sparePartBreakdown(CoilTotalCostBo bo, PageQuery pageQuery) {
return reportService.sparePartBreakdown(bo, pageQuery);
}
}

9
klp-ems/src/main/java/com/klp/ems/controller/WmsEnergyCoilDailyController.java
View File

@@ -65,6 +65,15 @@ public class WmsEnergyCoilDailyController extends BaseController {
return R.ok(statistics);
}
/**
* 查询待操作钢卷的能源成本详情（单卷）
*/
@GetMapping("/pendingAction/detail")
public R<WmsEnergyCoilDailyVo> pendingActionDetail(@NotNull @RequestParam Long coilId) {
WmsEnergyCoilDailyVo detail = coilDailyService.queryPendingActionCoilCostDetail(coilId);
return R.ok(detail);
}
@Log(title = "钢卷能源分摊", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(WmsEnergyCoilDailyBo bo, HttpServletResponse response) {