diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java index 5ce6ac59..2a1430d1 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsCoaTaskController.java @@ -51,7 +51,7 @@ public class QmsCoaTaskController extends BaseController { } /** - * 修改COA通知任务(仅状态为0时可修改) + * 修改COA通知任务(只允许修改报告要求和报告模板,修改后状态改为0) */ @Transactional @PostMapping("update") @@ -60,6 +60,16 @@ public class QmsCoaTaskController extends BaseController { return ApiResult.success(); } + /** + * 直接发布COA通知任务(状态直接变为1,并填入发送时间) + */ + @Transactional + @PostMapping("publish") + public ApiResult publish(@Valid @RequestBody QmsCoaTaskAddQO qo) { + coaTaskService.publish(qo); + return ApiResult.success(); + } + /** * 批量发送(状态改为1,填入发送时间) * diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java index 4ce0871a..f189ae62 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsCoaTaskUpdateQO.java @@ -3,10 +3,8 @@ package com.nflg.wms.common.pojo.qo; import jakarta.validation.constraints.NotNull; import lombok.Data; -import java.time.LocalDate; - /** - * 修改COA通知任务参数(id必传,其余可选) + * 修改COA通知任务参数(id必传,只允许修改报告要求和报告模板) */ @Data public class QmsCoaTaskUpdateQO { @@ -17,26 +15,11 @@ public class QmsCoaTaskUpdateQO { @NotNull(message = "ID不能为空") private Long id; - /** - * 供应商编号(可选) - */ - private String supplierCode; - - /** - * 物料编号(可选) - */ - private String materialNo; - /** * 报告要求(可选) */ private String requirement; - /** - * 最晚提交时间(可选) - */ - private LocalDate lastSubTime; - /** * 报告模板(可选) */ diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java index accb1c01..5dad66d7 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsQualityInspectorMaterialVO.java @@ -28,6 +28,11 @@ public class QmsQualityInspectorMaterialVO { */ private String drawingNo; + /** + * 图纸版本号 + */ + private String drawingNoVer; + /** * 物料类别编码 */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java index 485536a0..784c0b9f 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsCoaTaskService.java @@ -27,10 +27,15 @@ public interface IQmsCoaTaskService extends IService { void delete(Long id); /** - * 修改COA通知任务(状态不为0时不可修改) + * 修改COA通知任务(只允许修改报告要求和报告模板,修改后状态改为0) */ void update(QmsCoaTaskUpdateQO qo); + /** + * 直接发布COA通知任务(状态改为1,填入发送时间) + */ + void publish(QmsCoaTaskAddQO qo); + /** * 批量发送(状态改为1,填入发送时间) */ diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java index 0cc394e4..39873c40 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaTaskServiceImpl.java @@ -111,48 +111,67 @@ public class QmsCoaTaskServiceImpl extends ServiceImpl