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-14 09:15:23 +08:00
parent ae2a329016 b1346da373
commit 24bdaeaea4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
View File

@ -1171,14 +1171,17 @@ public class QmsIssueTicketControllerService {
.setId(record.getId()) .setId(record.getId())
.setName(record.getName()) .setName(record.getName())
.setLegend(record.getLegend()) .setLegend(record.getLegend())
.setUnqualifiedQty(0) .setUnqualifiedQty(0);
.setImageIds(record.getImageIds());
records.add(r1); records.add(r1);
return r1; return r1;
}); });
r.setUnqualifiedQty(r.getUnqualifiedQty() + record.getUnqualifiedQty()); r.setUnqualifiedQty(r.getUnqualifiedQty() + record.getUnqualifiedQty());
if (StrUtil.isNotBlank(r.getImageIds())) { if (StrUtil.isNotBlank(record.getImageIds())) {
r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds())); if(StrUtil.isBlank(r.getImageIds())){
r.setImageIds(record.getImageIds());
}else {
r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds()));
}
} }
}); });
records.stream() records.stream()

7
nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
View File

@ -4,10 +4,13 @@
<select id="getNonconformanceDataGroups" <select id="getNonconformanceDataGroups"
resultType="com.nflg.wms.common.pojo.vo.QmsIssueTicketInspectionRecordItemVO"> resultType="com.nflg.wms.common.pojo.vo.QmsIssueTicketInspectionRecordItemVO">
SELECT isic."id",CASE WHEN isi.item_type=0 THEN isi.name ELSE isic."name" END,isic.legend,iitri.unqualified_qty SELECT isic."id",CASE WHEN isi.item_type=0 THEN isi.name ELSE isic."name" END,isic.legend,iitri.unqualified_qty,iitrid.image_ids
FROM qms_incoming_inspection_task_record_item iitri FROM qms_incoming_inspection_task_record iitr
INNER JOIN qms_incoming_inspection_task_record_item iitri ON iitr."id"=iitri.record_id
INNER JOIN qms_incoming_inspection_task_record_item_data iitrid ON iitrid.item_id=iitri."id"
INNER JOIN qms_inspection_standard_item_content isic ON iitri.inspection_standard_item_content_id=isic."id" INNER JOIN qms_inspection_standard_item_content isic ON iitri.inspection_standard_item_content_id=isic."id"
INNER JOIN qms_inspection_standard_item isi ON isic.inspection_standard_item_id=isi."id" INNER JOIN qms_inspection_standard_item isi ON isic.inspection_standard_item_id=isi."id"
WHERE iitr.task_id=#{taskId}
</select> </select>
<select id="getUnqualifiedRecordItems" <select id="getUnqualifiedRecordItems"