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

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