diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java index 4e1a4aa0..041f0d17 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java @@ -18,6 +18,11 @@ public class QmsInspectionItemVO { */ private Long materialTypeId; + /** + * 物料类别名称 + */ + private String materialCategoryName; + /** * 检测类型:0=定向,1=定量 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java index b4086adf..07a50311 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java @@ -18,9 +18,11 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionItemVO; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.repository.entity.QmsInspectionItem; import com.nflg.wms.repository.entity.QmsInspectionItemDetails; +import com.nflg.wms.repository.entity.QmsQcMaterialCategory; import com.nflg.wms.repository.mapper.QmsInspectionItemMapper; import com.nflg.wms.repository.service.IQmsInspectionItemDetailsService; import com.nflg.wms.repository.service.IQmsInspectionItemService; +import com.nflg.wms.repository.service.IQmsQcMaterialCategoryService; import jakarta.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +45,9 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl