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

Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-01-10 08:25:08 +08:00
parent fe935b5b7c 72691efc3f
commit e1f2d3c641
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java
View File

@@ -58,7 +58,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
* 查询产品列表（带Redis缓存，30分钟过期） * 查询产品列表（带Redis缓存，30分钟过期）
*/ */
@Override @Override
@Cacheable(cacheNames = "wms:product:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") // @Cacheable(cacheNames = "wms:product:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize")
public TableDataInfo<WmsProductVo> queryPageList(WmsProductBo bo, PageQuery pageQuery) { public TableDataInfo<WmsProductVo> queryPageList(WmsProductBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsProduct> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<WmsProduct> lqw = buildQueryWrapper(bo);
Page<WmsProductVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<WmsProductVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
@@ -133,7 +133,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(cacheNames = "wms:product:list", allEntries = true) // @CacheEvict(cacheNames = "wms:product:list", allEntries = true)
public Boolean insertByBo(WmsProductBo bo) { public Boolean insertByBo(WmsProductBo bo) {
// 1. 先创建BOM头 // 1. 先创建BOM头
WmsBomBo bomBo = new WmsBomBo(); WmsBomBo bomBo = new WmsBomBo();
@@ -196,7 +196,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
* 修改产品 * 修改产品
*/ */
@Override @Override
@CacheEvict(cacheNames = "wms:product:list", allEntries = true) // @CacheEvict(cacheNames = "wms:product:list", allEntries = true)
public Boolean updateByBo(WmsProductBo bo) { public Boolean updateByBo(WmsProductBo bo) {
WmsProduct update = BeanUtil.toBean(bo, WmsProduct.class); WmsProduct update = BeanUtil.toBean(bo, WmsProduct.class);
validEntityBeforeSave(update); validEntityBeforeSave(update);
@@ -233,7 +233,7 @@ public class WmsProductServiceImpl implements IWmsProductService {
* 批量删除产品 * 批量删除产品
*/ */
@Override @Override
@CacheEvict(cacheNames = "wms:product:list", allEntries = true) // @CacheEvict(cacheNames = "wms:product:list", allEntries = true)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验

6
klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java
View File

@@ -64,7 +64,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
* 查询原材料列表（带Redis缓存，30分钟过期） * 查询原材料列表（带Redis缓存，30分钟过期）
*/ */
@Override @Override
@Cacheable(cacheNames = "wms:rawMaterial:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize") // @Cacheable(cacheNames = "wms:rawMaterial:list", key = "'bo_' + #bo + '_page_' + #pageQuery.pageNum + '_' + #pageQuery.pageSize")
public TableDataInfo<WmsRawMaterialVo> queryPageList(WmsRawMaterialBo bo, PageQuery pageQuery) { public TableDataInfo<WmsRawMaterialVo> queryPageList(WmsRawMaterialBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsRawMaterial> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<WmsRawMaterial> lqw = buildQueryWrapper(bo);
Page<WmsRawMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<WmsRawMaterialVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
@@ -235,7 +235,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) // @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true)
public WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo) { public WmsRawMaterialBo insertByBo(WmsRawMaterialBo bo) {
// 1. 先创建BOM头 // 1. 先创建BOM头
WmsBomBo bomBo = new WmsBomBo(); WmsBomBo bomBo = new WmsBomBo();
@@ -335,7 +335,7 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService {
* 批量删除原材料 * 批量删除原材料
*/ */
@Override @Override
@CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true) // @CacheEvict(cacheNames = "wms:rawMaterial:list", allEntries = true)
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if(isValid){ if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验