diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java index 9437862..b6045ae 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupProductController.java @@ -6,12 +6,11 @@ import com.github.pagehelper.PageInfo; import com.glxp.sale.admin.annotation.AuthRuleAnnotation; import com.glxp.sale.admin.constant.ConstantStatus; import com.glxp.sale.admin.entity.auth.AuthAdmin; -import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.sale.admin.entity.basic.UdiInfoEntity; -import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity; -import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity; -import com.glxp.sale.admin.entity.purchase.*; -import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.sale.admin.entity.info.CompanyEntity; +import com.glxp.sale.admin.entity.purchase.SupCertEntity; +import com.glxp.sale.admin.entity.purchase.SupCertSetEntity; +import com.glxp.sale.admin.entity.purchase.SupManufacturerEntity; +import com.glxp.sale.admin.entity.purchase.SupProductEntity; import com.glxp.sale.admin.exception.JsonException; import com.glxp.sale.admin.req.info.DeleteCompanyFileRequest; import com.glxp.sale.admin.req.purchase.FilterCertSetsRequest; @@ -22,19 +21,12 @@ import com.glxp.sale.admin.res.PageSimpleResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.purchase.SupProductResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; -import com.glxp.sale.admin.service.basic.BasicThirdSysService; -import com.glxp.sale.admin.service.basic.UdiInfoService; import com.glxp.sale.admin.service.basic.UdiRelevanceService; -import com.glxp.sale.admin.service.info.CompanyProductRelevanceService; +import com.glxp.sale.admin.service.info.CompanyService; import com.glxp.sale.admin.service.purchase.SupCertService; import com.glxp.sale.admin.service.purchase.SupCertSetService; import com.glxp.sale.admin.service.purchase.SupManufacturerService; import com.glxp.sale.admin.service.purchase.SupProductService; -import com.glxp.sale.admin.service.thrsys.ThrProductsService; -import com.glxp.sale.admin.util.CustomUtil; -import com.glxp.sale.admin.util.DateUtil; -import com.glxp.sale.admin.util.GennerOrderUtils; -import com.glxp.sale.admin.util.UdiInfoUtil; import com.glxp.sale.common.enums.ResultEnum; import com.glxp.sale.common.res.BaseResponse; import com.glxp.sale.common.util.ResultVOUtils; @@ -59,19 +51,11 @@ public class SupProductController { @Resource private SupProductService supProductService; @Resource - BasicThirdSysService basicThirdSysService; - @Resource - GennerOrderUtils gennerOrderUtils; - @Resource - ThrProductsService thrProductsService; - @Resource UdiRelevanceService udiRelevanceService; @Resource - UdiInfoService udiInfoService; - @Resource private SupCertService supCertService; @Resource - CompanyProductRelevanceService companyProductRelevanceService; + private CompanyService companyService; @AuthRuleAnnotation("") @GetMapping("/sup/product/getRegistrationInfo") @@ -212,6 +196,17 @@ public class SupProductController { return ResultVOUtils.error(999,"证书中存在草稿不允许提交!"); } } + + //判断公司信息是否已审核 + String customerId = getCustomerId(); + if (StrUtil.isNotBlank(customerId)) { + CompanyEntity company = companyService.findCompany(customerId); + if (StrUtil.isNotBlank(company.getAuditStatus()) && !company.getAuditStatus().equals(1)) { + return ResultVOUtils.error(500, "本企业信息变更未通过审核,暂时无法提交!"); + } + } + + //提交审核 if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { //判断是否上级供应商是否审核通过