fix:物料危化品台账
This commit is contained in:
shusir
File diff suppressed because it is too large
Load Diff
@@ -15,23 +15,19 @@ import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryO
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundRespVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryOutboundSaveReqVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.export.MaterialConsumeStatisticsExportVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.export.MaterialHazardousLedgerExportVO;
|
||||
import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryOutboundDO;
|
||||
import com.zt.plat.module.qms.resource.material.service.MaterialInventoryOutboundService;
|
||||
import com.zt.plat.module.qms.resource.material.utils.ComplexExcelUtils;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import jakarta.validation.Valid;
|
||||
import org.jspecify.annotations.NonNull;
|
||||
import org.springframework.security.access.prepost.PreAuthorize;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import static com.zt.plat.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo.export;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "管理后台 - 物料危化品台账导出VO")
|
||||
@Data
|
||||
//@ExcelIgnoreUnannotated
|
||||
public class MaterialHazardousLedgerExportVO {
|
||||
// 基础信息
|
||||
private Integer serialNo; // 序号
|
||||
private String company; // 单位
|
||||
private String name; // 名称
|
||||
private String substance; // 物质 json
|
||||
private String hazardFeature; // 危险特性 json
|
||||
private String englishName; // 英文名 json
|
||||
private String alias; // 别名 json
|
||||
private String hazardCategory; // 危险类别 json
|
||||
private String isToxic; // 是否剧毒 json
|
||||
private String casNo; // CAS 号 json
|
||||
private String unNo; // UN 号 json
|
||||
private String hazardCode; // 危规号 json
|
||||
|
||||
// 储存情况 - 合计
|
||||
private String totalQuantity; // 储存量合计 (瓶)
|
||||
|
||||
// 化学分析室
|
||||
private String chemStoreLocation; // 存放地点
|
||||
private String chemQuantity; // 储存量 (瓶)
|
||||
private String chemSpec; // 规格
|
||||
private String chemUseLocation; // 使用地点 json
|
||||
private String chemUse; // 用途 json
|
||||
|
||||
// 综合分析室
|
||||
private String compStoreLocation; // 存放地点
|
||||
private String compQuantity; // 储存量 (瓶)
|
||||
private String compSpec; // 规格
|
||||
private String compUseLocation; // 使用地点
|
||||
private String compUse; // 用途
|
||||
|
||||
// 试金分析室
|
||||
private String trialStoreLocation; // 存放地点
|
||||
private String trialQuantity; // 储存量 (瓶)
|
||||
private String trialSpec; // 规格
|
||||
private String trialUseLocation; // 使用地点
|
||||
private String trialUse; // 用途
|
||||
|
||||
// 其他
|
||||
private String isExplosive; // 易制爆
|
||||
private String isPoisonous; // 易制毒
|
||||
private String remark; // 备注
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo.export;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
@Schema(description = "管理后台 - 物料危化品台账导出VO")
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class MaterialLedgerExportVO {
|
||||
// 基础信息
|
||||
// @ExcelProperty(value = "序号", index = 0)
|
||||
private Integer serialNo;
|
||||
@ExcelProperty(value = "单位")
|
||||
private String companyName;
|
||||
@ExcelProperty(value = "名称")
|
||||
private String productName;
|
||||
@ExcelProperty(value = "物质")
|
||||
private String substance;
|
||||
@ExcelProperty(value = "危险特性")
|
||||
private String hazardFeature;
|
||||
@ExcelProperty(value = "英文名")
|
||||
private String englishName;
|
||||
@ExcelProperty(value = "别名")
|
||||
private String alias;
|
||||
@ExcelProperty(value = "危险类别")
|
||||
private String hazardCategory;
|
||||
@ExcelProperty(value = "是否剧毒")
|
||||
private String isToxic;
|
||||
@ExcelProperty(value = "CAS 号")
|
||||
private String casNo;
|
||||
@ExcelProperty(value = "UN 号")
|
||||
private String unNo;
|
||||
@ExcelProperty(value = "危规号")
|
||||
private String hazardCode;
|
||||
|
||||
// 储存情况 - 合计
|
||||
@ExcelProperty(value = "储存量合计")
|
||||
private String inventoryQuantity;
|
||||
|
||||
@ExcelProperty("部门")
|
||||
private String departmentName;
|
||||
@ExcelProperty(value = "存放地点")
|
||||
private String locationName;
|
||||
@ExcelProperty(value = "储存量")
|
||||
private String departmentInventoryQuantity;
|
||||
@ExcelProperty(value = "规格")
|
||||
private String specification;
|
||||
@ExcelProperty(value = "使用地点")
|
||||
private String useLocation;
|
||||
@ExcelProperty(value = "用途")
|
||||
private String use;
|
||||
|
||||
// 其他
|
||||
@ExcelProperty(value = "易制爆")
|
||||
private String isExplosive;
|
||||
@ExcelProperty(value = "易制毒")
|
||||
private String isPoisonous;
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
}
|
||||
@@ -1,13 +1,12 @@
|
||||
package com.zt.plat.module.qms.resource.material.controller.vo.resp;
|
||||
|
||||
import cn.hutool.json.JSONObject;
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.zt.plat.module.qms.core.aspect.annotation.Dict;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Schema(description = "管理后台 - 物料台账 Response VO")
|
||||
@@ -19,21 +18,21 @@ public class MaterialInfomationLedgerRespVO {
|
||||
@ExcelProperty("物料大类id")
|
||||
private Long productId;
|
||||
|
||||
@Schema(description = "物料大类")
|
||||
@ExcelProperty("物料大类")
|
||||
@Schema(description = "物料名称")
|
||||
@ExcelProperty("物料名称")
|
||||
private String productName;
|
||||
|
||||
@Schema(description = "物料大类编码")
|
||||
@ExcelProperty("物料大类编码")
|
||||
private String productCode;
|
||||
|
||||
@Schema(description = "工段上级部门id")
|
||||
@ExcelProperty("工段上级部门id")
|
||||
private Long superiorDepartmentId;
|
||||
@Schema(description = "公司id")
|
||||
@ExcelProperty("公司id")
|
||||
private Long companyId;
|
||||
|
||||
@Schema(description = "工段上级部门")
|
||||
@ExcelProperty("工段上级部门")
|
||||
private String superiorDepartmentName;
|
||||
@Schema(description = "公司 - 取上级部门")
|
||||
@ExcelProperty("单位")
|
||||
private String companyName;
|
||||
|
||||
@Schema(description = "库存数量")
|
||||
@ExcelProperty("库存数量")
|
||||
@@ -53,15 +52,15 @@ public class MaterialInfomationLedgerRespVO {
|
||||
|
||||
@Schema(description = "工段部门id")
|
||||
@ExcelProperty("工段部门id")
|
||||
private Long assignDepartmentId;
|
||||
private Long departmentId;
|
||||
|
||||
@Schema(description = "工段分配部门名称")
|
||||
@ExcelProperty("工段分配部门名称")
|
||||
private String assignDepartmentName;
|
||||
private String departmentName;
|
||||
|
||||
@Schema(description = "工段部门库存数量")
|
||||
@ExcelProperty("工段部门库存数量")
|
||||
private BigDecimal assignDepartmentInventoryQuantity;
|
||||
private BigDecimal departmentInventoryQuantity;
|
||||
|
||||
@Schema(description = "存放位置", example = "13603")
|
||||
@ExcelProperty("存放位置")
|
||||
@@ -93,7 +92,7 @@ public class MaterialInfomationLedgerRespVO {
|
||||
|
||||
@Schema(description = "大类其他配置")
|
||||
@ExcelProperty("大类其他配置")
|
||||
private String productCustomConfig;
|
||||
private JSONObject productCustomConfig;
|
||||
|
||||
@Schema(description = "备注")
|
||||
@ExcelProperty("备注")
|
||||
|
||||
@@ -230,16 +230,20 @@ public interface MaterialInfomationMapper extends BaseMapperX<MaterialInfomation
|
||||
return selectJoinList(MaterialInfoWithBizConfigVO.class, wrapper);
|
||||
}
|
||||
|
||||
default PageResult<MaterialInfomationLedgerRespVO> selectInventoryLedgerPage(MaterialInfomationPageReqVO pageReqVO) {
|
||||
default PageResult<MaterialInfomationLedgerRespVO> selectInventoryLedgerPage(MaterialInfomationPageReqVO reqVO) {
|
||||
MPJLambdaWrapper<MaterialInfomationDO> wrapper = new MPJLambdaWrapperX<MaterialInfomationDO>()
|
||||
.select(MaterialInfomationDO::getProductId)
|
||||
.selectAs(MaterialInfomationDO::getDeptId, MaterialInfomationLedgerRespVO::getAssignDepartmentId)
|
||||
.selectAs(MaterialInfomationDO::getDeptId, MaterialInfomationLedgerRespVO::getDepartmentId)
|
||||
.select(MaterialInfomationDO::getLocationId)
|
||||
.selectCount(MaterialInfomationDO::getId, MaterialInfomationLedgerRespVO::getAssignDepartmentInventoryQuantity)
|
||||
.selectCount(MaterialInfomationDO::getId, MaterialInfomationLedgerRespVO::getDepartmentInventoryQuantity)
|
||||
.innerJoin(MaterialProductDO.class, MaterialProductDO::getId, MaterialInfomationDO::getProductId)
|
||||
.eqIfExists(MaterialProductDO::getHazardous, reqVO.getHazardous())
|
||||
.eq(MaterialInfomationDO::getUsageStatus, 0)
|
||||
.likeIfExists(MaterialProductDO::getName, reqVO.getName())
|
||||
.groupBy(MaterialInfomationDO::getProductId,
|
||||
MaterialInfomationDO::getDeptId,
|
||||
MaterialInfomationDO::getLocationId);
|
||||
|
||||
return selectJoinPage(pageReqVO, MaterialInfomationLedgerRespVO.class, wrapper);
|
||||
return selectJoinPage(reqVO, MaterialInfomationLedgerRespVO.class, wrapper);
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.zt.plat.module.qms.resource.material.service;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
@@ -26,14 +27,12 @@ import com.zt.plat.module.system.api.dept.DeptApi;
|
||||
import com.zt.plat.module.system.api.dept.dto.DeptRespDTO;
|
||||
import groovy.util.logging.Slf4j;
|
||||
import jakarta.annotation.Resource;
|
||||
import org.jspecify.annotations.Nullable;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.validation.annotation.Validated;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
@@ -376,19 +375,19 @@ public class MaterialInfomationServiceImpl implements MaterialInfomationService
|
||||
private void calculateSuperiorDepartmentInventory(List<MaterialInfomationLedgerRespVO> list) {
|
||||
// 按上级部门 ID 分组，统计每个上级部门的总库存
|
||||
Map<Long, BigDecimal> superiorDeptInventoryMap = list.stream()
|
||||
.filter(item -> item.getSuperiorDepartmentId() != null)
|
||||
.filter(item -> item.getCompanyId() != null)
|
||||
.collect(Collectors.groupingBy(
|
||||
MaterialInfomationLedgerRespVO::getSuperiorDepartmentId,
|
||||
MaterialInfomationLedgerRespVO::getCompanyId,
|
||||
Collectors.reducing(
|
||||
BigDecimal.ZERO,
|
||||
MaterialInfomationLedgerRespVO::getAssignDepartmentInventoryQuantity,
|
||||
MaterialInfomationLedgerRespVO::getDepartmentInventoryQuantity,
|
||||
BigDecimal::add
|
||||
)
|
||||
));
|
||||
|
||||
// 将累加结果设置到每条记录中
|
||||
list.forEach(item -> {
|
||||
BigDecimal totalInventory = superiorDeptInventoryMap.get(item.getSuperiorDepartmentId());
|
||||
BigDecimal totalInventory = superiorDeptInventoryMap.get(item.getCompanyId());
|
||||
item.setInventoryQuantity(totalInventory != null ? totalInventory : BigDecimal.ZERO);
|
||||
});
|
||||
}
|
||||
@@ -409,29 +408,24 @@ public class MaterialInfomationServiceImpl implements MaterialInfomationService
|
||||
|
||||
private void enrichDepartmentInfo(List<MaterialInfomationLedgerRespVO> list) {
|
||||
// 部门信息
|
||||
List<Long> deptIds = list.stream().map(MaterialInfomationLedgerRespVO::getAssignDepartmentId).toList();
|
||||
List<Long> deptIds = list.stream().map(MaterialInfomationLedgerRespVO::getDepartmentId).toList();
|
||||
CommonResult<List<DeptRespDTO>> deptListResult = deptApi.getDeptList(deptIds);
|
||||
List<DeptRespDTO> deptList = deptListResult.getData();
|
||||
if (CollUtil.isEmpty(deptList)) return;
|
||||
Map<Long, DeptRespDTO> deptMap = deptList.stream().collect(Collectors.toMap(DeptRespDTO::getId, Function.identity()));
|
||||
list.forEach(item -> {
|
||||
DeptRespDTO dept = deptMap.get(item.getAssignDepartmentId());
|
||||
item.setAssignDepartmentName(dept.getName());
|
||||
DeptRespDTO dept = deptMap.get(item.getDepartmentId());
|
||||
item.setDepartmentName(dept.getName());
|
||||
});
|
||||
log.info("[enrichDepartmentInfo] 部门信息:{}", deptList);
|
||||
List<Long> deptPrnIds = deptList.stream().map(DeptRespDTO::getParentId).toList();
|
||||
log.info("[enrichDepartmentInfo] 父级部门ID:{}", deptPrnIds);
|
||||
CommonResult<DeptRespDTO> dept1 = deptApi.getDept(deptPrnIds.get(0));
|
||||
log.info("[enrichDepartmentInfo] 父级部门:{}", dept1.getData());
|
||||
CommonResult<List<DeptRespDTO>> deptPrnListResult = deptApi.getDeptList(deptPrnIds);
|
||||
List<DeptRespDTO> deptPrnList = deptPrnListResult.getData();
|
||||
log.info("[enrichDepartmentInfo] 父级部门信息:{}", deptPrnList);
|
||||
if (CollUtil.isEmpty(deptPrnList)) return;
|
||||
Map<Long, DeptRespDTO> deptPrnMap = deptPrnList.stream().collect(Collectors.toMap(DeptRespDTO::getId, Function.identity()));
|
||||
list.forEach(item -> {
|
||||
DeptRespDTO dept = deptMap.get(item.getAssignDepartmentId());
|
||||
DeptRespDTO dept = deptMap.get(item.getDepartmentId());
|
||||
DeptRespDTO deptPrn = deptPrnMap.get(dept.getParentId());
|
||||
item.setSuperiorDepartmentId(deptPrn.getId()).setSuperiorDepartmentName(deptPrn.getName());
|
||||
item.setCompanyId(deptPrn.getId()).setCompanyName(deptPrn.getName());
|
||||
});
|
||||
}
|
||||
|
||||
@@ -444,7 +438,7 @@ public class MaterialInfomationServiceImpl implements MaterialInfomationService
|
||||
MaterialProductDO productDO = productMap.get(item.getProductId());
|
||||
item.setProductName(productDO.getName())
|
||||
.setProductCode(productDO.getCode())
|
||||
.setProductCustomConfig(productDO.getCustomConfig());
|
||||
.setProductCustomConfig(JSONUtil.parseObj(productDO.getCustomConfig()));
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -2,7 +2,7 @@ package com.zt.plat.module.qms.resource.material.utils;
|
||||
|
||||
import com.alibaba.excel.EasyExcel;
|
||||
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.export.MaterialHazardousLedgerExportVO;
|
||||
import com.zt.plat.module.qms.resource.material.controller.vo.export.MaterialLedgerExportVO;
|
||||
import com.zt.plat.module.qms.resource.material.handler.excel.MaterialHazardousLedgerHeadHandler;
|
||||
import com.zt.plat.module.qms.resource.material.handler.excel.MaterialHazardousLedgerStyleHandler;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
@@ -15,9 +15,9 @@ import java.util.List;
|
||||
public class ComplexExcelUtils {
|
||||
public static void writeHazardousLedger(HttpServletResponse response,
|
||||
String filename, String sheetName,
|
||||
List<MaterialHazardousLedgerExportVO> dataList) throws IOException {
|
||||
List<MaterialLedgerExportVO> dataList) throws IOException {
|
||||
// 创建 ExcelWriter
|
||||
EasyExcel.write(response.getOutputStream(), MaterialHazardousLedgerExportVO.class)
|
||||
EasyExcel.write(response.getOutputStream(), MaterialLedgerExportVO.class)
|
||||
.autoCloseStream(false)
|
||||
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
|
||||
// 注册自定义表头处理器
|
||||
|
||||
Reference in New Issue
Block a user