Compare commits

..

No commits in common. "63a0196216524a8af3e290ed2435fc70a8137d95" and "72aef9767744f6dda3b04a8cbab0ef783ad63b5a" have entirely different histories.

2 changed files with 0 additions and 19 deletions

View File

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

View File

@ -18,11 +18,9 @@ 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;
@ -45,9 +43,6 @@ public class QmsInspectionItemServiceImpl extends ServiceImpl<QmsInspectionItemM
@Resource @Resource
private IQmsInspectionItemDetailsService detailsService; private IQmsInspectionItemDetailsService detailsService;
@Resource
private IQmsQcMaterialCategoryService materialCategoryService;
// ==================== 新增主表 + 一条明细 ==================== // ==================== 新增主表 + 一条明细 ====================
@Transactional @Transactional
@ -311,15 +306,6 @@ 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());