From 94b1fe6a9c7968b7c0498cc37ef1ee41d5a678e2 Mon Sep 17 00:00:00 2001 From: shusir <497819738@qq.com> Date: Fri, 27 Mar 2026 18:08:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=89=A9=E6=96=99=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=9C=80=E8=A6=81=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/vo/MaterialInfomationRespVO.java | 9 +++++++++ .../MaterialInventoryInboundDetailRespVO.java | 15 +++++++++++++++ .../controller/vo/assist/MaterialQrCode.java | 12 ++++++++++++ .../MaterialInventoryInboundDetailMapper.java | 17 +++++++++++++---- 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java index 36a849ad..8c610d30 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInfomationRespVO.java @@ -228,4 +228,13 @@ public class MaterialInfomationRespVO { qrCode.setName(this.name); return JSONUtil.toJsonStr(qrCode); } + + // 用于标签 + public String getInfomationName() { + return this.name; + } + + public String getInfomationCode() { + return this.code; + } } \ No newline at end of file diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java index d18feb7e..785c3bf7 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/MaterialInventoryInboundDetailRespVO.java @@ -57,6 +57,21 @@ public class MaterialInventoryInboundDetailRespVO { @ExcelProperty("存放位置编码") private String locationCode; + @Schema(description = "制造商") + private String manufacturer; + + @Schema(description = "标签模板") + private String labelTemplateKey; + + @Schema(description = "批次号") + private String batchNo; + + @Schema(description = "规格") + private String specification; + + @Schema(description = "有效期") + private String expirationDate; + @Schema(description = "入库人", example = "赵六") @ExcelProperty("入库人") private String inboundUserName; diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialQrCode.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialQrCode.java index b50d3c86..2a2754ae 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialQrCode.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/controller/vo/assist/MaterialQrCode.java @@ -15,4 +15,16 @@ public class MaterialQrCode { * 名称 */ private String name; + /** + * 批次号 + */ + private String batchNo; + /** + * 规格 + */ + private String specification; + /** + * 制造商 + */ + private String manufacturer; } diff --git a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java index 91f904e8..52004bce 100644 --- a/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java +++ b/zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/resource/material/dal/mapper/MaterialInventoryInboundDetailMapper.java @@ -7,10 +7,7 @@ import com.zt.plat.framework.mybatis.core.query.MPJLambdaWrapperX; import com.zt.plat.module.qms.business.config.dal.dataobject.ConfigWarehouseLocationDO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailPageReqVO; import com.zt.plat.module.qms.resource.material.controller.vo.MaterialInventoryInboundDetailRespVO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInfomationDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialInventoryInboundDetailDO; -import com.zt.plat.module.qms.resource.material.dal.dataobject.MaterialProductDO; +import com.zt.plat.module.qms.resource.material.dal.dataobject.*; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -44,14 +41,20 @@ public interface MaterialInventoryInboundDetailMapper extends BaseMapperX wrapperX = new MPJLambdaWrapperX() .selectAll(MaterialInventoryInboundDetailDO.class) .selectAs(MaterialInfomationDO::getCode, MaterialInventoryInboundDetailRespVO::getInfomationCode) + .selectAs(MaterialInfomationDO::getExpirationDate, MaterialInventoryInboundDetailRespVO::getExpirationDate) .selectAs(MaterialProductDO::getName, MaterialInventoryInboundDetailRespVO::getInfomationName) + .selectAs(MaterialProductDO::getManufacturer, MaterialInventoryInboundDetailRespVO::getManufacturer) + .selectAs(MaterialProductDO::getLabelTemplateKey, MaterialInventoryInboundDetailRespVO::getLabelTemplateKey) + .selectAs(MaterialProductDO::getSpecification, MaterialInventoryInboundDetailRespVO::getSpecification) .selectAs(MaterialInventoryInboundDO::getBusinessType, MaterialInventoryInboundDetailRespVO::getBusinessType) .selectAs(ConfigWarehouseLocationDO::getName, MaterialInventoryInboundDetailRespVO::getLocationName) .selectAs(ConfigWarehouseLocationDO::getCode, MaterialInventoryInboundDetailRespVO::getLocationCode) + .selectAs(MaterialBatchDO::getBatchNo, MaterialInventoryInboundDetailRespVO::getBatchNo) .leftJoin(MaterialInfomationDO.class, MaterialInfomationDO::getId, MaterialInventoryInboundDetailDO::getMaterialInfomationId) .leftJoin(MaterialProductDO.class, MaterialProductDO::getId, MaterialInfomationDO::getProductId) .leftJoin(MaterialInventoryInboundDO.class, MaterialInventoryInboundDO::getId, MaterialInventoryInboundDetailDO::getInboundId) .leftJoin(ConfigWarehouseLocationDO.class, ConfigWarehouseLocationDO::getId, MaterialInfomationDO::getLocationId) + .leftJoin(MaterialBatchDO.class, MaterialBatchDO::getId, MaterialInfomationDO::getBatchId) .eqIfPresent(MaterialInfomationDO::getProductId, reqVO.getProductId()) .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundId, reqVO.getInboundId()) .eqIfPresent(MaterialInventoryInboundDetailDO::getBatchId, reqVO.getBatchId()) @@ -73,12 +76,18 @@ public interface MaterialInventoryInboundDetailMapper extends BaseMapperX wrapperX = new MPJLambdaWrapperX() .selectAll(MaterialInventoryInboundDetailDO.class) .selectAs(MaterialInfomationDO::getCode, MaterialInventoryInboundDetailRespVO::getInfomationCode) + .selectAs(MaterialInfomationDO::getExpirationDate, MaterialInventoryInboundDetailRespVO::getExpirationDate) .selectAs(MaterialProductDO::getName, MaterialInventoryInboundDetailRespVO::getInfomationName) + .selectAs(MaterialProductDO::getManufacturer, MaterialInventoryInboundDetailRespVO::getManufacturer) + .selectAs(MaterialProductDO::getLabelTemplateKey, MaterialInventoryInboundDetailRespVO::getLabelTemplateKey) + .selectAs(MaterialProductDO::getSpecification, MaterialInventoryInboundDetailRespVO::getSpecification) .selectAs(MaterialInventoryInboundDO::getBusinessType, MaterialInventoryInboundDetailRespVO::getBusinessType) .selectAs(ConfigWarehouseLocationDO::getName, MaterialInventoryInboundDetailRespVO::getLocationName) .selectAs(ConfigWarehouseLocationDO::getCode, MaterialInventoryInboundDetailRespVO::getLocationCode) + .selectAs(MaterialBatchDO::getBatchNo, MaterialInventoryInboundDetailRespVO::getBatchNo) .leftJoin(MaterialInfomationDO.class, MaterialInfomationDO::getId, MaterialInventoryInboundDetailDO::getMaterialInfomationId) .leftJoin(MaterialProductDO.class, MaterialProductDO::getId, MaterialInfomationDO::getProductId) + .leftJoin(MaterialBatchDO.class, MaterialBatchDO::getId, MaterialInfomationDO::getBatchId) .leftJoin(MaterialInventoryInboundDO.class, MaterialInventoryInboundDO::getId, MaterialInventoryInboundDetailDO::getInboundId) .leftJoin(ConfigWarehouseLocationDO.class, ConfigWarehouseLocationDO::getId, MaterialInfomationDO::getLocationId) .eqIfPresent(MaterialInventoryInboundDetailDO::getInboundId, inboundId);