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

囤积成本重构

Browse Source
This commit is contained in:
86156
2025-12-03 10:32:06 +08:00
parent 39861ec701
commit 61453c0a82
18 changed files with 253 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
klp-wms/src/main/java/com/klp/controller/CostCoilDailyController.java → klp-wms/src/main/java/com/klp/controller/WmsCostCoilDailyController.java
View File

@@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import java.util.Arrays;
import com.klp.service.IWmsCostCoilDailyService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -18,9 +19,8 @@ import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.CostCoilDailyVo;
import com.klp.domain.bo.CostCoilDailyBo;
import com.klp.service.ICostCoilDailyService;
import com.klp.domain.vo.WmsCostCoilDailyVo;
import com.klp.domain.bo.WmsCostCoilDailyBo;
import com.klp.common.core.page.TableDataInfo;
import java.time.LocalDate;
@@ -37,16 +37,16 @@ import org.springframework.format.annotation.DateTimeFormat;
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/cost/coil")
public class CostCoilDailyController extends BaseController {
public class WmsCostCoilDailyController extends BaseController {
private final ICostCoilDailyService iCostCoilDailyService;
private final IWmsCostCoilDailyService iWmsCostCoilDailyService;
/**
* 查询钢卷日成本记录表列表
*/
@GetMapping("/list")
public TableDataInfo<CostCoilDailyVo> list(CostCoilDailyBo bo, PageQuery pageQuery) {
return iCostCoilDailyService.queryPageList(bo, pageQuery);
public TableDataInfo<WmsCostCoilDailyVo> list(WmsCostCoilDailyBo bo, PageQuery pageQuery) {
return iWmsCostCoilDailyService.queryPageList(bo, pageQuery);
}
/**
@@ -54,9 +54,9 @@ public class CostCoilDailyController extends BaseController {
*/
@Log(title = "钢卷日成本记录表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CostCoilDailyBo bo, HttpServletResponse response) {
List<CostCoilDailyVo> list = iCostCoilDailyService.queryList(bo);
ExcelUtil.exportExcel(list, "钢卷日成本记录表", CostCoilDailyVo.class, response);
public void export(WmsCostCoilDailyBo bo, HttpServletResponse response) {
List<WmsCostCoilDailyVo> list = iWmsCostCoilDailyService.queryList(bo);
ExcelUtil.exportExcel(list, "钢卷日成本记录表", WmsCostCoilDailyVo.class, response);
}
/**
@@ -65,9 +65,9 @@ public class CostCoilDailyController extends BaseController {
* @param costId 主键
*/
@GetMapping("/{costId}")
public R<CostCoilDailyVo> getInfo(@NotNull(message = "主键不能为空")
public R<WmsCostCoilDailyVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long costId) {
return R.ok(iCostCoilDailyService.queryById(costId));
return R.ok(iWmsCostCoilDailyService.queryById(costId));
}
/**
@@ -76,8 +76,8 @@ public class CostCoilDailyController extends BaseController {
@Log(title = "钢卷日成本记录表", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CostCoilDailyBo bo) {
return toAjax(iCostCoilDailyService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCostCoilDailyBo bo) {
return toAjax(iWmsCostCoilDailyService.insertByBo(bo));
}
/**
@@ -86,8 +86,8 @@ public class CostCoilDailyController extends BaseController {
@Log(title = "钢卷日成本记录表", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CostCoilDailyBo bo) {
return toAjax(iCostCoilDailyService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCostCoilDailyBo bo) {
return toAjax(iWmsCostCoilDailyService.updateByBo(bo));
}
/**
@@ -99,7 +99,7 @@ public class CostCoilDailyController extends BaseController {
@DeleteMapping("/{costIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] costIds) {
return toAjax(iCostCoilDailyService.deleteWithValidByIds(Arrays.asList(costIds), true));
return toAjax(iWmsCostCoilDailyService.deleteWithValidByIds(Arrays.asList(costIds), true));
}
/**
@@ -111,7 +111,7 @@ public class CostCoilDailyController extends BaseController {
@PostMapping("/calculate")
public R<Map<String, Object>> calculateCost(@RequestParam(required = false) Long coilId,
@RequestParam(required = false) LocalDateTime calcTime) {
Map<String, Object> result = iCostCoilDailyService.calculateCost(coilId, calcTime);
Map<String, Object> result = iWmsCostCoilDailyService.calculateCost(coilId, calcTime);
if (result.containsKey("error")) {
return R.fail(result.get("error").toString());
}
@@ -127,7 +127,6 @@ public class CostCoilDailyController extends BaseController {
@PostMapping("/batchCalculateCost")
public R<List<Map<String, Object>>> batchCalculateCost(@RequestParam String coilIds,
@RequestParam(required = false) LocalDateTime calcTime) {
// 解析coilIds字符串为Long列表
List<Long> coilIdList = new java.util.ArrayList<>();
if (coilIds != null && !coilIds.trim().isEmpty()) {
String[] ids = coilIds.split(",");
@@ -136,12 +135,11 @@ public class CostCoilDailyController extends BaseController {
Long coilId = Long.parseLong(id.trim());
coilIdList.add(coilId);
} catch (NumberFormatException e) {
// 忽略无效的ID
}
}
}
List<Map<String, Object>> results = iCostCoilDailyService.batchCalculateCost(coilIdList, calcTime);
List<Map<String, Object>> results = iWmsCostCoilDailyService.batchCalculateCost(coilIdList, calcTime);
return R.ok(results);
}
@@ -156,7 +154,7 @@ public class CostCoilDailyController extends BaseController {
if (calcDate == null) {
calcDate = LocalDate.now().minusDays(1);
}
int count = iCostCoilDailyService.calculateDailyCost(calcDate);
int count = iWmsCostCoilDailyService.calculateDailyCost(calcDate);
return R.ok(count);
}
@@ -173,7 +171,7 @@ public class CostCoilDailyController extends BaseController {
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
@RequestParam(required = false) String groupBy,
@RequestParam(required = false) Long warehouseId) {
Map<String, Object> result = iCostCoilDailyService.queryCostSummary(startDate, endDate, groupBy, warehouseId);
Map<String, Object> result = iWmsCostCoilDailyService.queryCostSummary(startDate, endDate, groupBy, warehouseId);
return R.ok(result);
}
@@ -186,7 +184,7 @@ public class CostCoilDailyController extends BaseController {
@GetMapping("/report/trend")
public R<List<Map<String, Object>>> queryCostTrend(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate) {
List<Map<String, Object>> result = iCostCoilDailyService.queryCostTrend(startDate, endDate);
List<Map<String, Object>> result = iWmsCostCoilDailyService.queryCostTrend(startDate, endDate);
return R.ok(result);
}
@@ -199,7 +197,7 @@ public class CostCoilDailyController extends BaseController {
@PostMapping("/calculateByEnterCoilNo")
public R<Map<String, Object>> calculateCostByEnterCoilNo(@RequestParam String enterCoilNo,
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate calcDate) {
Map<String, Object> result = iCostCoilDailyService.calculateCostByEnterCoilNo(enterCoilNo, calcDate);
Map<String, Object> result = iWmsCostCoilDailyService.calculateCostByEnterCoilNo(enterCoilNo, calcDate);
if (result.containsKey("error")) {
return R.fail(result.get("error").toString());
}
@@ -214,7 +212,7 @@ public class CostCoilDailyController extends BaseController {
@RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate calcDate,
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
@RequestParam(required = false, defaultValue = "20") Integer pageSize) {
Map<String, Object> result = iCostCoilDailyService.searchMaterialCost(enterCoilNo, calcDate, pageNum, pageSize);
Map<String, Object> result = iWmsCostCoilDailyService.searchMaterialCost(enterCoilNo, calcDate, pageNum, pageSize);
return R.ok(result);
}
@@ -229,7 +227,7 @@ public class CostCoilDailyController extends BaseController {
if (calcDate == null) {
calcDate = LocalDate.now().minusDays(1);
}
int count = iCostCoilDailyService.calculateDailyCostByEnterCoilNo(calcDate);
int count = iWmsCostCoilDailyService.calculateDailyCostByEnterCoilNo(calcDate);
return R.ok(count);
}
@@ -244,7 +242,7 @@ public class CostCoilDailyController extends BaseController {
public R<List<Map<String, Object>>> queryCostByEnterCoilNo(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate startDate,
@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate endDate,
@RequestParam(required = false) String enterCoilNo) {
List<Map<String, Object>> result = iCostCoilDailyService.queryCostByEnterCoilNo(startDate, endDate, enterCoilNo);
List<Map<String, Object>> result = iWmsCostCoilDailyService.queryCostByEnterCoilNo(startDate, endDate, enterCoilNo);
return R.ok(result);
}
@@ -255,7 +253,7 @@ public class CostCoilDailyController extends BaseController {
public R<Map<String, Object>> queryStockpile(@RequestParam(required = false) String enterCoilNo,
@RequestParam(required = false) String currentCoilNo,
PageQuery pageQuery) {
Map<String, Object> result = iCostCoilDailyService.queryStockpileCostList(enterCoilNo, currentCoilNo, pageQuery);
Map<String, Object> result = iWmsCostCoilDailyService.queryStockpileCostList(enterCoilNo, currentCoilNo, pageQuery);
return R.ok(result);
}
@@ -265,7 +263,7 @@ public class CostCoilDailyController extends BaseController {
*/
@GetMapping("/overview")
public R<Map<String, Object>> overview() {
Map<String, Object> result = iCostCoilDailyService.queryOverview();
Map<String, Object> result = iWmsCostCoilDailyService.queryOverview();
return R.ok(result);
}
}

38
klp-wms/src/main/java/com/klp/controller/CostStandardConfigController.java → klp-wms/src/main/java/com/klp/controller/WmsCostStandardConfigController.java
View File

@@ -3,6 +3,7 @@ package com.klp.controller;
import java.util.List;
import java.util.Arrays;
import com.klp.service.IWmsCostStandardConfigService;
import lombok.RequiredArgsConstructor;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
@@ -17,9 +18,8 @@ import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.domain.vo.CostStandardConfigVo;
import com.klp.domain.bo.CostStandardConfigBo;
import com.klp.service.ICostStandardConfigService;
import com.klp.domain.vo.WmsCostStandardConfigVo;
import com.klp.domain.bo.WmsCostStandardConfigBo;
import com.klp.common.core.page.TableDataInfo;
/**
@@ -32,16 +32,16 @@ import com.klp.common.core.page.TableDataInfo;
@RequiredArgsConstructor
@RestController
@RequestMapping("/wms/cost/standard")
public class CostStandardConfigController extends BaseController {
public class WmsCostStandardConfigController extends BaseController {
private final ICostStandardConfigService iCostStandardConfigService;
private final IWmsCostStandardConfigService iWmsCostStandardConfigService;
/**
* 查询成本标准配置表列表
*/
@GetMapping("/list")
public TableDataInfo<CostStandardConfigVo> list(CostStandardConfigBo bo, PageQuery pageQuery) {
return iCostStandardConfigService.queryPageList(bo, pageQuery);
public TableDataInfo<WmsCostStandardConfigVo> list(WmsCostStandardConfigBo bo, PageQuery pageQuery) {
return iWmsCostStandardConfigService.queryPageList(bo, pageQuery);
}
/**
@@ -49,9 +49,9 @@ public class CostStandardConfigController extends BaseController {
*/
@Log(title = "成本标准配置表", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CostStandardConfigBo bo, HttpServletResponse response) {
List<CostStandardConfigVo> list = iCostStandardConfigService.queryList(bo);
ExcelUtil.exportExcel(list, "成本标准配置表", CostStandardConfigVo.class, response);
public void export(WmsCostStandardConfigBo bo, HttpServletResponse response) {
List<WmsCostStandardConfigVo> list = iWmsCostStandardConfigService.queryList(bo);
ExcelUtil.exportExcel(list, "成本标准配置表", WmsCostStandardConfigVo.class, response);
}
/**
@@ -60,17 +60,17 @@ public class CostStandardConfigController extends BaseController {
* @param configId 主键
*/
@GetMapping("/{configId}")
public R<CostStandardConfigVo> getInfo(@NotNull(message = "主键不能为空")
public R<WmsCostStandardConfigVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Long configId) {
return R.ok(iCostStandardConfigService.queryById(configId));
return R.ok(iWmsCostStandardConfigService.queryById(configId));
}
/**
* 查询当前有效的成本标准
*/
@GetMapping("/current")
public R<CostStandardConfigVo> getCurrent() {
return R.ok(iCostStandardConfigService.queryCurrentEffective());
public R<WmsCostStandardConfigVo> getCurrent() {
return R.ok(iWmsCostStandardConfigService.queryCurrentEffective());
}
/**
@@ -79,8 +79,8 @@ public class CostStandardConfigController extends BaseController {
@Log(title = "成本标准配置表", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CostStandardConfigBo bo) {
return toAjax(iCostStandardConfigService.insertByBo(bo));
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCostStandardConfigBo bo) {
return toAjax(iWmsCostStandardConfigService.insertByBo(bo));
}
/**
@@ -89,8 +89,8 @@ public class CostStandardConfigController extends BaseController {
@Log(title = "成本标准配置表", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CostStandardConfigBo bo) {
return toAjax(iCostStandardConfigService.updateByBo(bo));
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCostStandardConfigBo bo) {
return toAjax(iWmsCostStandardConfigService.updateByBo(bo));
}
/**
@@ -102,7 +102,7 @@ public class CostStandardConfigController extends BaseController {
@DeleteMapping("/{configIds}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] configIds) {
return toAjax(iCostStandardConfigService.deleteWithValidByIds(Arrays.asList(configIds), true));
return toAjax(iWmsCostStandardConfigService.deleteWithValidByIds(Arrays.asList(configIds), true));
}
}