From 442893830ed0aa9b665556c6a4614dab15e9d28f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 8 Jun 2026 09:02:42 +0800 Subject: [PATCH] =?UTF-8?q?fix(api):=20=E7=BB=9F=E4=B8=80API=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=A0=BC=E5=BC=8F=E5=B9=B6=E4=BF=AE=E5=A4=8DCOA?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=AA=8C=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改CoaController.existsReport方法返回ApiResult包装格式 - 移除NormalOrderController中未使用的StringUtil导入 - 将COA报告存在性检查改为审核通过状态检查 - 更新错误提示信息为更明确的COA报告提交审核要求 - 修复QmsCoaReviewServiceImpl中删除状态判断条件 - 重命名QmsService.existsReport方法为coaReportPass - 优化COA报告验证结果处理逻辑，避免空值导致的异常 --- .../admin/controller/external/CoaController.java | 5 +++-- .../wms/admin/controller/NormalOrderController.java | 13 ++++++------- .../java/com/nflg/wms/admin/service/QmsService.java | 6 +++--- .../service/impl/QmsCoaReviewServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java index b78a3693..16495d48 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/external/CoaController.java @@ -1,5 +1,6 @@ package com.nflg.qms.admin.controller.external; +import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.qo.QmsCoaReportCheckQO; import com.nflg.wms.repository.service.IQmsCoaReviewService; import com.nflg.wms.starter.BaseController; @@ -23,7 +24,7 @@ public class CoaController extends BaseController { * 检测COA报告是否存在且已审核 */ @PostMapping("existsReport") - public boolean existsReport(@RequestBody QmsCoaReportCheckQO qo){ - return coaReviewService.existsReport(qo); + public ApiResult existsReport(@RequestBody QmsCoaReportCheckQO qo){ + return ApiResult.success(coaReviewService.existsReport(qo)); } } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java index 5ac3f10d..5e94de56 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/controller/NormalOrderController.java @@ -18,7 +18,6 @@ import com.nflg.wms.common.pojo.dto.SAPOrderDTO; import com.nflg.wms.common.pojo.qo.*; import com.nflg.wms.common.pojo.vo.DeliverNormalOrderVO; import com.nflg.wms.common.util.NumberUtil; -import com.nflg.wms.common.util.StringUtil; import com.nflg.wms.common.util.UserUtil; import com.nflg.wms.common.util.VUtil; import com.nflg.wms.repository.entity.*; @@ -227,8 +226,8 @@ public class NormalOrderController extends BaseController { // VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); exportPdfPerPage(qrCodeMasters, response); } @@ -252,8 +251,8 @@ public class NormalOrderController extends BaseController { // exportPdfInAll(convert(orders), response); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); exportPdfInAll(qrCodeMasters, response); } @@ -405,8 +404,8 @@ public class NormalOrderController extends BaseController { // VUtil.trueThrowBusinessError(CollectionUtil.isEmpty(orders)).throwMessage("没有需要打印的数据"); List qrCodeMasters = qrCodeMasterService.getByExtendIds(ids); qrCodeMasters.forEach(qrCodeMaster->{ - VUtil.trueThrowBusinessError(!qmsService.existsReport(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) - .throwMessage("物料" + qrCodeMaster.getMaterialCode() + "采购单" + qrCodeMaster.getPoNumber() + "无有效COA报告"); + VUtil.trueThrowBusinessError(!qmsService.coaReportPass(qrCodeMaster.getSupplierCode(),qrCodeMaster.getMaterialCode(),qrCodeMaster.getPoNumber())) + .throwMessage("请先提交物料" + qrCodeMaster.getMaterialCode() + "(采购单" + qrCodeMaster.getPoNumber() + ")的COA报告并完成审核"); }); return exportItemImageZip(convertToPrintDTO(qrCodeMasters)); } diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java index d2148a9b..5f5c2cd0 100644 --- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java +++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/QmsService.java @@ -113,9 +113,9 @@ public class QmsService { } /** - * 检查是否免检物料 + * 检查COA报告 */ - public boolean existsReport(String supplierCode,String materialNo,String purchaseNo) { + public boolean coaReportPass(String supplierCode, String materialNo, String purchaseNo) { log.info("检测是否已提交COA报告，供应商：{}，物料编号：{}，采购单号：{}", supplierCode, materialNo,purchaseNo); HttpHeaders headers = new HttpHeaders(); @@ -135,7 +135,7 @@ public class QmsService { VUtil.trueThrowBusinessError( Objects.isNull(response.getBody()) || response.getBody().getCode() != 200 ).throwMessage("检测是否已提交COA报告失败：" + response.getBody().getMessage()); - return response.getBody().getResult(); + return !Objects.equals(response.getBody().getResult(),false); } public void pushInventoryInspection(InventoryDetectionApplyQO request) { diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java index 57765246..c9f65490 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/QmsCoaReviewServiceImpl.java @@ -617,7 +617,7 @@ public class QmsCoaReviewServiceImpl extends ServiceImpl