diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 442ad766..42dcb718 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -169,14 +169,15 @@ public class IoOrderDetailBizController extends BaseController { BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory()); - if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { - List supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); +// List supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); + addBizProductReqeust.setProductId(supProductEntity.getProductId()); + List supCertEntities = supCertService.findByzczbhhzbapzbh(addBizProductReqeust); if (CollUtil.isNotEmpty(supCertEntities)) { Date curDate = new Date(); for (SupCertEntity supCertEntity : supCertEntities) { if (supCertEntity.getExpireDate() != null && supCertEntity.getExpireDate().compareTo(curDate) < 0) { - return ResultVOUtils.error(500, "产品资质证书已过期！"); + return ResultVOUtils.error(500, "该注册备案号所属产品资质证书已过期！"); } } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 7796194e..5411931f 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -141,6 +141,9 @@ public class SupProductController { return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } } + int i = supProductService.findProduct(supProductEntity); + System.out.println(i); + if (i == 0) { supProductEntity.setCreateTime(new Date()); supProductEntity.setUpdateTime(new Date()); supProductEntity.setId(IdUtil.getSnowflakeNextId()); @@ -149,6 +152,8 @@ public class SupProductController { return ResultVOUtils.success("添加成功"); } else { return ResultVOUtils.error(ResultEnum.NOT_NETWORK); + }} else { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT); } } @@ -159,27 +164,27 @@ public class SupProductController { UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId()); - if (supProductEntity != null) { - return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); - } else { - supProductEntity = new SupProductEntity(); - BeanUtil.copyProperties(udiRelevanceResponse, supProductEntity); - supProductEntity.setProductId(selectProductBindRequest.getProductId()); - supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); - supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); - supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); - supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); - supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); - supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); - supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); - supProductEntity.setCreateTime(new Date()); - supProductEntity.setUpdateTime(new Date()); - supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); - supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); - supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); - supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); - supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); - } +// if (supProductEntity != null) { +// return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); +// } else { + supProductEntity = new SupProductEntity(); + BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); + supProductEntity.setProductId(selectProductBindRequest.getProductId()); + supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); + supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); + supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); + supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); + supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); + supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); + supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); + supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); + supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); + supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); + supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); +// } return ResultVOUtils.success(supProductEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index 0672ddb3..e28d72e8 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -4,6 +4,7 @@ package com.glxp.api.dao.purchase; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import org.apache.ibatis.annotations.Mapper; @@ -23,6 +24,8 @@ public interface SupCertDao extends BaseMapperPlus selectCompanyCert(FilterSupCertRequest filterSupCertRequest); + List findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust); + boolean updateCompanyCert(SupCertEntity supCertEntity); boolean insertCompanyCert(SupCertEntity supCertEntity); diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index d62b9cfc..4a62ef0a 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -16,7 +16,7 @@ import java.util.List; public interface SupProductDao extends BaseMapperPlus { SupProductEntity findRegistration(Long id); - + int findProduct(SupProductEntity supProductEntity); SupProductEntity findRegistrationByName(String recordProductName); List getRegistration(FilterPoductRequest filterPoductRequest); diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java index af2d1112..56401804 100644 --- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java @@ -13,6 +13,7 @@ public class AddBizProductReqeust { //单选添加 private Long relId; private String zczbhhzbapzbh; + private String productId; private String supId; private String batchNo; private String productDate; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 02fcb210..cc662c7a 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.net.URLDecoder; import cn.hutool.core.util.IdUtil; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.inout.*; @@ -262,11 +263,11 @@ public class IoOrderUtilsService { ioOrderEntity1.setOrderType(3); ioOrderEntity1.setFromType(1); if (!checkUdi) { - ioOrderEntity1.setStatus(1); + ioOrderEntity1.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); ioOrderEntity1.setDealStatus(1); } else { - ioOrderEntity1.setStatus(3); - ioOrderEntity1.setDealStatus(1); + ioOrderEntity1.setStatus(ConstantStatus.ORDER_STATS_ERROR); + ioOrderEntity1.setDealStatus(2); ioOrderEntity1.setRemark("产品错误！"); } ioOrderEntity1.setCreateTime(new Date()); diff --git a/src/main/java/com/glxp/api/service/purchase/SupCertService.java b/src/main/java/com/glxp/api/service/purchase/SupCertService.java index 13b90e76..1f127d63 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupCertService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupCertService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.purchase; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; @@ -22,6 +23,8 @@ public interface SupCertService extends IService { List findByProductId(String productId); + List findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust); + List selectCompanyCert(FilterSupCertRequest filterSupCertRequest); diff --git a/src/main/java/com/glxp/api/service/purchase/SupProductService.java b/src/main/java/com/glxp/api/service/purchase/SupProductService.java index 02cb4ef8..d39ba59e 100644 --- a/src/main/java/com/glxp/api/service/purchase/SupProductService.java +++ b/src/main/java/com/glxp/api/service/purchase/SupProductService.java @@ -35,7 +35,7 @@ public interface SupProductService extends IService { boolean modifyRegistration(SupProductEntity supProductEntity); boolean insertRegistration(SupProductEntity supProductEntity); - + int findProduct(SupProductEntity supProductEntity); boolean deleteById(@Param("id") String id); boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index 85b145f8..46d27b65 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupCertDao; import com.glxp.api.entity.purchase.SupCertEntity; +import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.purchase.FilterSupCertRequest; import com.glxp.api.req.purchase.purPlanPrintRequest; import com.glxp.api.service.purchase.SupCertService; @@ -111,6 +112,10 @@ public class SupCertServiceImpl extends ServiceImpl i return supCertDao.selectList(new QueryWrapper().eq("productIdFk", productId)); } + @Override + public List findByzczbhhzbapzbh(AddBizProductReqeust addBizProductReqeust) { + return supCertDao.findByzczbhhzbapzbh(addBizProductReqeust); + } @Override public boolean updateCompanyCert(SupCertEntity supCertEntity) { diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index e16d2736..42f6e6e1 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -147,7 +147,10 @@ public class SupProductServiceImpl extends ServiceImpl 0 ? true : false; } - + @Override + public int findProduct(SupProductEntity supProductEntity) { + return supProductDao.findProduct(supProductEntity); + } @Override public boolean deleteById(String id) { return supProductDao.deleteById(id); diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 22d91546..b7e1dd40 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1255,7 +1255,9 @@ ON basic_products.uuid = basic_udirel.uuid left join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk - left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId + left JOIN basic_corp + on basic_corp.erpId = company_product_relevance.customerId + AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml index 3c09c06d..966ebbaf 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertDao.xml @@ -50,6 +50,25 @@ + + + SELECT count(*) + FROM sup_product + inner join sup_company + on sup_product.customerId = sup_company.customerId + INNER JOIN sup_manufacturer + on sup_manufacturer.manufacturerId = + sup_product.manufacturerIdFk + WHERE sup_manufacturer.companyName=(SELECT companyName FROM sup_manufacturer WHERE manufacturerId = #{manufacturerIdFk}) + and recordCode=#{recordCode} and recordProductName=#{recordProductName} + DELETE FROM sup_product