UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

资质证书校验问题相关修改

Browse Source
dev
anthonywj 2 years ago
parent 85a4d6a26e
commit 6c91a2e9e7
10 changed files with 56 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/controller/basic/UdiContrastController.java
Unescape Escape View File

@ -199,8 +199,6 @@ public class UdiContrastController {
} else { } else {
return ResultVOUtils.error(500, "更新失败！"); return ResultVOUtils.error(500, "更新失败！");
} }
} }

9
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -763,7 +763,7 @@ public class IoCodeTempController extends BaseController {
BaseResponse baseResponse = checkRelId(codeEnttity, unitFk); BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), ""); SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());
if (CollUtil.isNotEmpty(supCertEntities)) { if (CollUtil.isNotEmpty(supCertEntities)) {
@ -775,7 +775,12 @@ public class IoCodeTempController extends BaseController {
} }
} }
} else { } else {
return ResultVOUtils.error(500, "产品资质证书未通过审核！"); if (supProductEntity == null) {
return ResultVOUtils.error(500, "产品资质证书未维护！");
} else {
return ResultVOUtils.error(500, "产品资质证书未通过审核！");
}
} }
} }

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -167,7 +167,7 @@ public class IoOrderDetailBizController extends BaseController {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId()); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) { if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), ""); SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) { if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {
List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId()); List<SupCertEntity> supCertEntities = supCertService.findByProductId(supProductEntity.getProductId());

38
src/main/java/com/glxp/api/controller/purchase/SupProductController.java
Unescape Escape View File

@ -157,27 +157,27 @@ public class SupProductController {
public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) { public BaseResponse selectBind(@RequestBody SelectProductBindRequest selectProductBindRequest) {
UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk())); UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectUdiId(Long.valueOf(selectProductBindRequest.getRelIdFk()));
SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(),selectProductBindRequest.getManufacturerId()); SupProductEntity supProductEntity = supProductService.findByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), selectProductBindRequest.getManufacturerId());
if (supProductEntity != null) { if (supProductEntity != null) {
return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！"); return ResultVOUtils.error(500, "该产品资质已存在，请勿重复添加！");
}else{ } else {
supProductEntity = new SupProductEntity(); supProductEntity = new SupProductEntity();
BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity); BeanUtils.copyProperties(udiRelevanceResponse, supProductEntity);
supProductEntity.setProductId(selectProductBindRequest.getProductId()); supProductEntity.setProductId(selectProductBindRequest.getProductId());
supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh()); supProductEntity.setRecordCode(udiRelevanceResponse.getZczbhhzbapzbh());
supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + ""); supProductEntity.setRelIdFk(udiRelevanceResponse.getId() + "");
supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc()); supProductEntity.setRecordProductName(udiRelevanceResponse.getCpmctymc());
supProductEntity.setProductType(udiRelevanceResponse.getQxlb()); supProductEntity.setProductType(udiRelevanceResponse.getQxlb());
supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm()); supProductEntity.setProductDirectoryCode(udiRelevanceResponse.getFlbm());
supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc()); supProductEntity.setRecordPeopleName(udiRelevanceResponse.getYlqxzcrbarmc());
supProductEntity.setSpecification(udiRelevanceResponse.getGgxh()); supProductEntity.setSpecification(udiRelevanceResponse.getGgxh());
supProductEntity.setCreateTime(new Date()); supProductEntity.setCreateTime(new Date());
supProductEntity.setUpdateTime(new Date()); supProductEntity.setUpdateTime(new Date());
supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId()); supProductEntity.setManufacturerIdFk(selectProductBindRequest.getManufacturerId());
supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId()); supProductEntity.setCustomerId(selectProductBindRequest.getCustomerId());
supProductEntity.setHchzsb(udiRelevanceResponse.getCplb()); supProductEntity.setHchzsb(udiRelevanceResponse.getCplb());
supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName()); supProductEntity.setCompanyName(selectProductBindRequest.getCompanyName());
supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus()); supProductEntity.setAuditStatus(selectProductBindRequest.getAuditStatus());
} }

5
src/main/java/com/glxp/api/controller/thrsys/ThrProductsController.java
Unescape Escape View File

