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:
yf001217 2026-06-15 15:30:19 +08:00
parent c82c48881a 3b39112245
commit 04ae6faceb
2 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java
View File

@ -623,19 +623,6 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl<QmsCoaReviewMapper, Qms
} }
// 有已发送的COA任务，才需要检查COA报告 // 有已发送的COA任务，才需要检查COA报告
// 判断是否存在COA报告（未删除）
boolean hasReport = lambdaQuery()
.eq(QmsCoaReview::getSupplierId, supplier.getId())
.eq(QmsCoaReview::getMaterialId, material.getId())
.eq(QmsCoaReview::getPurchaseNo, qo.getPurchaseNo())
.eq(QmsCoaReview::getDeleted, false)
.exists();
// 没有COA报告，放行
if (!hasReport) {
return true;
}
// 有COA报告时，检查是否存在已审核通过（status=2）且未删除的COA报告
return lambdaQuery() return lambdaQuery()
.eq(QmsCoaReview::getSupplierId, supplier.getId()) .eq(QmsCoaReview::getSupplierId, supplier.getId())
.eq(QmsCoaReview::getMaterialId, material.getId()) .eq(QmsCoaReview::getMaterialId, material.getId())

12
nflg-wms-repository/src/main/resources/mapper/QmsQualityInspectorMapper.xml
View File

@ -133,13 +133,13 @@
WHERE qi.inspection_type=#{request.inspectionType} AND imi.inspector_id = ( WHERE qi.inspection_type=#{request.inspectionType} AND imi.inspector_id = (
SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1 SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1
) )
<if test="materialNo != null and materialNo != ''"> <if test="request.materialNo != null and request.materialNo != ''">
AND m.material_no = #{request.materialNo} AND m.material_no = #{request.materialNo}
</if> </if>
<if test="materialCategoryCode != null and materialCategoryCode != ''"> <if test="request.materialCategoryCode != null and request.materialCategoryCode != ''">
AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%') AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%')
</if> </if>
<if test="materialDesc != null and materialDesc != ''"> <if test="request.materialDesc != null and request.materialDesc != ''">
AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%') AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%')
</if> </if>
UNION ALL UNION ALL
@ -163,13 +163,13 @@
WHERE qi.inspection_type=#{request.inspectionType} AND imci.inspector_id = ( WHERE qi.inspection_type=#{request.inspectionType} AND imci.inspector_id = (
SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1 SELECT id FROM qms_quality_inspector WHERE user_id = #{userId} LIMIT 1
) )
<if test="materialNo != null and materialNo != ''"> <if test="request.materialNo != null and request.materialNo != ''">
AND m.material_no = #{request.materialNo} AND m.material_no = #{request.materialNo}
</if> </if>
<if test="materialCategoryCode != null and materialCategoryCode != ''"> <if test="request.materialCategoryCode != null and request.materialCategoryCode != ''">
AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%') AND m.material_category_code LIKE CONCAT(#{request.materialCategoryCode}, '%')
</if> </if>
<if test="materialDesc != null and materialDesc != ''"> <if test="request.materialDesc != null and request.materialDesc != ''">
AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%') AND m.material_desc LIKE CONCAT('%', #{request.materialDesc}, '%')
</if> </if>
ORDER BY material_id ASC ORDER BY material_id ASC