zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:物料根据前端调整显示字段

Browse Source
This commit is contained in:
shusir
2026-03-17 18:06:07 +08:00
parent 7f2b6ea261
commit a5b9584af0
4 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialBatchRespVO.java
View File

@@ -50,6 +50,10 @@ public class MaterialBatchRespVO {
@ExcelProperty("物料大类型号") @ExcelProperty("物料大类型号")
private String productModelNo; private String productModelNo;
@Schema(description = "单位")
@ExcelProperty("单位")
private String unit;
@Schema(description = "额定容量") @Schema(description = "额定容量")
@ExcelProperty("额定容量") @ExcelProperty("额定容量")
private BigDecimal standardCapacity; private BigDecimal standardCapacity;

4
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialLifecycleDetailRespVO.java
View File

@@ -46,6 +46,10 @@ public class MaterialLifecycleDetailRespVO {
@ExcelProperty("保质期") @ExcelProperty("保质期")
private Integer due; private Integer due;
@Schema(description = "物料规格")
@ExcelProperty("物料规格")
private String productSpecification;
@Schema(description = "物料大类型号") @Schema(description = "物料大类型号")
@ExcelProperty("物料大类型号") @ExcelProperty("物料大类型号")
private String productModelNo; private String productModelNo;

1
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialBatchMapper.java
View File

@@ -59,6 +59,7 @@ public interface MaterialBatchMapper extends BaseMapperX<MaterialBatchDO> {
.selectAs(MaterialProductDO::getStandardCapacity, MaterialBatchRespVO::getStandardCapacity) .selectAs(MaterialProductDO::getStandardCapacity, MaterialBatchRespVO::getStandardCapacity)
.selectAs(MaterialProductDO::getSpecification, MaterialBatchRespVO::getProductSpecification) .selectAs(MaterialProductDO::getSpecification, MaterialBatchRespVO::getProductSpecification)
.selectAs(MaterialProductDO::getModelNo, MaterialBatchRespVO::getProductModelNo) .selectAs(MaterialProductDO::getModelNo, MaterialBatchRespVO::getProductModelNo)
.selectAs(MaterialProductDO::getUnit, MaterialBatchRespVO::getUnit)
// 标签模板，用于入库 // 标签模板，用于入库
.selectAs(MaterialProductDO::getLabelTemplateKey, MaterialBatchRespVO::getLabelTemplateKey) .selectAs(MaterialProductDO::getLabelTemplateKey, MaterialBatchRespVO::getLabelTemplateKey)
// 生产日期和到期日期，用于验收和入库 // 生产日期和到期日期，用于验收和入库

2
zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialLifecycleDetailMapper.java
View File

@@ -45,10 +45,12 @@ public interface MaterialLifecycleDetailMapper extends BaseMapperX<MaterialLifec
.selectAll(MaterialLifecycleDetailDO.class) .selectAll(MaterialLifecycleDetailDO.class)
.selectAs("product.NAME", MaterialLifecycleDetailRespVO::getProductName) .selectAs("product.NAME", MaterialLifecycleDetailRespVO::getProductName)
.selectAs("product.CD", MaterialLifecycleDetailRespVO::getProductCode) .selectAs("product.CD", MaterialLifecycleDetailRespVO::getProductCode)
.selectAs("product.SPEC", MaterialLifecycleDetailRespVO::getProductSpecification)
.selectAs("product.MDL_NO", MaterialLifecycleDetailRespVO::getProductModelNo) .selectAs("product.MDL_NO", MaterialLifecycleDetailRespVO::getProductModelNo)
.selectAs("product.UNT", MaterialLifecycleDetailRespVO::getUnit) .selectAs("product.UNT", MaterialLifecycleDetailRespVO::getUnit)
.selectAs("batch.BAT_NO", MaterialLifecycleDetailRespVO::getBatchNo) .selectAs("batch.BAT_NO", MaterialLifecycleDetailRespVO::getBatchNo)
.selectAs("gongduan.INB_QTY", MaterialLifecycleDetailRespVO::getInfluenceCount) .selectAs("gongduan.INB_QTY", MaterialLifecycleDetailRespVO::getInfluenceCount)
.selectAs("gongduan.ASN_DEPT_NAME", MaterialLifecycleDetailRespVO::getAssignDepartmentName)
.leftJoin(MaterialProductDO.class, "product", MaterialProductDO::getId, MaterialLifecycleDetailDO::getProductId) .leftJoin(MaterialProductDO.class, "product", MaterialProductDO::getId, MaterialLifecycleDetailDO::getProductId)
.leftJoin(MaterialBatchDO.class, "batch", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchId) .leftJoin(MaterialBatchDO.class, "batch", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchId)
.leftJoin(MaterialBatchDO.class, "gongduan", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchGongduanId) .leftJoin(MaterialBatchDO.class, "gongduan", MaterialBatchDO::getId, MaterialLifecycleDetailDO::getBatchGongduanId)