feat(wms): 添加钢卷库区操作记录导出功能以及优化查询速率
- 在服务接口中新增 exportBySecondWarehouseIdAndTimeRange 方法用于导出功能 - 在控制器中新增 exportByWarehouseAndTime 接口支持报表导出 - 在映射器中新增 selectVoListWithJoin 查询方法优化关联查询 - 在 XML 映射文件中新增完整的关联查询 SQL 和结果映射配置 - 在服务实现类中重构查询逻辑使用新的关联查询方法 - 新增 WmsCoilWarehouseOperationLogExportVo 导出数据对象 - 实现导出逻辑将操作记录转换为 Excel 格式并支持多表关联 - 添加状态描述转换方法支持中文显示 - 更新 VO 类继承 BaseEntity 基础实体类
This commit is contained in:
@@ -17,7 +17,10 @@ import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo;
|
||||
import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo;
|
||||
import com.klp.domain.vo.WmsCoilWarehouseOperationLogExportVo;
|
||||
import com.klp.domain.vo.WmsMaterialCoilVo;
|
||||
import com.klp.domain.vo.WmsRawMaterialVo;
|
||||
import com.klp.domain.vo.WmsProductVo;
|
||||
import com.klp.domain.WmsCoilWarehouseOperationLog;
|
||||
import com.klp.mapper.WmsCoilWarehouseOperationLogMapper;
|
||||
import com.klp.service.IWmsCoilWarehouseOperationLogService;
|
||||
@@ -134,52 +137,49 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
|
||||
return new ArrayList<>();
|
||||
}
|
||||
|
||||
LambdaQueryWrapper<WmsCoilWarehouseOperationLog> lqw = Wrappers.lambdaQuery();
|
||||
lqw.in(WmsCoilWarehouseOperationLog::getActualWarehouseId, warehouseIds);
|
||||
lqw.eq(operationType != null, WmsCoilWarehouseOperationLog::getOperationType, operationType);
|
||||
lqw.eq(inOutType != null, WmsCoilWarehouseOperationLog::getInOutType, inOutType);
|
||||
lqw.ge(startTime != null, WmsCoilWarehouseOperationLog::getCreateTime, startTime);
|
||||
lqw.le(endTime != null, WmsCoilWarehouseOperationLog::getCreateTime, endTime);
|
||||
lqw.orderByDesc(WmsCoilWarehouseOperationLog::getCreateTime);
|
||||
|
||||
List<WmsCoilWarehouseOperationLogVo> list = baseMapper.selectVoList(lqw);
|
||||
|
||||
Set<Long> coilIds = list.stream()
|
||||
.map(WmsCoilWarehouseOperationLogVo::getCoilId)
|
||||
.filter(Objects::nonNull)
|
||||
.collect(Collectors.toSet());
|
||||
|
||||
|
||||
Map<Long, WmsMaterialCoilVo> coilMap = new HashMap<>();
|
||||
if (!coilIds.isEmpty()) {
|
||||
WmsMaterialCoilBo bo = new WmsMaterialCoilBo();
|
||||
bo.setCoilIds(coilIds.stream().map(String::valueOf).collect(Collectors.joining(",")));
|
||||
List<WmsMaterialCoilVo> coils = wmsMaterialCoilService.queryList(bo);
|
||||
for (WmsMaterialCoilVo coil : coils) {
|
||||
coilMap.put(coil.getCoilId(), coil);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Map<Long, WmsActualWarehouseVo> warehouseMap = new HashMap<>();
|
||||
if (!warehouseIds.isEmpty()) {
|
||||
LambdaQueryWrapper<WmsActualWarehouse> warehouseQuery = Wrappers.lambdaQuery();
|
||||
warehouseQuery.in(WmsActualWarehouse::getActualWarehouseId, warehouseIds);
|
||||
List<WmsActualWarehouse> warehouses = wmsActualWarehouseMapper.selectList(warehouseQuery);
|
||||
for (WmsActualWarehouse warehouse : warehouses) {
|
||||
WmsActualWarehouseVo vo = BeanUtil.toBean(warehouse, WmsActualWarehouseVo.class);
|
||||
warehouseMap.put(warehouse.getActualWarehouseId(), vo);
|
||||
}
|
||||
}
|
||||
List<WmsCoilWarehouseOperationLogVo> list = baseMapper.selectVoListWithJoin(new ArrayList<>(warehouseIds), operationType, inOutType, startTime, endTime);
|
||||
|
||||
for (WmsCoilWarehouseOperationLogVo vo : list) {
|
||||
vo.setCoil(coilMap.get(vo.getCoilId()));
|
||||
vo.setWarehouse(warehouseMap.get(vo.getActualWarehouseId()));
|
||||
if (vo.getCoil() != null) {
|
||||
buildItemObjectFromJoin(vo.getCoil());
|
||||
}
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
private void buildItemObjectFromJoin(WmsMaterialCoilVo vo) {
|
||||
if (vo.getItemId() == null || vo.getItemType() == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ("raw_material".equals(vo.getItemType())) {
|
||||
WmsRawMaterialVo rawMaterial = new WmsRawMaterialVo();
|
||||
rawMaterial.setRawMaterialId(vo.getItemId());
|
||||
rawMaterial.setRawMaterialCode(vo.getItemCode());
|
||||
rawMaterial.setRawMaterialName(vo.getItemName());
|
||||
rawMaterial.setSpecification(vo.getSpecification());
|
||||
rawMaterial.setMaterial(vo.getMaterial());
|
||||
rawMaterial.setManufacturer(vo.getManufacturer());
|
||||
rawMaterial.setSurfaceTreatmentDesc(vo.getSurfaceTreatmentDesc());
|
||||
rawMaterial.setZincLayer(vo.getZincLayer());
|
||||
vo.setRawMaterial(rawMaterial);
|
||||
}
|
||||
|
||||
if ("product".equals(vo.getItemType())) {
|
||||
WmsProductVo product = new WmsProductVo();
|
||||
product.setProductId(vo.getItemId());
|
||||
product.setProductCode(vo.getItemCode());
|
||||
product.setProductName(vo.getItemName());
|
||||
product.setSpecification(vo.getSpecification());
|
||||
product.setMaterial(vo.getMaterial());
|
||||
product.setManufacturer(vo.getManufacturer());
|
||||
product.setSurfaceTreatmentDesc(vo.getSurfaceTreatmentDesc());
|
||||
product.setZincLayer(vo.getZincLayer());
|
||||
vo.setProduct(product);
|
||||
}
|
||||
}
|
||||
|
||||
private Set<Long> getAllChildWarehouseIds(Long parentId) {
|
||||
Set<Long> result = new HashSet<>();
|
||||
if (parentId == null) {
|
||||
@@ -258,4 +258,84 @@ public class WmsCoilWarehouseOperationLogServiceImpl implements IWmsCoilWarehous
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<WmsCoilWarehouseOperationLogExportVo> exportBySecondWarehouseIdAndTimeRange(Long secondWarehouseId, Integer operationType, Integer inOutType, Date startTime, Date endTime) {
|
||||
List<WmsCoilWarehouseOperationLogVo> voList = queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, operationType, inOutType, startTime, endTime);
|
||||
|
||||
List<WmsCoilWarehouseOperationLogExportVo> exportList = new ArrayList<>();
|
||||
for (WmsCoilWarehouseOperationLogVo vo : voList) {
|
||||
WmsCoilWarehouseOperationLogExportVo exportVo = new WmsCoilWarehouseOperationLogExportVo();
|
||||
|
||||
WmsMaterialCoilVo coil = vo.getCoil();
|
||||
if (coil != null) {
|
||||
exportVo.setEnterCoilNo(coil.getEnterCoilNo());
|
||||
exportVo.setCurrentCoilNo(coil.getCurrentCoilNo());
|
||||
exportVo.setSupplierCoilNo(coil.getSupplierCoilNo());
|
||||
exportVo.setNetWeight(coil.getNetWeight());
|
||||
exportVo.setItemTypeDesc(coil.getItemType());
|
||||
exportVo.setPurpose(coil.getBusinessPurpose());
|
||||
exportVo.setTrimmingRequirement(coil.getTrimmingRequirement());
|
||||
exportVo.setPackagingRequirement(coil.getPackagingRequirement());
|
||||
exportVo.setQualityStatus(coil.getQualityStatus());
|
||||
exportVo.setPackingStatus(coil.getPackingStatus());
|
||||
exportVo.setStatusDesc(getStatusDesc(coil.getStatus()));
|
||||
exportVo.setItemName(coil.getItemName());
|
||||
exportVo.setSpecification(coil.getSpecification());
|
||||
exportVo.setLength(coil.getLength());
|
||||
exportVo.setMaterial(coil.getMaterial());
|
||||
exportVo.setManufacturer(coil.getManufacturer());
|
||||
exportVo.setSurfaceTreatmentDesc(coil.getSurfaceTreatmentDesc());
|
||||
exportVo.setZincLayer(coil.getZincLayer());
|
||||
exportVo.setCreateTime(coil.getCreateTime());
|
||||
exportVo.setLogicalWarehouseName(coil.getWarehouseName());
|
||||
exportVo.setActualWarehouseName(coil.getActualWarehouseName());
|
||||
}
|
||||
|
||||
WmsActualWarehouseVo warehouse = vo.getWarehouse();
|
||||
if (warehouse != null) {
|
||||
exportVo.setWarehouseName(warehouse.getActualWarehouseName());
|
||||
}
|
||||
|
||||
exportVo.setOperationTypeDesc(getOperationTypeDesc(vo.getOperationType()));
|
||||
exportVo.setInOutTypeDesc(getInOutTypeDesc(vo.getInOutType()));
|
||||
exportVo.setCreateBy(vo.getCreateBy());
|
||||
exportVo.setCreateTimeLog(vo.getCreateTime());
|
||||
exportVo.setRemark(vo.getRemark());
|
||||
|
||||
exportList.add(exportVo);
|
||||
}
|
||||
|
||||
return exportList;
|
||||
}
|
||||
|
||||
private String getStatusDesc(Integer status) {
|
||||
if (status == null) return null;
|
||||
switch (status) {
|
||||
case 0: return "在库";
|
||||
case 1: return "在途";
|
||||
case 2: return "已出库";
|
||||
default: return String.valueOf(status);
|
||||
}
|
||||
}
|
||||
|
||||
private String getOperationTypeDesc(Integer operationType) {
|
||||
if (operationType == null) return null;
|
||||
switch (operationType) {
|
||||
case 1: return "收货";
|
||||
case 2: return "加工";
|
||||
case 3: return "调拨";
|
||||
case 4: return "发货";
|
||||
default: return String.valueOf(operationType);
|
||||
}
|
||||
}
|
||||
|
||||
private String getInOutTypeDesc(Integer inOutType) {
|
||||
if (inOutType == null) return null;
|
||||
switch (inOutType) {
|
||||
case 1: return "入库";
|
||||
case 2: return "出库";
|
||||
default: return String.valueOf(inOutType);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user