java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.统计数量添加缓存

training
0.0 2 years ago
parent
b57714f6ee
commit
68bc800846
10 changed files with 176 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java
  2. 5
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java
  3. 15
      blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java
  4. 3
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
  5. 8
      blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
  6. 41
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
  7. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
  8. 32
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
  9. 6
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
  10. 46
      blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java

28
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseCargoSumVO.java
Unescape View File

@ -0,0 +1,28 @@
package com.logpm.warehouse.vo;
import lombok.Data;
@Data
public class WarehouseCargoSumVO {
/**
* 货区id
*/
private Long id;
/**
* 总货位
*/
private Integer cargoNub;
/**
* 使用货位
*/
private Integer employNub;
/**
* 可用货位
*/
private Integer unusedNub;
/**
* 禁用货位
*/
private Integer disableNub;
}

5
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseTrayVO.java
Unescape View File

@ -64,6 +64,11 @@ public class WarehouseTrayVO extends WarehouseTrayEntity {
*/
@ApiModelProperty(value = "托盘货物录入类型(name)")
private String palletizingTypeName;
/**
* 托盘状态(name)
*/
@ApiModelProperty(value = "托盘状态(name)")
private String trayStatusName;
/**
* 数量
*/

15
blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseVisualizationVO.java
Unescape View File

@ -47,6 +47,21 @@ public class WarehouseVisualizationVO extends WarehouseParcelListcopyEntity {
*/
@ApiModelProperty(value = "打托方式")
private String updownType;
/**
* 客户姓名
*/
@ApiModelProperty(value = "客户姓名")
private String customerName;
/**
* 客户电话
*/
@ApiModelProperty(value = "客户电话")
private String customerTelephone;
/**
* 客户地址
*/
@ApiModelProperty(value = "客户地址")
private String customerAddress;

3
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java
Unescape View File

@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.logpm.basicdata.dto.BasicdataStorageServicesDTO;
import com.logpm.basicdata.entity.BasicdataStorageServicesEntity;
import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.service.IBasicdataWarehouseService;
import com.logpm.basicdata.vo.BasicdataStorageServicesVO;
import com.logpm.basicdata.excel.BasicdataStorageServicesExcel;
@ -101,7 +102,7 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
if(ObjectUtils.isNull( basicdataStorageServices.getSendWarehouseIds()) || basicdataStorageServices.getSendWarehouseIds().size() == 0 ){
BladeUser user = AuthUtil.getUser();
R<UserVO> userR = userClient.userInfoByIdOwn(user.getUserId());
// R<UserVO> userR = userClient.userInfoByIdOwn(user.getUserId());
QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper();
queryWrapper.eq("tenant_id",user.getTenantId());
/*if(userR.getData().getRoleName().equals("管理员")){

8
blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java
Unescape View File

@ -32,9 +32,11 @@ import com.logpm.basicdata.feign.BasicdataCodeClient;
import com.logpm.basicdata.feign.IBasicdataCodeClient;
import com.logpm.basicdata.feign.IBasicdataCodeClient;
import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
import com.logpm.basicdata.mapper.BasicdataTrayMapper;
import com.logpm.basicdata.mapper.BasicdataWarehouseMapper;
import com.logpm.basicdata.service.IBasicdataTrayService;
import com.logpm.basicdata.service.IBasicdataWarehouseService;
import com.logpm.basicdata.vo.BasicdataTrayVO;
import com.logpm.basicdata.vo.BasicdataStockArticleVO;
import com.logpm.basicdata.vo.WarehouseParcelListVO;
@ -93,10 +95,13 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
private IBasicPrintTemplateClient basicPrintTemplateClient;
private IBasicdataWarehouseService basicdataWarehouseService;
@Override
public IPage<BasicdataTrayVO> selectBasicdataTrayPage(IPage<BasicdataTrayVO> page, BasicdataTrayVO BasicdataTray) {
return page.setRecords(baseMapper.selectBasicdataTrayPage(page, BasicdataTray));
}
@ -128,7 +133,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
basicdataTrayEntity = new BasicdataTrayEntity();
BeanUtils.copyProperties(basicdataTrayDTO,basicdataTrayEntity);
//String trayCode = tenantCodeClient.shelfCode(AuthUtil.getTenantId(), "6");
String trayCode = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),null);
String trayCode = basicdataCodeClient.getCodeByType(CodeNumConstant.TRAYS,basicdataWarehouseEntity.getWarehouseCode(),"465897");
// basicdataTrayEntity.setTrayStatus("1");
//String uuid = "1" + Func.random(18, RandomType.INT).trim();
//long id = Long.parseLong(uuid);
@ -141,6 +146,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
// basicdataTrayEntity.setStatus(1);
// basicdataTrayEntity.setId(id);
basicdataTrayEntity.setPalletCode(trayCode);
basicdataTrayEntity.setPalletName(trayCode);
basicdataTrayEntities.add(basicdataTrayEntity);
}
result = this.saveBatch(basicdataTrayEntities);

41
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseGoodsAllocationController.java
Unescape View File

@ -38,6 +38,8 @@ import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.redis.lock.RedisLock;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
@ -72,6 +74,10 @@ public class WarehouseGoodsAllocationController extends BladeController {
private final IWarehouseUpdownTypeService warehouseUpdownTypeService;
private final BladeRedis bladeRedis;
private static String Url ="/warehouseGoodsAllocation";
/**
* 货位 详情
*/
@ -292,19 +298,44 @@ public class WarehouseGoodsAllocationController extends BladeController {
@ApiOperationSupport(order = 3)
@ApiOperation(value = "货位 可视化", notes = "传入warehouseGoodsAllocation")
public R<List <List<WarehouseGoodsAllocationVO>>> Visualization(WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
// if (null !=bladeRedis.get(Url+"/Visualization")){
// log.info("缓存取值>>>>>>>>>>");
// return R.data(bladeRedis.get(Url+"/Visualization"));
// }
List <List<WarehouseGoodsAllocationVO>> pages = warehouseGoodsAllocationService.selectVisualization(warehouseGoodsAllocation);
// bladeRedis.setEx(Url+"/Visualization",pages,360L);
return R.data(pages);
}
/**
* 货位 统计库位数量
* 货位 统计所有库位数量
*/
@GetMapping("/locationsnub")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "货位 统计库位数量", notes = "传入warehouseGoodsAllocation")
public R locationsnub(WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub(warehouseGoodsAllocation);
@ApiOperation(value = "货位 统计所有库位数量")
public R locationsnub() {
if (null !=bladeRedis.get(Url+"/locationsnub)")){
log.info("缓存取值>>>>>>>>>>");
return R.data(bladeRedis.get(Url+"/locationsnub"));
}
locationsnubVO locationsnubVO = warehouseGoodsAllocationService.selectlocationsnub();
bladeRedis.setEx(Url+"/locationsnub",locationsnubVO,360L);
return R.data(locationsnubVO);
}
/**
* 货位 统计每个货区数量
*/
@GetMapping("/cargoNub")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "货位 统计每个货区数量")
public R cargoNub() {
if (null !=bladeRedis.get(Url+"/cargoNub")){
log.info("缓存取值>>>>>>>>>>");
return R.data(bladeRedis.get(Url+"/cargoNub"));
}
List<WarehouseCargoSumVO> list = warehouseGoodsAllocationService.selectcargoNub();
bladeRedis.setEx(Url+"/cargoNub",list,360L);
return R.data(list);
}
/**
* 货位 查询包件
*/
@ -435,7 +466,7 @@ public class WarehouseGoodsAllocationController extends BladeController {
log.warn(e.message);
return R.fail(e.code,e.message);
}catch (Exception e){
log.error("/downAllocation系统异常，联系管理员",e);
log.error("货位 下架货位系统异常，联系管理员",e);
return R.fail(500,"系统异常，联系管理员");
}
return R.success("下架成功");

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.java
Unescape View File

@ -152,4 +152,10 @@ public interface WarehouseGoodsAllocationMapper extends BaseMapper<WarehouseGood
* @return
*/
List<WarehouseStockArticleCopyVO> selectAllZeroOrder(IPage<WarehouseStockArticleCopyVO> page,@Param("param") WarehouseStockArticleCopyDTO warehouseStockArticleCopyDTO);
/**
*查询货区
*
* @return
*/
List<WarehouseCargoSumVO> selectCargoSumId();
}

32
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseGoodsAllocationMapper.xml
Unescape View File

@ -40,16 +40,30 @@
select lbm.product_code productCode, lbm.name name from logpm_basicdata_material lbm join logpm_warehouse_updown_goods lwug on lbm.id = lwug.association_id WHERE lwug.association_type = '4' and lwug.allocation_id = #{id}
</select>
<select id="selectOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
select ldsa.* from logpm_distribution_stock_article ldsa where
select ldsa.* from logpm_distribution_stock_article ldsa
<where>
ldsa.is_deleted = 0 and ldsa.is_zero ='0'
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldsa.service_number like concat('%',#{param.serviceNumber},'%')
</if>
<if test="param.orderCode!=null and param.orderCode!=''">
and ldsa.order_code like concat('%',#{param.orderCode},'%')
</if>
</where>
</select>
<select id="selectservicenub" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
select distinct ldsa.service_number serviceNumber,ldsa.customer_name customerName,ldsa.customer_telephone customerTelephone,ldsa.create_time createTime from logpm_distribution_stock_article ldsa where ldsa.is_deleted = 0 and ldsa.is_zero ='0'
select GROUP_CONCAT( ldsa.order_Code SEPARATOR ',' ) orderCode, ldsa.service_number
serviceNumber,GROUP_CONCAT(ldsa.customer_name SEPARATOR ',' ) customerName,ldsa.customer_address
customerAddress, ldsa.customer_telephone customerTelephone from logpm_distribution_stock_article ldsa
<where>
ldsa.is_deleted = 0 and ldsa.is_zero ='0'
<if test="param.customerName!=null and param.customerName!=''">
and ldpl.customer_name like concat('%',#{param.customerName},'%')
</if>
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
and ldpl.service_number like concat('%',#{param.serviceNumber},'%')
</if>
</where> GROUP BY ldsa.service_number
</select>
<select id="selectorderByServiceNumber" resultType="com.logpm.warehouse.dto.UpShelfOrderDTO">
select ldsa.service_number serviceNumber,ldsa.order_code orderCode from logpm_distribution_stock_article ldsa
@ -64,7 +78,8 @@
</where>
</select>
<select id="selectwrap" resultType="com.logpm.warehouse.vo.WarehouseVisualizationVO">
select ldpl.* from logpm_distribution_parcel_list ldpl
select ldpl.* ,ldsa.customer_name,ldsa.customer_telephone,ldsa.customer_address from logpm_distribution_parcel_list ldpl
left join logpm_distribution_stock_article ldsa on ldsa.id = ldpl.stock_article_id
<where>
ldpl.order_package_grounding_status ='10' and ldpl.is_deleted = 0
<if test="param.serviceNumber!=null and param.serviceNumber!=''">
@ -103,11 +118,15 @@
ldpl.service_number serviceNumber,
ldpl.material_name materialName,
ldpl.material_code materialCode,
ldpl.train_number trainNumber,
ldpl.create_time createTime,
ldpl.order_package_code orderPackageCode,
ldpl.firsts firsts,
ldpl.second second,
ldpl.third_product thirdProduct,
ldpl.customer_name customerName,
ldpl.customer_telephone customerTelephone,
ldpl.customer_address customerAddress,
ldpl.order_code orderCode,
lwut.updown_type updownType,
lwtg.tray_code trayCode,
@ -145,14 +164,14 @@
</select>
<select id="selectInventory" resultType="com.logpm.warehouse.vo.WarehouseStockListCopyVO">
SELECT
ldsl.material_id materialId,
ldsl.order_code orderCode,
ldsl.service_number serviceNumber,
ldsl.description_goods descriptionGoods,
ldsl.cargo_number cargoNumber,
ldsl.cargo_norms cargoNorms,
ldsl.cargo_unit cargoUnit,
ldsl.sku sku,
ldsl.stock_list_code stockListCode
ldsl.sku sku
FROM
logpm_distribution_stock_list ldsl
left JOIN logpm_warehouse_updown_goods lwug ON ldsl.material_id = lwug.association_id
@ -198,6 +217,9 @@
<select id="selectAllZeroOrder" resultType="com.logpm.warehouse.vo.WarehouseStockArticleCopyVO">
SELECT ldsa.* FROM logpm_distribution_stock_article ldsa join logpm_warehouse_updown_goods lwug on lwug.association_id = ldsa.id WHERE ldsa.is_zero ='1'
</select>
<select id="selectCargoSumId" resultType="com.logpm.warehouse.vo.WarehouseCargoSumVO">
select id from logpm_warehouse_goods_area WHERE is_deleted = 0 and enable_status = '1'
</select>
</mapper>

6
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseGoodsAllocationService.java
Unescape View File

@ -107,5 +107,9 @@ public interface IWarehouseGoodsAllocationService extends BaseService<WarehouseG
/**
* 货位 统计库位数量
*/
locationsnubVO selectlocationsnub(WarehouseGoodsAllocationVO warehouseGoodsAllocation);
locationsnubVO selectlocationsnub();
/**
* 货位 统计每个货区数量
*/
List<WarehouseCargoSumVO> selectcargoNub();
}

46
blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseGoodsAllocationServiceImpl.java
Unescape View File

@ -32,6 +32,7 @@ import lombok.extern.log4j.Log4j;
import lombok.extern.log4j.Log4j2;
import org.springblade.core.mp.support.BladePage;
import org.springblade.core.mp.support.Query;
import org.springblade.core.redis.cache.BladeRedis;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
@ -42,6 +43,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* 货位 服务实现类
@ -57,6 +59,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
private final IWarehouseUpdownGoodsService warehouseUpdownGoodsService;
@Override
public IPage<WarehouseGoodsAllocationVO> selectWarehouseGoodsAllocationPage(IPage<WarehouseGoodsAllocationVO> page, WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
return page.setRecords(baseMapper.selectWarehouseGoodsAllocationPage(page, warehouseGoodsAllocation));
@ -108,6 +111,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
}
ArrayList<List<WarehouseGoodsAllocationVO>> arrayListTwo = new ArrayList<>(map.values());
log.info("排序后>>>>>>>>>>>>>>{}",map);
return arrayListTwo;
}
@ -237,7 +241,7 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
}
@Override
public locationsnubVO selectlocationsnub(WarehouseGoodsAllocationVO warehouseGoodsAllocation) {
public locationsnubVO selectlocationsnub() {
locationsnubVO locationsnubVO = new locationsnubVO();
//查询所有货位
Integer cargoNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
@ -266,4 +270,44 @@ public class WarehouseGoodsAllocationServiceImpl extends BaseServiceImpl<Warehou
return locationsnubVO;
}
@Override
public List<WarehouseCargoSumVO> selectcargoNub() {
//查询所有货区id
List<WarehouseCargoSumVO> list =baseMapper.selectCargoSumId();
for (WarehouseCargoSumVO warehouseCargoSumVO : list) {
Long id = warehouseCargoSumVO.getId();
//查询该货区下的总货位
Integer cargoNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
.eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id)
).intValue();
//查询所有使用货位
Integer employNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
.eq(WarehouseGoodsAllocationEntity::getAllocationStatus, 2)
.eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id)
).intValue();
//查询所有禁用
Integer disableNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
.eq(WarehouseGoodsAllocationEntity::getEnableStatus, 2)
.eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id)
).intValue();
//查询可用货位
Integer unusedNub = baseMapper.selectCount(new QueryWrapper<WarehouseGoodsAllocationEntity>().lambda()
.eq(WarehouseGoodsAllocationEntity::getIsDeleted, 0)
.eq(WarehouseGoodsAllocationEntity::getEnableStatus, 1)
.eq(WarehouseGoodsAllocationEntity::getAllocationStatus,1)
.eq(WarehouseGoodsAllocationEntity::getGoodsAreaId,id)
).intValue();
warehouseCargoSumVO.setCargoNub(cargoNub);
warehouseCargoSumVO.setEmployNub(employNub);
warehouseCargoSumVO.setDisableNub(disableNub);
warehouseCargoSumVO.setUnusedNub(unusedNub);
}
return list;
}
}

Write Preview
Loading…
Cancel
Save