feat(qms): 添加批次号字段支持
- 在 ExternalIncomingInspectionApplyQO 和 ExternalInventoryInspectionApplyQO 中新增 batchNo 字段 - 在 IncomingInspectionTaskControllerService 的任务创建和更新流程中设置批次号 - 在 QmsIncomingInspectionTask 实体中添加 batchNo 字段映射 - 更新 QmsIncomingInspectionTaskMapper.xml 中的查询语句以包含批次号字段 - 在 QmsIncomingInspectionTaskVO 中添加 batchNo 返回字段
This commit is contained in:
parent
7bbc85584a
commit
b5f9096141
|
|
@ -213,7 +213,8 @@ public class IncomingInspectionTaskControllerService {
|
||||||
.setInspectorId(inspectorId)
|
.setInspectorId(inspectorId)
|
||||||
.setInspectorName(inspectorName)
|
.setInspectorName(inspectorName)
|
||||||
.setSubmitTime(now)
|
.setSubmitTime(now)
|
||||||
.setRequiredFinishTime(requiredFinishTime);
|
.setRequiredFinishTime(requiredFinishTime)
|
||||||
|
.setBatchNo(request.getBatchNo());
|
||||||
|
|
||||||
incomingInspectionTaskService.save(task);
|
incomingInspectionTaskService.save(task);
|
||||||
|
|
||||||
|
|
@ -352,7 +353,8 @@ public class IncomingInspectionTaskControllerService {
|
||||||
.setInspectorId(inspectorId)
|
.setInspectorId(inspectorId)
|
||||||
.setInspectorName(inspectorName)
|
.setInspectorName(inspectorName)
|
||||||
.setSubmitTime(now)
|
.setSubmitTime(now)
|
||||||
.setRequiredFinishTime(requiredFinishTime);
|
.setRequiredFinishTime(requiredFinishTime)
|
||||||
|
.setBatchNo(request.getBatchNo());
|
||||||
|
|
||||||
incomingInspectionTaskService.save(task);
|
incomingInspectionTaskService.save(task);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,11 @@ public class ExternalIncomingInspectionApplyQO {
|
||||||
@NotBlank(message = "采购组不能为空")
|
@NotBlank(message = "采购组不能为空")
|
||||||
private String purchaseGroup;
|
private String purchaseGroup;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批次号
|
||||||
|
*/
|
||||||
|
private String batchNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 二维码列表
|
* 二维码列表
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -56,6 +56,11 @@ public class ExternalInventoryInspectionApplyQO {
|
||||||
@Min(value = 1, message = "存储时长必须大于0")
|
@Min(value = 1, message = "存储时长必须大于0")
|
||||||
private Integer storageDays;
|
private Integer storageDays;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批次号
|
||||||
|
*/
|
||||||
|
private String batchNo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 二维码列表
|
* 二维码列表
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -242,4 +242,9 @@ public class QmsIncomingInspectionTaskVO {
|
||||||
* 检测方式,关联字典项id(字典编码:InspectionStandardTestingMethod)
|
* 检测方式,关联字典项id(字典编码:InspectionStandardTestingMethod)
|
||||||
*/
|
*/
|
||||||
private Long testingMethodDictItemId;
|
private Long testingMethodDictItemId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批次号
|
||||||
|
*/
|
||||||
|
private String batchNo;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,4 +221,9 @@ public class QmsIncomingInspectionTask implements Serializable {
|
||||||
* 更新时间
|
* 更新时间
|
||||||
*/
|
*/
|
||||||
private LocalDateTime updateTime;
|
private LocalDateTime updateTime;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批次号
|
||||||
|
*/
|
||||||
|
private String batchNo;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,8 @@
|
||||||
t.warehouse,
|
t.warehouse,
|
||||||
t.storage_days,
|
t.storage_days,
|
||||||
t.storage_location,
|
t.storage_location,
|
||||||
t.detection_qty
|
t.detection_qty,
|
||||||
|
t.batch_no
|
||||||
FROM qms_incoming_inspection_task t
|
FROM qms_incoming_inspection_task t
|
||||||
LEFT JOIN qms_qc_material m ON t.material_id = m.id
|
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
|
LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
|
||||||
|
|
@ -152,7 +153,8 @@
|
||||||
t.update_user_id,
|
t.update_user_id,
|
||||||
t.update_user_name,
|
t.update_user_name,
|
||||||
t.update_time,
|
t.update_time,
|
||||||
t.detection_qty
|
t.detection_qty,
|
||||||
|
t.batch_no
|
||||||
FROM qms_incoming_inspection_task t
|
FROM qms_incoming_inspection_task t
|
||||||
LEFT JOIN qms_qc_material m ON t.material_id = m.id
|
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
|
LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
|
||||||
|
|
@ -228,7 +230,8 @@
|
||||||
t.storage_days,
|
t.storage_days,
|
||||||
t.callback_result,
|
t.callback_result,
|
||||||
t.detection_qty,
|
t.detection_qty,
|
||||||
t.testing_method_dict_item_id
|
t.testing_method_dict_item_id,
|
||||||
|
t.batch_no
|
||||||
FROM qms_incoming_inspection_task t
|
FROM qms_incoming_inspection_task t
|
||||||
LEFT JOIN qms_qc_material m ON t.material_id = m.id
|
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
|
LEFT JOIN qms_inspection_standard s ON t.inspection_standard_id = s.id
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue