fix:物料增加标签需要的字段

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;
+    }
 }

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;

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;
 }

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.*;
-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 org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -44,14 +41,20 @@ public interface MaterialInventoryInboundDetailMapper extends BaseMapperX<Materi
         MPJLambdaWrapperX<MaterialInventoryInboundDetailDO> wrapperX = new MPJLambdaWrapperX<MaterialInventoryInboundDetailDO>()
                 .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<Materi
         MPJLambdaWrapperX<MaterialInventoryInboundDetailDO> wrapperX = new MPJLambdaWrapperX<MaterialInventoryInboundDetailDO>()
                 .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);