库存填充度功能提交，暂时移除激活码验证

Signed-off-by: TanYibin <5491541@qq.com>

库存填充度功能提交，暂时移除激活码验证
Signed-off-by: TanYibin <5491541@qq.com>
谭毅彬
1 parent ad1cb22b
Showing 8 changed files with 33 additions and 11 deletions
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/containerCapacity/service/IContainerCapacityService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/config/containerCapacity/service/impl/ContainerCapacityServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryDetail/controller/InventoryDetailController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/controller/InventoryHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/IInventoryDetailService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/inventory/inventoryHeader/service/impl/InventoryDetailServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/config/HuahengRedisConfig.java
huaheng-wms-core/src/main/resources/application.yml
@@ -11,4 +11,14 @@ import org.jeecg.modules.wms.config.containerCapacity.entity.ContainerCapacity;
  */
 public interface IContainerCapacityService extends IService<ContainerCapacity> {
  
+    /**
+     * 容器物品容量查询
+     * @author                       TanYibin
+     * @createDate                   2023年4月10日
+     * @param      warehouseCode
+     * @param      containerTypeCode
+     * @param      materialCode
+     * @return
+     */
+    public ContainerCapacity queryOne(String warehouseCode, String containerTypeCode, String materialCode);
 }
@@ -3,8 +3,12 @@ package org.jeecg.modules.wms.config.containerCapacity.service.impl;
 import org.jeecg.modules.wms.config.containerCapacity.entity.ContainerCapacity;
 import org.jeecg.modules.wms.config.containerCapacity.mapper.ContainerCapacityMapper;
 import org.jeecg.modules.wms.config.containerCapacity.service.IContainerCapacityService;
+import org.jeecg.utils.StringUtils;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
  
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  
 /**
@@ -16,4 +20,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class ContainerCapacityServiceImpl extends ServiceImpl<ContainerCapacityMapper, ContainerCapacity> implements IContainerCapacityService {
  
+    @Override
+    @Cacheable(cacheNames = "queryContainerCapacity#60",
+        key = "#root.methodName + '_' + #warehouseCode + '_' + #containerTypeCode + '_' + #materialCode")
+    public ContainerCapacity queryOne(String warehouseCode, String containerTypeCode, String materialCode) {
+        LambdaQueryWrapper<ContainerCapacity> containerCapacityWrapper = Wrappers.lambdaQuery();
+        containerCapacityWrapper.eq(ContainerCapacity::getWarehouseCode, warehouseCode)
+            .eq(StringUtils.isNotEmpty(containerTypeCode), ContainerCapacity::getContainerTypeCode, containerTypeCode)
+            .eq(StringUtils.isNotEmpty(materialCode), ContainerCapacity::getMaterialCode, materialCode);
+        return getOne(containerCapacityWrapper);
+    }
+
 }
@@ -54,7 +54,7 @@ public class InventoryDetailController extends JeecgController&lt;InventoryDetail, 
         HuahengJwtUtil.setWarehouseCode(req, inventoryDetail);
         QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, req.getParameterMap());
         Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
-        return Result.OK(inventoryDetailService.queryInventoryDetailPage(page, queryWrapper));
+        return Result.OK(inventoryDetailService.queryPage(page, queryWrapper));
     }
  
     /**
@@ -178,7 +178,7 @@ public class InventoryHeaderController extends JeecgController&lt;InventoryHeader, 
         HuahengJwtUtil.setWarehouseCode(request, inventoryDetail);
         QueryWrapper<InventoryDetail> queryWrapper = QueryGenerator.initQueryWrapper(inventoryDetail, request.getParameterMap());
         Page<InventoryDetail> page = new Page<InventoryDetail>(pageNo, pageSize);
-        return Result.OK(inventoryDetailService.queryInventoryDetailPage(page, queryWrapper));
+        return Result.OK(inventoryDetailService.queryPage(page, queryWrapper));
     }
  
     /**
@@ -40,5 +40,5 @@ public interface IInventoryDetailService extends IService&lt;InventoryDetail&gt; {
      * @param queryWrapper
      * @return
      */
-    IPage<InventoryDetail> queryInventoryDetailPage(Page<InventoryDetail> page, QueryWrapper<InventoryDetail> queryWrapper);
+    IPage<InventoryDetail> queryPage(Page<InventoryDetail> page, QueryWrapper<InventoryDetail> queryWrapper);
 }
@@ -109,7 +109,7 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
     }
  
     @Override
-    public IPage<InventoryDetail> queryInventoryDetailPage(Page<InventoryDetail> page, QueryWrapper<InventoryDetail> queryWrapper) {
+    public IPage<InventoryDetail> queryPage(Page<InventoryDetail> page, QueryWrapper<InventoryDetail> queryWrapper) {
         IPage<InventoryDetail> pageResult = this.page(page, queryWrapper);
         List<InventoryDetail> inventoryDetailList = pageResult.getRecords();
         if (!CollectionUtils.isEmpty(inventoryDetailList)) {
@@ -137,11 +137,8 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
             Map<String, Container> containerMap = containerList.stream().collect(Collectors.toMap(Container::getCode, Function.identity(), (key1, key2) -> key2));
             for (InventoryDetail inventoryDetail : warehouseInventoryDetailList) {
                 Container container = containerMap.get(inventoryDetail.getContainerCode());
-                LambdaQueryWrapper<ContainerCapacity> containerCapacityWrapper = Wrappers.lambdaQuery();
-                containerCapacityWrapper.eq(ContainerCapacity::getWarehouseCode, warehouseCode)
-                    .eq(StringUtils.isNotEmpty(container.getContainerTypeCode()), ContainerCapacity::getContainerTypeCode, container.getContainerTypeCode())
-                    .eq(StringUtils.isNotEmpty(inventoryDetail.getMaterialCode()), ContainerCapacity::getMaterialCode, inventoryDetail.getMaterialCode());
-                ContainerCapacity containerCapacity = containerCapacityService.getOne(containerCapacityWrapper);
+                ContainerCapacity containerCapacity =
+                    containerCapacityService.queryOne(warehouseCode, container.getContainerTypeCode(), inventoryDetail.getMaterialCode());
                 if (containerCapacity != null && containerCapacity.getQty() != null && containerCapacity.getQty().compareTo(BigDecimal.ZERO) > 0) {
                     // 进行填充度计算 保留2位小数
                     BigDecimal fillDensity = inventoryDetail.getQty().divide(containerCapacity.getQty(), 2, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
@@ -38,7 +38,7 @@ public class HuahengRedisConfig {
         // 配置序列化（解决乱码的问题）
         RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig().entryTtl(Duration.ofMillis(-1))
             .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(redisSerializer))
-            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer)).disableCachingNullValues();
+            .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(jackson2JsonRedisSerializer));
         RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter(factory);
  
         /*
@@ -8,4 +8,4 @@ huaheng:
   system:
     verson: '@project.version@'
     artifactId: '@project.artifactId@'
-    checkSystemActivationCode: true
 \ No newline at end of file
+    checkSystemActivationCode: false
 \ No newline at end of file