@ -215,8 +215,11 @@ public class ThrProductsController {
// udiProductEntity.setGgxh(thrProductsEntity.getStandard()); // udiProductEntity.setGgxh(thrProductsEntity.getStandard());
udiProductService.updateUdiInfo(udiProductEntity); udiProductService.updateUdiInfo(udiProductEntity);
} }
} }
//todo 若产品信息
return ResultVOUtils.success("修改成功！"); return ResultVOUtils.success("修改成功！");
} }

2
src/main/java/com/glxp/api/dao/purchase/SupProductDao.java
Unescape Escape View File

@ -30,4 +30,6 @@ public interface SupProductDao extends BaseMapperPlus<SupProductDao, SupProductE
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId); boolean deleteByEnterpriseId(@Param("enterpriseId") String enterpriseId);
SupProductEntity findByManufactury(@Param("cpmctymc") String cpmctymc, @Param("manufactory") String manufactory);
} }

4
src/main/java/com/glxp/api/service/purchase/SupProductService.java
Unescape Escape View File

@ -18,7 +18,9 @@ public interface SupProductService extends IService<SupProductEntity> {
SupProductEntity findByRelIdFk(String relIdFk); SupProductEntity findByRelIdFk(String relIdFk);
SupProductEntity findByManufactury(String cpmctymc, String manufactory,String manufacturerIdFk); SupProductEntity findByManufactury(String cpmctymc, String manufactory, String manufacturerIdFk);
SupProductEntity findExitByManufactury(String cpmctymc, String manufactory);
SupProductResponse findByPassByReCert(String registerCert); SupProductResponse findByPassByReCert(String registerCert);

5
src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java
Unescape Escape View File

@ -102,6 +102,11 @@ public class SupProductServiceImpl extends ServiceImpl<SupProductDao, SupProduct
else return null; else return null;
} }
@Override
public SupProductEntity findExitByManufactury(String cpmctymc, String manufactory) {
return supProductDao.findByManufactury(cpmctymc, manufactory);
}
@Override @Override
public SupProductEntity findRegistrationByName(String recordProductName) { public SupProductEntity findRegistrationByName(String recordProductName) {
return supProductDao.findRegistrationByName(recordProductName); return supProductDao.findRegistrationByName(recordProductName);

18
src/main/resources/mybatis/mapper/purchase/SupProductDao.xml
Unescape Escape View File

@ -129,11 +129,11 @@
sup_manufacturer.companyName, sup_manufacturer.companyName,
sup_manufacturer.agentName sup_manufacturer.agentName
FROM sup_product FROM sup_product
inner join sup_company inner join sup_company
on sup_product.customerId = sup_company.customerId on sup_product.customerId = sup_company.customerId
INNER JOIN sup_manufacturer INNER JOIN sup_manufacturer
on sup_manufacturer.manufacturerId = on sup_manufacturer.manufacturerId =
sup_product.manufacturerIdFk sup_product.manufacturerIdFk
<where> <where>
<if test="id != null and id != ''"> <if test="id != null and id != ''">
@ -389,4 +389,12 @@
FROM sup_product FROM sup_product
WHERE enterpriseId = #{enterpriseId} WHERE enterpriseId = #{enterpriseId}
</delete> </delete>
<select id="findByManufactury" parameterType="Map"
resultType="com.glxp.api.entity.purchase.SupProductEntity">
select sup_product.*
from sup_product
INNER JOIN sup_manufacturer on sup_product.manufacturerIdFk = sup_manufacturer.manufacturerId
WHERE sup_manufacturer.companyName = #{manufactory}
and sup_product.recordProductName = #{cpmctymc}
</select>
</mapper> </mapper>

2
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -438,6 +438,6 @@ CALL Pro_Temp_ColumnWork('io_order', 'rmDeptCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'rmInvCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1); CALL Pro_Temp_ColumnWork('io_order', 'outSickInfo', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode', CALL Pro_Temp_ColumnWork('inv_inner_order_detail', 'nameCode',
'varchar(255) ', 1); 'varchar(255) ', 1);
Write Preview
Loading…
Cancel
Save