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));
}
}

6
klp-wms/src/main/java/com/klp/domain/CostCoilDaily.java → klp-wms/src/main/java/com/klp/domain/WmsCostCoilDaily.java
View File

@@ -9,15 +9,15 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 钢卷日成本记录表对象 cost_coil_daily
* 钢卷日成本记录表对象 wms_cost_coil_daily
*
* @author klp
* @date 2025-11-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cost_coil_daily")
public class CostCoilDaily extends BaseEntity {
@TableName("wms_cost_coil_daily")
public class WmsCostCoilDaily extends BaseEntity {
private static final long serialVersionUID = 1L;

6
klp-wms/src/main/java/com/klp/domain/CostStandardConfig.java → klp-wms/src/main/java/com/klp/domain/WmsCostStandardConfig.java
View File

@@ -9,15 +9,15 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 成本标准配置表对象 cost_standard_config
* 成本标准配置表对象 wms_cost_standard_config
*
* @author klp
* @date 2025-11-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("cost_standard_config")
public class CostStandardConfig extends BaseEntity {
@TableName("wms_cost_standard_config")
public class WmsCostStandardConfig extends BaseEntity {
private static final long serialVersionUID = 1L;

4
klp-wms/src/main/java/com/klp/domain/bo/CostCoilDailyBo.java → klp-wms/src/main/java/com/klp/domain/bo/WmsCostCoilDailyBo.java
View File

@@ -8,14 +8,14 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 钢卷日成本记录表业务对象 cost_coil_daily
* 钢卷日成本记录表业务对象 wms_cost_coil_daily
*
* @author klp
* @date 2025-11-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CostCoilDailyBo extends BaseEntity {
public class WmsCostCoilDailyBo extends BaseEntity {
/**
* 主键ID

4
klp-wms/src/main/java/com/klp/domain/bo/CostStandardConfigBo.java → klp-wms/src/main/java/com/klp/domain/bo/WmsCostStandardConfigBo.java
View File

@@ -8,14 +8,14 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 成本标准配置表业务对象 cost_standard_config
* 成本标准配置表业务对象 wms_cost_standard_config
*
* @author klp
* @date 2025-11-25
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CostStandardConfigBo extends BaseEntity {
public class WmsCostStandardConfigBo extends BaseEntity {
/**
* 主键ID

4
klp-wms/src/main/java/com/klp/domain/vo/CostCoilDailyVo.java → klp-wms/src/main/java/com/klp/domain/vo/WmsCostCoilDailyVo.java
View File

@@ -8,14 +8,14 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 钢卷日成本记录表视图对象 cost_coil_daily
* 钢卷日成本记录表视图对象 wms_cost_coil_daily
*
* @author klp
* @date 2025-11-25
*/
@Data
@ExcelIgnoreUnannotated
public class CostCoilDailyVo {
public class WmsCostCoilDailyVo {
/**
* 主键ID

4
klp-wms/src/main/java/com/klp/domain/vo/CostStandardConfigVo.java → klp-wms/src/main/java/com/klp/domain/vo/WmsCostStandardConfigVo.java
View File

@@ -8,14 +8,14 @@ import java.math.BigDecimal;
import java.time.LocalDate;
/**
* 成本标准配置表视图对象 cost_standard_config
* 成本标准配置表视图对象 wms_cost_standard_config
*
* @author klp
* @date 2025-11-25
*/
@Data
@ExcelIgnoreUnannotated
public class CostStandardConfigVo {
public class WmsCostStandardConfigVo {
/**
* 主键ID

6
klp-wms/src/main/java/com/klp/mapper/CostCoilDailyMapper.java → klp-wms/src/main/java/com/klp/mapper/WmsCostCoilDailyMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.mapper;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.domain.CostCoilDaily;
import com.klp.domain.vo.CostCoilDailyVo;
import com.klp.domain.WmsCostCoilDaily;
import com.klp.domain.vo.WmsCostCoilDailyVo;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDate;
@@ -15,7 +15,7 @@ import java.util.Map;
* @author klp
* @date 2025-11-25
*/
public interface CostCoilDailyMapper extends BaseMapperPlus<CostCoilDailyMapper, CostCoilDaily, CostCoilDailyVo> {
public interface WmsCostCoilDailyMapper extends BaseMapperPlus<WmsCostCoilDailyMapper, WmsCostCoilDaily, WmsCostCoilDailyVo> {
/**
* 查询成本统计汇总

10
klp-wms/src/main/java/com/klp/mapper/CostStandardConfigMapper.java → klp-wms/src/main/java/com/klp/mapper/WmsCostStandardConfigMapper.java
View File

@@ -1,7 +1,7 @@
package com.klp.mapper;
import com.klp.domain.CostStandardConfig;
import com.klp.domain.vo.CostStandardConfigVo;
import com.klp.domain.WmsCostStandardConfig;
import com.klp.domain.vo.WmsCostStandardConfigVo;
import com.klp.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
@@ -13,7 +13,7 @@ import java.time.LocalDate;
* @author klp
* @date 2025-11-25
*/
public interface CostStandardConfigMapper extends BaseMapperPlus<CostStandardConfigMapper, CostStandardConfig, CostStandardConfigVo> {
public interface WmsCostStandardConfigMapper extends BaseMapperPlus<WmsCostStandardConfigMapper, WmsCostStandardConfig, WmsCostStandardConfigVo> {
/**
* 查询指定日期的有效成本标准
@@ -21,13 +21,13 @@ public interface CostStandardConfigMapper extends BaseMapperPlus<CostStandardCon
* @param date 日期
* @return 成本标准配置
*/
CostStandardConfigVo selectEffectiveByDate(@Param("date") LocalDate date);
WmsCostStandardConfigVo selectEffectiveByDate(@Param("date") LocalDate date);
/**
* 查询当前有效的成本标准
*
* @return 成本标准配置
*/
CostStandardConfigVo selectCurrentEffective();
WmsCostStandardConfigVo selectCurrentEffective();
}

17
klp-wms/src/main/java/com/klp/service/ICostCoilDailyService.java → klp-wms/src/main/java/com/klp/service/IWmsCostCoilDailyService.java
View File

@@ -1,9 +1,10 @@
package com.klp.service;
import com.klp.domain.vo.CostCoilDailyVo;
import com.klp.domain.bo.CostCoilDailyBo;
import com.klp.domain.vo.WmsCostCoilDailyVo;
import com.klp.domain.bo.WmsCostCoilDailyBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.domain.vo.WmsCostCoilDailyVo;
import java.time.LocalDate;
import java.util.Collection;
@@ -16,32 +17,32 @@ import java.util.Map;
* @author klp
* @date 2025-11-25
*/
public interface ICostCoilDailyService {
public interface IWmsCostCoilDailyService {
/**
* 查询钢卷日成本记录表
*/
CostCoilDailyVo queryById(Long costId);
WmsCostCoilDailyVo queryById(Long costId);
/**
* 查询钢卷日成本记录表列表
*/
TableDataInfo<CostCoilDailyVo> queryPageList(CostCoilDailyBo bo, PageQuery pageQuery);
TableDataInfo<WmsCostCoilDailyVo> queryPageList(WmsCostCoilDailyBo bo, PageQuery pageQuery);
/**
* 查询钢卷日成本记录表列表
*/
List<CostCoilDailyVo> queryList(CostCoilDailyBo bo);
List<WmsCostCoilDailyVo> queryList(WmsCostCoilDailyBo bo);
/**
* 新增钢卷日成本记录表
*/
Boolean insertByBo(CostCoilDailyBo bo);
Boolean insertByBo(WmsCostCoilDailyBo bo);
/**
* 修改钢卷日成本记录表
*/
Boolean updateByBo(CostCoilDailyBo bo);
Boolean updateByBo(WmsCostCoilDailyBo bo);
/**
* 校验并批量删除钢卷日成本记录表信息

20
klp-wms/src/main/java/com/klp/service/ICostStandardConfigService.java → klp-wms/src/main/java/com/klp/service/IWmsCostStandardConfigService.java
View File

@@ -1,7 +1,7 @@
package com.klp.service;
import com.klp.domain.vo.CostStandardConfigVo;
import com.klp.domain.bo.CostStandardConfigBo;
import com.klp.domain.vo.WmsCostStandardConfigVo;
import com.klp.domain.bo.WmsCostStandardConfigBo;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
@@ -15,32 +15,32 @@ import java.util.List;
* @author klp
* @date 2025-11-25
*/
public interface ICostStandardConfigService {
public interface IWmsCostStandardConfigService {
/**
* 查询成本标准配置表
*/
CostStandardConfigVo queryById(Long configId);
WmsCostStandardConfigVo queryById(Long configId);
/**
* 查询成本标准配置表列表
*/
TableDataInfo<CostStandardConfigVo> queryPageList(CostStandardConfigBo bo, PageQuery pageQuery);
TableDataInfo<WmsCostStandardConfigVo> queryPageList(WmsCostStandardConfigBo bo, PageQuery pageQuery);
/**
* 查询成本标准配置表列表
*/
List<CostStandardConfigVo> queryList(CostStandardConfigBo bo);
List<WmsCostStandardConfigVo> queryList(WmsCostStandardConfigBo bo);
/**
* 新增成本标准配置表
*/
Boolean insertByBo(CostStandardConfigBo bo);
Boolean insertByBo(WmsCostStandardConfigBo bo);
/**
* 修改成本标准配置表
*/
Boolean updateByBo(CostStandardConfigBo bo);
Boolean updateByBo(WmsCostStandardConfigBo bo);
/**
* 校验并批量删除成本标准配置表信息
@@ -52,7 +52,7 @@ public interface ICostStandardConfigService {
*
* @return 成本标准配置
*/
CostStandardConfigVo queryCurrentEffective();
WmsCostStandardConfigVo queryCurrentEffective();
/**
* 查询指定日期的有效成本标准
@@ -60,6 +60,6 @@ public interface ICostStandardConfigService {
* @param date 日期
* @return 成本标准配置
*/
CostStandardConfigVo queryEffectiveByDate(LocalDate date);
WmsCostStandardConfigVo queryEffectiveByDate(LocalDate date);
}

132
klp-wms/src/main/java/com/klp/service/impl/CostCoilDailyServiceImpl.java → klp-wms/src/main/java/com/klp/service/impl/WmsCostCoilDailyServiceImpl.java
View File

@@ -7,19 +7,19 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.domain.WmsCostCoilDaily;
import com.klp.domain.bo.WmsCostCoilDailyBo;
import com.klp.domain.vo.WmsCostCoilDailyVo;
import com.klp.domain.vo.WmsCostStandardConfigVo;
import com.klp.mapper.WmsCostCoilDailyMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.klp.domain.bo.CostCoilDailyBo;
import com.klp.domain.vo.CostCoilDailyVo;
import com.klp.domain.CostCoilDaily;
import com.klp.domain.WmsMaterialCoil;
import com.klp.domain.vo.CostStandardConfigVo;
import com.klp.mapper.CostCoilDailyMapper;
import com.klp.mapper.WmsMaterialCoilMapper;
import com.klp.service.ICostCoilDailyService;
import com.klp.service.ICostStandardConfigService;
import com.klp.service.IWmsCostCoilDailyService;
import com.klp.service.IWmsCostStandardConfigService;
import java.math.BigDecimal;
import java.math.RoundingMode;
@@ -38,17 +38,17 @@ import org.apache.commons.lang3.StringUtils;
@Slf4j
@RequiredArgsConstructor
@Service
public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
public class WmsCostCoilDailyServiceImpl implements IWmsCostCoilDailyService {
private final CostCoilDailyMapper baseMapper;
private final WmsCostCoilDailyMapper baseMapper;
private final WmsMaterialCoilMapper coilMapper;
private final ICostStandardConfigService costStandardConfigService;
private final IWmsCostStandardConfigService costStandardConfigService;
/**
* 查询钢卷日成本记录表
*/
@Override
public CostCoilDailyVo queryById(Long costId) {
public WmsCostCoilDailyVo queryById(Long costId) {
return baseMapper.selectVoById(costId);
}
@@ -56,9 +56,9 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
* 查询钢卷日成本记录表列表
*/
@Override
public TableDataInfo<CostCoilDailyVo> queryPageList(CostCoilDailyBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CostCoilDaily> lqw = buildQueryWrapper(bo);
Page<CostCoilDailyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<WmsCostCoilDailyVo> queryPageList(WmsCostCoilDailyBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsCostCoilDaily> lqw = buildQueryWrapper(bo);
Page<WmsCostCoilDailyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -66,28 +66,28 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
* 查询钢卷日成本记录表列表
*/
@Override
public List<CostCoilDailyVo> queryList(CostCoilDailyBo bo) {
LambdaQueryWrapper<CostCoilDaily> lqw = buildQueryWrapper(bo);
public List<WmsCostCoilDailyVo> queryList(WmsCostCoilDailyBo bo) {
LambdaQueryWrapper<WmsCostCoilDaily> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CostCoilDaily> buildQueryWrapper(CostCoilDailyBo bo) {
LambdaQueryWrapper<CostCoilDaily> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getCostId() != null, CostCoilDaily::getCostId, bo.getCostId());
lqw.eq(bo.getCoilId() != null, CostCoilDaily::getCoilId, bo.getCoilId());
lqw.like(bo.getCurrentCoilNo() != null, CostCoilDaily::getCurrentCoilNo, bo.getCurrentCoilNo());
lqw.eq(bo.getCalcDate() != null, CostCoilDaily::getCalcDate, bo.getCalcDate());
lqw.eq(bo.getWarehouseId() != null, CostCoilDaily::getWarehouseId, bo.getWarehouseId());
lqw.eq(bo.getItemType() != null, CostCoilDaily::getItemType, bo.getItemType());
lqw.eq(bo.getMaterialType() != null, CostCoilDaily::getMaterialType, bo.getMaterialType());
private LambdaQueryWrapper<WmsCostCoilDaily> buildQueryWrapper(WmsCostCoilDailyBo bo) {
LambdaQueryWrapper<WmsCostCoilDaily> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getCostId() != null, WmsCostCoilDaily::getCostId, bo.getCostId());
lqw.eq(bo.getCoilId() != null, WmsCostCoilDaily::getCoilId, bo.getCoilId());
lqw.like(bo.getCurrentCoilNo() != null, WmsCostCoilDaily::getCurrentCoilNo, bo.getCurrentCoilNo());
lqw.eq(bo.getCalcDate() != null, WmsCostCoilDaily::getCalcDate, bo.getCalcDate());
lqw.eq(bo.getWarehouseId() != null, WmsCostCoilDaily::getWarehouseId, bo.getWarehouseId());
lqw.eq(bo.getItemType() != null, WmsCostCoilDaily::getItemType, bo.getItemType());
lqw.eq(bo.getMaterialType() != null, WmsCostCoilDaily::getMaterialType, bo.getMaterialType());
if (bo.getStartDate() != null) {
lqw.ge(CostCoilDaily::getCalcDate, bo.getStartDate());
lqw.ge(WmsCostCoilDaily::getCalcDate, bo.getStartDate());
}
if (bo.getEndDate() != null) {
lqw.le(CostCoilDaily::getCalcDate, bo.getEndDate());
lqw.le(WmsCostCoilDaily::getCalcDate, bo.getEndDate());
}
lqw.orderByDesc(CostCoilDaily::getCalcDate);
lqw.orderByDesc(CostCoilDaily::getCostId);
lqw.orderByDesc(WmsCostCoilDaily::getCalcDate);
lqw.orderByDesc(WmsCostCoilDaily::getCostId);
return lqw;
}
@@ -95,8 +95,8 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
* 新增钢卷日成本记录表
*/
@Override
public Boolean insertByBo(CostCoilDailyBo bo) {
CostCoilDaily add = BeanUtil.toBean(bo, CostCoilDaily.class);
public Boolean insertByBo(WmsCostCoilDailyBo bo) {
WmsCostCoilDaily add = BeanUtil.toBean(bo, WmsCostCoilDaily.class);
validEntityBeforeSave(add);
return baseMapper.insert(add) > 0;
}
@@ -105,8 +105,8 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
* 修改钢卷日成本记录表
*/
@Override
public Boolean updateByBo(CostCoilDailyBo bo) {
CostCoilDaily update = BeanUtil.toBean(bo, CostCoilDaily.class);
public Boolean updateByBo(WmsCostCoilDailyBo bo) {
WmsCostCoilDaily update = BeanUtil.toBean(bo, WmsCostCoilDaily.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
@@ -114,7 +114,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CostCoilDaily entity) {
private void validEntityBeforeSave(WmsCostCoilDaily entity) {
// TODO 做一些数据校验,如唯一约束
}
@@ -161,30 +161,30 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
}
// 3. 计算在库天数
LocalDate startDate = coil.getCreateTime() != null
LocalDate startDate = coil.getCreateTime() != null
? coil.getCreateTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate()
: LocalDate.now();
LocalDate endDate = calcTime != null ? calcTime.toLocalDate() : LocalDate.now();
long days = ChronoUnit.DAYS.between(startDate, endDate) + 1;
if (days < 1) {
days = 1; // 不足一天按一天计算
}
// 4. 获取成本标准（使用入库日期的成本标准）
CostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
if (costStandard == null) {
// 如果没有找到对应日期的标准，使用当前有效的标准
costStandard = costStandardConfigService.queryCurrentEffective();
}
if (costStandard == null || costStandard.getUnitCost() == null) {
result.put("error", "未找到有效的成本标准配置");
return result;
}
BigDecimal unitCost = costStandard.getUnitCost();
// 5. 计算成本（按毛重优先）
BigDecimal dailyCost = weightContext.getCostTon().multiply(unitCost).setScale(2, RoundingMode.HALF_UP);
BigDecimal totalCost = dailyCost.multiply(BigDecimal.valueOf(days)).setScale(2, RoundingMode.HALF_UP);
@@ -216,36 +216,36 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
@Override
public List<Map<String, Object>> batchCalculateCost(List<Long> coilIds, LocalDateTime calcTime) {
List<Map<String, Object>> results = new ArrayList<>();
if (coilIds == null || coilIds.isEmpty()) {
return results;
}
// 批量查询钢卷信息
QueryWrapper<WmsMaterialCoil> queryWrapper = new QueryWrapper<>();
queryWrapper.in("coil_id", coilIds);
List<WmsMaterialCoil> coils = coilMapper.selectList(queryWrapper);
if (coils == null || coils.isEmpty()) {
return results;
}
// 获取成本标准（统一使用当前有效的标准，因为批量计算时可能跨多个日期）
LocalDate calcDate = calcTime != null ? calcTime.toLocalDate() : LocalDate.now();
CostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(calcDate);
WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(calcDate);
if (costStandard == null) {
costStandard = costStandardConfigService.queryCurrentEffective();
}
BigDecimal unitCost = null;
if (costStandard != null && costStandard.getUnitCost() != null) {
unitCost = costStandard.getUnitCost();
}
// 遍历计算每个钢卷的成本
for (WmsMaterialCoil coil : coils) {
Map<String, Object> result = new HashMap<>();
// 验证是否为计算对象（data_type=1, export_time IS NULL）
if (coil.getDataType() == null || coil.getDataType() != 1) {
result.put("coilId", coil.getCoilId());
@@ -254,7 +254,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
results.add(result);
continue;
}
if (coil.getExportTime() != null) {
result.put("coilId", coil.getCoilId());
result.put("coilNo", coil.getCurrentCoilNo());
@@ -262,7 +262,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
results.add(result);
continue;
}
WeightContext weightContext = resolveWeightContext(coil);
if (!weightContext.isValid()) {
result.put("coilId", coil.getCoilId());
@@ -271,32 +271,32 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
results.add(result);
continue;
}
// 计算在库天数
LocalDate startDate = coil.getCreateTime() != null
LocalDate startDate = coil.getCreateTime() != null
? coil.getCreateTime().toInstant().atZone(java.time.ZoneId.systemDefault()).toLocalDate()
: LocalDate.now();
LocalDate endDate = calcTime != null ? calcTime.toLocalDate() : LocalDate.now();
long days = ChronoUnit.DAYS.between(startDate, endDate) + 1;
if (days < 1) {
days = 1; // 不足一天按一天计算
}
// 如果统一标准为空，尝试使用入库日期的标准
BigDecimal finalUnitCost = unitCost;
if (finalUnitCost == null) {
CostStandardConfigVo startDateStandard = costStandardConfigService.queryEffectiveByDate(startDate);
WmsCostStandardConfigVo startDateStandard = costStandardConfigService.queryEffectiveByDate(startDate);
if (startDateStandard != null && startDateStandard.getUnitCost() != null) {
finalUnitCost = startDateStandard.getUnitCost();
} else {
CostStandardConfigVo currentStandard = costStandardConfigService.queryCurrentEffective();
WmsCostStandardConfigVo currentStandard = costStandardConfigService.queryCurrentEffective();
if (currentStandard != null && currentStandard.getUnitCost() != null) {
finalUnitCost = currentStandard.getUnitCost();
}
}
}
if (finalUnitCost == null) {
result.put("coilId", coil.getCoilId());
result.put("coilNo", coil.getCurrentCoilNo());
@@ -304,11 +304,11 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
results.add(result);
continue;
}
// 计算成本（毛重优先）
BigDecimal dailyCost = weightContext.getCostTon().multiply(finalUnitCost).setScale(2, RoundingMode.HALF_UP);
BigDecimal totalCost = dailyCost.multiply(BigDecimal.valueOf(days)).setScale(2, RoundingMode.HALF_UP);
// 返回结果
result.put("coilId", coil.getCoilId());
result.put("coilNo", coil.getCurrentCoilNo());
@@ -326,10 +326,10 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
result.put("itemType", coil.getItemType());
result.put("materialType", coil.getMaterialType());
result.put("createTime", coil.getCreateTime());
results.add(result);
}
return results;
}
@@ -355,7 +355,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
log.info("找到 {} 个需要计算成本的钢卷", coils.size());
// 2. 获取成本标准
CostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(calcDate);
WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(calcDate);
if (costStandard == null) {
costStandard = costStandardConfigService.queryCurrentEffective();
}
@@ -390,7 +390,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
BigDecimal totalCost = dailyCost.multiply(BigDecimal.valueOf(days)).setScale(2, RoundingMode.HALF_UP);
// 4. 保存成本记录
CostCoilDaily costRecord = new CostCoilDaily();
WmsCostCoilDaily costRecord = new WmsCostCoilDaily();
costRecord.setCoilId(coil.getCoilId());
costRecord.setCurrentCoilNo(coil.getCurrentCoilNo());
costRecord.setCalcDate(calcDate);
@@ -517,7 +517,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
}
// 获取成本标准
CostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
if (costStandard == null) {
costStandard = costStandardConfigService.queryCurrentEffective();
}
@@ -611,7 +611,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
// 计算该入场钢卷号的成本
Map<String, Object> costResult = calculateCostByEnterCoilNo(enterCoilNo, calcDate);
if (costResult.containsKey("error")) {
log.warn("计算入场钢卷号 {} 的成本时发生错误: {}", enterCoilNo, costResult.get("error"));
continue;
@@ -671,7 +671,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
}
// 获取成本标准
CostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
WmsCostStandardConfigVo costStandard = costStandardConfigService.queryEffectiveByDate(startDate);
if (costStandard == null) {
costStandard = costStandardConfigService.queryCurrentEffective();
}
@@ -693,7 +693,7 @@ public class CostCoilDailyServiceImpl implements ICostCoilDailyService {
BigDecimal totalCost = dailyCost.multiply(BigDecimal.valueOf(days)).setScale(2, RoundingMode.HALF_UP);
// 保存成本记录
CostCoilDaily costRecord = new CostCoilDaily();
WmsCostCoilDaily costRecord = new WmsCostCoilDaily();
costRecord.setCoilId(coil.getCoilId());
costRecord.setCurrentCoilNo(coil.getCurrentCoilNo());
costRecord.setCalcDate(calcDate);

59
klp-wms/src/main/java/com/klp/service/impl/CostStandardConfigServiceImpl.java → klp-wms/src/main/java/com/klp/service/impl/WmsCostStandardConfigServiceImpl.java
View File

@@ -6,14 +6,15 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.domain.WmsCostStandardConfig;
import com.klp.domain.vo.WmsCostStandardConfigVo;
import com.klp.mapper.WmsCostStandardConfigMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.klp.domain.bo.CostStandardConfigBo;
import com.klp.domain.vo.CostStandardConfigVo;
import com.klp.domain.CostStandardConfig;
import com.klp.mapper.CostStandardConfigMapper;
import com.klp.service.ICostStandardConfigService;
import com.klp.domain.bo.WmsCostStandardConfigBo;
import com.klp.service.IWmsCostStandardConfigService;
import java.time.LocalDate;
import java.util.Collection;
@@ -27,15 +28,15 @@ import java.util.List;
*/
@RequiredArgsConstructor
@Service
public class CostStandardConfigServiceImpl implements ICostStandardConfigService {
public class WmsCostStandardConfigServiceImpl implements IWmsCostStandardConfigService {
private final CostStandardConfigMapper baseMapper;
private final WmsCostStandardConfigMapper baseMapper;
/**
* 查询成本标准配置表
*/
@Override
public CostStandardConfigVo queryById(Long configId) {
public WmsCostStandardConfigVo queryById(Long configId) {
return baseMapper.selectVoById(configId);
}
@@ -43,9 +44,9 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
* 查询成本标准配置表列表
*/
@Override
public TableDataInfo<CostStandardConfigVo> queryPageList(CostStandardConfigBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<CostStandardConfig> lqw = buildQueryWrapper(bo);
Page<CostStandardConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
public TableDataInfo<WmsCostStandardConfigVo> queryPageList(WmsCostStandardConfigBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsCostStandardConfig> lqw = buildQueryWrapper(bo);
Page<WmsCostStandardConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@@ -53,18 +54,18 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
* 查询成本标准配置表列表
*/
@Override
public List<CostStandardConfigVo> queryList(CostStandardConfigBo bo) {
LambdaQueryWrapper<CostStandardConfig> lqw = buildQueryWrapper(bo);
public List<WmsCostStandardConfigVo> queryList(WmsCostStandardConfigBo bo) {
LambdaQueryWrapper<WmsCostStandardConfig> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<CostStandardConfig> buildQueryWrapper(CostStandardConfigBo bo) {
LambdaQueryWrapper<CostStandardConfig> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getConfigId() != null, CostStandardConfig::getConfigId, bo.getConfigId());
lqw.eq(bo.getUnitCost() != null, CostStandardConfig::getUnitCost, bo.getUnitCost());
lqw.eq(bo.getEffectiveDate() != null, CostStandardConfig::getEffectiveDate, bo.getEffectiveDate());
lqw.eq(bo.getStatus() != null, CostStandardConfig::getStatus, bo.getStatus());
lqw.orderByDesc(CostStandardConfig::getEffectiveDate);
private LambdaQueryWrapper<WmsCostStandardConfig> buildQueryWrapper(WmsCostStandardConfigBo bo) {
LambdaQueryWrapper<WmsCostStandardConfig> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getConfigId() != null, WmsCostStandardConfig::getConfigId, bo.getConfigId());
lqw.eq(bo.getUnitCost() != null, WmsCostStandardConfig::getUnitCost, bo.getUnitCost());
lqw.eq(bo.getEffectiveDate() != null, WmsCostStandardConfig::getEffectiveDate, bo.getEffectiveDate());
lqw.eq(bo.getStatus() != null, WmsCostStandardConfig::getStatus, bo.getStatus());
lqw.orderByDesc(WmsCostStandardConfig::getEffectiveDate);
return lqw;
}
@@ -73,13 +74,13 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(CostStandardConfigBo bo) {
public Boolean insertByBo(WmsCostStandardConfigBo bo) {
// 如果新标准立即生效，需要将当前有效的标准标记为失效
if (bo.getEffectiveDate() != null && !bo.getEffectiveDate().isAfter(LocalDate.now())) {
// 将当前有效的标准标记为失效
CostStandardConfigVo current = queryCurrentEffective();
WmsCostStandardConfigVo current = queryCurrentEffective();
if (current != null) {
CostStandardConfig update = new CostStandardConfig();
WmsCostStandardConfig update = new WmsCostStandardConfig();
update.setConfigId(current.getConfigId());
update.setExpireDate(LocalDate.now().minusDays(1));
update.setStatus(0);
@@ -87,7 +88,7 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
}
}
CostStandardConfig add = BeanUtil.toBean(bo, CostStandardConfig.class);
WmsCostStandardConfig add = BeanUtil.toBean(bo, WmsCostStandardConfig.class);
if (add.getStatus() == null) {
add.setStatus(1); // 默认有效
}
@@ -99,8 +100,8 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
* 修改成本标准配置表
*/
@Override
public Boolean updateByBo(CostStandardConfigBo bo) {
CostStandardConfig update = BeanUtil.toBean(bo, CostStandardConfig.class);
public Boolean updateByBo(WmsCostStandardConfigBo bo) {
WmsCostStandardConfig update = BeanUtil.toBean(bo, WmsCostStandardConfig.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
@@ -108,7 +109,7 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(CostStandardConfig entity) {
private void validEntityBeforeSave(WmsCostStandardConfig entity) {
// TODO 做一些数据校验,如唯一约束
}
@@ -127,7 +128,7 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
* 查询当前有效的成本标准
*/
@Override
public CostStandardConfigVo queryCurrentEffective() {
public WmsCostStandardConfigVo queryCurrentEffective() {
return baseMapper.selectCurrentEffective();
}
@@ -135,7 +136,7 @@ public class CostStandardConfigServiceImpl implements ICostStandardConfigService
* 查询指定日期的有效成本标准
*/
@Override
public CostStandardConfigVo queryEffectiveByDate(LocalDate date) {
public WmsCostStandardConfigVo queryEffectiveByDate(LocalDate date) {
return baseMapper.selectEffectiveByDate(date);
}
}

8
klp-wms/src/main/java/com/klp/task/CostCoilDailyTask.java
View File

@@ -1,6 +1,6 @@
package com.klp.task;
import com.klp.service.ICostCoilDailyService;
import com.klp.service.IWmsCostCoilDailyService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled;
@@ -16,8 +16,8 @@ import java.time.LocalDate;
* 2. 按入场钢卷号维度生成前一日的日成本记录。
*
* 说明：
* - 具体的计算逻辑在 {@link ICostCoilDailyService#calculateDailyCost(LocalDate)} 和
* {@link ICostCoilDailyService#calculateDailyCostByEnterCoilNo(LocalDate)} 中实现。
* - 具体的计算逻辑在 {@link IWmsCostCoilDailyService#calculateDailyCost(LocalDate)} 和
* {@link IWmsCostCoilDailyService#calculateDailyCostByEnterCoilNo(LocalDate)} 中实现。
* - 当前任务只负责在固定时间触发这两个方法。
*/
@Slf4j
@@ -25,7 +25,7 @@ import java.time.LocalDate;
@Component
public class CostCoilDailyTask {
private final ICostCoilDailyService costCoilDailyService;
private final IWmsCostCoilDailyService costCoilDailyService;
/**
* 每天凌晨 2:00 计算前一日钢卷日成本（按钢卷维度）