diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java index 86dd2a58..30aa33da 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.nflg.qms.admin.service.QmsIssueTicketTodoControllerService; import com.nflg.wms.common.pojo.ApiResult; import com.nflg.wms.common.pojo.PageData; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -26,7 +27,7 @@ public class QmsIssueTicketTodoController extends BaseController { * 查询 */ @PostMapping("search") - public ApiResult> search(@Valid @RequestBody QmsTodoItemSearchQO request) { + public ApiResult> search(@Valid @RequestBody QmsIssueTicketTodoItemSearchQO request) { IPage page = qmsIssueTicketTodoControllerService.search(request); return ApiResult.success(page); } 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-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java index 033fa204..025d8bea 100644 --- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java +++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java @@ -3,6 +3,7 @@ package com.nflg.qms.admin.service; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -28,7 +29,7 @@ public class QmsIssueTicketTodoControllerService { /** * 分页查询待办事项列表 */ - public IPage search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = issueTicketToDoService.search(request); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { pageData.getRecords().forEach(item -> { 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 8d1fb158..2dd39424 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 @@ -120,9 +120,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(); @@ -142,7 +142,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-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java new file mode 100644 index 00000000..c6f7ca05 --- /dev/null +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIssueTicketTodoItemSearchQO.java @@ -0,0 +1,22 @@ +package com.nflg.wms.common.pojo.qo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 工单待办事项 列表查询参数 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class QmsIssueTicketTodoItemSearchQO extends SearchBaseQO { + + /** + * 标题 + */ + private String title; + + /** + * 来源类型：0=IQC检测任务，1=PDI检测任务，2=巡检，3=PQC检测任务 + */ + private Integer sourceType; +} diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java index c7bb15e8..c23b958d 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QrCodeItemSearchQO.java @@ -21,4 +21,10 @@ public class QrCodeItemSearchQO extends SearchBaseQO { * 库存地点 */ private String storageLocation; + + + /** + * 供应商编号 + */ + private String supplierNo; } diff --git a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java index dfd04b4e..d6006ea1 100644 --- a/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java +++ b/nflg-wms-gateway/src/main/java/com/nflg/wms/gateway/satoken/SaTokenConfigure.java @@ -38,9 +38,17 @@ public class SaTokenConfigure { .setAuth(obj -> { // 登录校验 -- 拦截所有路由 SaRouter.match("/**") - .notMatch("/auth/**","/srm-receive/**", "/shipment/material/**","**/actuator/**","**/external/**" + .notMatch("/auth/**" + , "/srm-receive/**" + , "/shipment/material/**" + , "/qms/external/**" // MPM 免登录接口 - , "/admin/material/mpm/**", "/admin/package/mpm/**") + , "/admin/material/mpm/**" + , "/admin/package/mpm/**") + .notMatch(r -> { + String path = SaHolder.getRequest().getRequestPath(); + return path.contains("/actuator/"); + }) .check(r -> { String traceId = SaHolder.getRequest().getHeader(Constant.TRACE_ID_HEADER, IdUtil.getSnowflakeNextIdStr()); MDC.put(Constant.TRACE_ID, traceId); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java index 3ac073c5..e18ea632 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/QmsIssueTicketToDoMapper.java @@ -3,6 +3,7 @@ package com.nflg.wms.repository.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -13,7 +14,7 @@ import com.nflg.wms.repository.entity.QmsIssueTicketToDo; */ public interface QmsIssueTicketToDoMapper extends BaseMapper { - IPage search(QmsTodoItemSearchQO request, Long userId, Page page); + IPage search(QmsIssueTicketTodoItemSearchQO request, Long userId, Page page); IssueTicketTodoNotReadNumVO getCount(Long userId); diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java index d0b1a281..e8551e71 100644 --- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java +++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IQmsIssueTicketToDoService.java @@ -2,6 +2,7 @@ package com.nflg.wms.repository.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.nflg.wms.common.pojo.qo.QmsIssueTicketTodoItemSearchQO; import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO; import com.nflg.wms.common.pojo.vo.IssueTicketTodoNotReadNumVO; import com.nflg.wms.common.pojo.vo.QmsIssueTicketToDoVO; @@ -15,7 +16,7 @@ public interface IQmsIssueTicketToDoService extends IService /** * 分页查询待办事项列表 */ - IPage search(QmsTodoItemSearchQO request); + IPage search(QmsIssueTicketTodoItemSearchQO request); void processed(Long id); 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 search(QmsTodoItemSearchQO request) { + public IPage search(QmsIssueTicketTodoItemSearchQO request) { IPage pageData = baseMapper.search(request, UserUtil.getUserId(), new Page<>(request.getPage(), request.getPageSize())); if (CollectionUtil.isNotEmpty(pageData.getRecords())) { List ticketIds = pageData.getRecords() diff --git a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml index 02f70b51..c12ae7c4 100644 --- a/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml +++ b/nflg-wms-repository/src/main/resources/mapper/WmsQrCodeMasterMapper.xml @@ -49,6 +49,9 @@ and a.create_time <= #{request.endDate} + + and d.supplier_code=#{request.supplierNo} +