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 473b14a1..7041f4cc 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 @@ -213,7 +213,8 @@ public class IncomingInspectionTaskControllerService { .setInspectorId(inspectorId) .setInspectorName(inspectorName) .setSubmitTime(now) - .setRequiredFinishTime(requiredFinishTime); + .setRequiredFinishTime(requiredFinishTime) + .setBatchNo(request.getBatchNo()); incomingInspectionTaskService.save(task); @@ -352,7 +353,8 @@ public class IncomingInspectionTaskControllerService { .setInspectorId(inspectorId) .setInspectorName(inspectorName) .setSubmitTime(now) - .setRequiredFinishTime(requiredFinishTime); + .setRequiredFinishTime(requiredFinishTime) + .setBatchNo(request.getBatchNo()); incomingInspectionTaskService.save(task); diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java index c172656e..48aa4e34 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalIncomingInspectionApplyQO.java @@ -89,6 +89,11 @@ public class ExternalIncomingInspectionApplyQO { @NotBlank(message = "采购组不能为空") private String purchaseGroup; + /** + * 批次号 + */ + private String batchNo; + /** * 二维码列表 */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java index cf3a02c3..78019dec 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/ExternalInventoryInspectionApplyQO.java @@ -56,6 +56,11 @@ public class ExternalInventoryInspectionApplyQO { @Min(value = 1, message = "存储时长必须大于0") private Integer storageDays; + /** + * 批次号 + */ + private String batchNo; + /** * 二维码列表 */ 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 c2fc0947..774323b9 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 @@ -242,4 +242,9 @@ public class QmsIncomingInspectionTaskVO { * 检测方式,关联字典项id(字典编码:InspectionStandardTestingMethod) */ private Long testingMethodDictItemId; + + /** + * 批次号 + */ + private String batchNo; } diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java index 93422930..5c71f01a 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/QmsIncomingInspectionTask.java @@ -221,4 +221,9 @@ public class QmsIncomingInspectionTask implements Serializable { * 更新时间 */ private LocalDateTime updateTime; + + /** + * 批次号 + */ + private String batchNo; } diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml index ba27a2a6..164961f8 100644 --- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml @@ -49,7 +49,8 @@ t.warehouse, t.storage_days, t.storage_location, - t.detection_qty + t.detection_qty, + t.batch_no 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 @@ -152,7 +153,8 @@ t.update_user_id, t.update_user_name, t.update_time, - t.detection_qty + t.detection_qty, + t.batch_no 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 @@ -228,7 +230,8 @@ t.storage_days, t.callback_result, t.detection_qty, - t.testing_method_dict_item_id + t.testing_method_dict_item_id, + t.batch_no 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