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

Merge remote-tracking branch 'origin/qms/develop' into qms/develop

This commit is contained in:
funny 2026-05-12 15:44:36 +08:00
parent e0c16e2c54 4daa6983be
commit 8e9b0fb66b
6 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsInspectionStandardControllerService.java
View File

@ -200,6 +200,7 @@ public class QmsInspectionStandardControllerService {
detail.setUpdateUserId(standard.getUpdateUserId());
detail.setUpdateUserName(standard.getUpdateUserName());
detail.setUpdateTime(standard.getUpdateTime());
detail.setIqeName(StrUtil.join(",",inspectionStandardService.getIQENames(standard.getId())));
// 填充检测方式、抽样方案、检验水平、AQL相关字段
detail.setTestingMethodDictItemId(standard.getTestingMethodDictItemId());

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsInspectionStandardMapper.java
View File

@ -10,6 +10,7 @@ import com.nflg.wms.common.pojo.vo.QmsInspectionStandardVO;
import com.nflg.wms.repository.entity.QmsInspectionStandard;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;
import java.util.List;
/**
@ -28,4 +29,6 @@ public interface QmsInspectionStandardMapper extends BaseMapper<QmsInspectionSta
QmsInspectionStandardDetailDTO getDetailById(@Param("id") Long id);
List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id);
Collection<String> getIQENames(Long id);
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsInspectionStandardService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.nflg.wms.common.pojo.vo.QmsIncomingInspectionTaskCheckItemVO;
import com.nflg.wms.repository.entity.QmsInspectionStandard;
import java.util.Collection;
import java.util.List;
/**
@ -25,4 +26,6 @@ public interface IQmsInspectionStandardService extends IService<QmsInspectionSta
void enable(Long id, Boolean enable);
List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id);
Collection<String> getIQENames(Long id);
}

6
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsInspectionStandardServiceImpl.java
View File

@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@ -115,4 +116,9 @@ public class QmsInspectionStandardServiceImpl extends ServiceImpl<QmsInspectionS
public List<QmsIncomingInspectionTaskCheckItemVO> getItemsForCheck(Long id) {
return baseMapper.getItemsForCheck(id);
}
@Override
public Collection<String> getIQENames(Long id) {
return baseMapper.getIQENames(id);
}
}

11
nflg-wms-repository/src/main/resources/mapper/QmsInspectionStandardMapper.xml
View File

@ -80,7 +80,7 @@
FROM qms_inspection_standard s
LEFT JOIN qms_qc_material m ON s.material_id = m.id
LEFT JOIN qms_inspector_material_item imi ON imi.material_id = m.id
LEFT JOIN qms_quality_inspector iqe ON m.id = imi.inspector_id AND iqe.inspection_type = 1 AND iqe.enable = true
LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true
LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id
WHERE s.id = #{id}
GROUP BY s.id, s.material_id, m.material_no, m.material_category_code_path_name, m.material_desc, m.drawing_no_ver,
@ -106,4 +106,13 @@
INNER JOIN qms_inspection_standard_item_content qisic ON qisi."id" = qisic.inspection_standard_item_id
WHERE qisi.inspection_standard_id = #{id}
</select>
<select id="getIQENames" resultType="java.lang.String">
select iqe_user.user_name
from qms_inspection_standard s
LEFT JOIN qms_inspector_material_item imi ON imi.material_id = s.material_id
LEFT JOIN qms_quality_inspector iqe ON imi.inspector_id = iqe.id AND iqe.inspection_type = 1 AND iqe.enable = true
LEFT JOIN "user" iqe_user ON iqe.user_id = iqe_user.id
where s.id = #{id}
</select>
</mapper>

2
nflg-wms-starter/src/main/java/com/nflg/wms/starter/advice/GlobalRestControllerAdvice.java
View File

@ -68,6 +68,8 @@ public class GlobalRestControllerAdvice {
@ExceptionHandler(NotLoginException.class)
@ResponseStatus(HttpStatus.UNAUTHORIZED) // 返回 401 状态码
public String handleNotLoginException(NotLoginException e) {
log.error("未登录异常类型: {}", e.getType());
log.error("未登录异常信息: {}", e.getMessage());
return "请重新登录";
}