rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/qms/develop' into qms/develop

This commit is contained in:
曹鹏飞 2026-04-16 18:06:23 +08:00
parent 793100f124 63a0196216
commit 8680c34da9
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsInspectionItemVO.java
View File

@ -18,6 +18,11 @@ public class QmsInspectionItemVO {
*/ */
private Long materialTypeId; private Long materialTypeId;
/**
* 物料类别名称
*/
private String materialCategoryName;
/** /**
* 检测类型：0=定向，1=定量 * 检测类型：0=定向，1=定量
*/ */

14
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionItemServiceImpl.java
View File

@ -18,9 +18,11 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionItemVO;
import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.UserUtil;
import com.nflg.wms.repository.entity.QmsInspectionItem; import com.nflg.wms.repository.entity.QmsInspectionItem;
import com.nflg.wms.repository.entity.QmsInspectionItemDetails; 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.mapper.QmsInspectionItemMapper;
import com.nflg.wms.repository.service.IQmsInspectionItemDetailsService; import com.nflg.wms.repository.service.IQmsInspectionItemDetailsService;
import com.nflg.wms.repository.service.IQmsInspectionItemService; import com.nflg.wms.repository.service.IQmsInspectionItemService;
import com.nflg.wms.repository.service.IQmsQcMaterialCategoryService;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
@ -43,6 +45,9 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
@Resource @Resource
private IQmsInspectionItemDetailsService detailsService; private IQmsInspectionItemDetailsService detailsService;
@Resource
private IQmsQcMaterialCategoryService materialCategoryService;
// ==================== 新增（主表 + 一条明细） ==================== // ==================== 新增（主表 + 一条明细） ====================
@Transactional @Transactional
@ -306,6 +311,15 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
QmsInspectionItemVO vo = new QmsInspectionItemVO(); QmsInspectionItemVO vo = new QmsInspectionItemVO();
vo.setId(item.getId()); vo.setId(item.getId());
vo.setMaterialTypeId(item.getMaterialTypeId()); vo.setMaterialTypeId(item.getMaterialTypeId());
// 查询物料类别名称
if (Objects.nonNull(item.getMaterialTypeId())) {
QmsQcMaterialCategory category = materialCategoryService.getById(item.getMaterialTypeId());
if (Objects.nonNull(category)) {
vo.setMaterialCategoryName(category.getCategoryName());
}
}
vo.setDetectionType(item.getDetectionType()); vo.setDetectionType(item.getDetectionType());
vo.setInspectionItemName(item.getInspectionItemName()); vo.setInspectionItemName(item.getInspectionItemName());
vo.setInspectionNo(item.getInspectionNo()); vo.setInspectionNo(item.getInspectionNo());