diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java index 7c91bb2a..e65a9bd1 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/IncomingInspectionTaskControllerService.java @@ -756,16 +756,10 @@ public class IncomingInspectionTaskControllerService { List datas = inspectionStandardService.getItemsForCheck(standard.getId()); VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(datas)).throwMessage("未设置检验项目"); Integer count = incomingInspectionTaskRecordService.getCount(task.getId()); - Integer total; - if (Objects.equals(standard.getTestingMethodDictItemId(), dictionaryItemService.getIdByCode("InspectionStandardTestingMethod", "Full"))) { - total = task.getInspectionQty(); - } else { - total = getCountOfSampling(task.getId(), task.getInspectionQty(), standard); - } - VUtil.trueThrowBusinessError(count > total).throwMessage("样本数量不能大于总数量"); + VUtil.trueThrowBusinessError(count > task.getDetectionQty()).throwMessage("样本数量不能大于总数量"); return new QmsIncomingInspectionTaskCheckDetailVO() .setItems(datas) - .setCount(total - count) + .setCount(Math.min(task.getDetectionQty() - count,request.getNum())) .setPdfDrawings( inspectionStandardItemService.lambdaQuery() .select(QmsInspectionStandardItem::getPdfDrawing) diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java index 5062e71d..02310182 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsIncomingInspectionTaskVO.java @@ -37,6 +37,11 @@ public class QmsIncomingInspectionTaskVO { */ private String drawingNoVer; + /** + * 物料规格 + */ + private String materialSpecifications; + /** * 检验标准id */ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml index feb6ff33..95287b34 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml @@ -42,7 +42,8 @@ t.callback_result, t.warehouse, t.storage_days, - t.storage_location + t.storage_location, + t.detection_qty FROM qms_incoming_inspection_task t LEFT JOIN qms_qc_material m ON t.material_id = m.id LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id @@ -177,51 +178,51 @@ diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml index 633f6884..5656dda7 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordMapper.xml @@ -3,6 +3,6 @@