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

同步自助平台代码

Browse Source
wms_pzh
zhengmingliang 3 years ago
parent 61248fc682
commit c860f06157
7 changed files with 171 additions and 6 deletions
Show Stats Download Patch File Download Diff File

35
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java
Unescape Escape View File

@ -162,6 +162,41 @@ public class SupCompanyController {
public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) {
if(companyEntity.getAuditStatus()==1){
//查询用户上传的证书
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(companyEntity.getCustomerId());
filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY);
List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
//查询用户该上传的证书
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
filterCertSetsRequest.setNeed(1);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
//验证
ListIterator<SupCertSetEntity> iterable1 = supCertSetEntities.listIterator();
while (iterable1.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable1.next();
if (supCertSetEntity.isNeed()) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable1.remove();
break;
}
}
}
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
return ResultVOUtils.error(500, "必传证书不齐全！");
}
}
//查询是否包含审核未通过的证书 //查询是否包含审核未通过的证书
if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS if (companyEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS
|| companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) {

61
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupManufacturerController.java
Unescape Escape View File

@ -97,14 +97,14 @@ public class SupManufacturerController {
FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName()); filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setCustomerId(getCustomerId());
List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
if(companyEntities.size()>0){ if(companyEntities.size()>0){
return ResultVOUtils.error(999,"企业名称不能重复！"); return ResultVOUtils.error(999,"企业名称不能重复！");
} }
filterSupManufacturerRequest=new FilterSupManufacturerRequest(); filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setCustomerId(getCustomerId());
filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
if(companyEntities.size()>0){ if(companyEntities.size()>0){
return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
} }
@ -196,14 +196,14 @@ public class SupManufacturerController {
FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName()); filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName());
filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setCustomerId(getCustomerId());
List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); List<SupManufacturerEntity> companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
if(companyEntities.size()>0){ if(companyEntities.size()>0){
return ResultVOUtils.error(999,"企业名称不能重复！"); return ResultVOUtils.error(999,"企业名称不能重复！");
} }
filterSupManufacturerRequest=new FilterSupManufacturerRequest(); filterSupManufacturerRequest=new FilterSupManufacturerRequest();
filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setCustomerId(getCustomerId());
filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode());
companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest);
if(companyEntities.size()>0){ if(companyEntities.size()>0){
return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); return ResultVOUtils.error(999,"统一社会信用代码不能重复！");
} }
@ -295,6 +295,59 @@ public class SupManufacturerController {
if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) {
return ResultVOUtils.error(500, "参数错误！"); return ResultVOUtils.error(500, "参数错误！");
} }
if(supManufacturerEntity.getAuditStatus()==2){
//查询上传的资质证书
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(supManufacturerEntity.getCustomerId());
filterSupCertRequest.setManufacturerIdFk(supManufacturerEntity.getManufacturerId());
filterSupCertRequest.setType(ConstantStatus.CERT_MANUFACTURER);
List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
//查询必须上传的资质证书
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
//判断有没有存在必须上传而没有上传的证书
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (( supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
(
supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1
&& StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2"))
||
( supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 1
&& supManufacturerEntity.getCompanyType().equals("1"))
||
( supCertSetEntity.getForeign() != null
&& supCertSetEntity.getForeign() == 3
&& supManufacturerEntity.getCompanyType().equals("1"))) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
return ResultVOUtils.error(500, "必传证书不齐全！");
}
}
// 查询是否包含审核未通过的证书 // 查询是否包含审核未通过的证书
if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS ||
supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) {

50
api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupProductController.java
Unescape Escape View File

@ -213,7 +213,7 @@ public class SupProductController {
} }
} }
//提交审核 //提交审核
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) {
//判断是否上级供应商是否审核通过 //判断是否上级供应商是否审核通过
SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk());
@ -260,7 +260,7 @@ public class SupProductController {
return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
} }
}
supProductEntity.setUpdateTime(new Date()); supProductEntity.setUpdateTime(new Date());
SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId()); SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId());
supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(), supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(),
@ -281,7 +281,53 @@ public class SupProductController {
if (supProductEntity.getAuditStatus() == null) { if (supProductEntity.getAuditStatus() == null) {
return ResultVOUtils.error(500, "参数错误！"); return ResultVOUtils.error(500, "参数错误！");
} }
if(supProductEntity.getAuditStatus()==1){
//查询用户上传的证书
FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest();
filterSupCertRequest.setCustomerId(supProductEntity.getCustomerId());
filterSupCertRequest.setManufacturerIdFk(supProductEntity.getManufacturerIdFk());
filterSupCertRequest.setProductIdFk(supProductEntity.getProductId());
filterSupCertRequest.setType(ConstantStatus.CERT_PRODUCT);
List<SupCertEntity> supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest);
//查询用户该上传的证书
FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT);
List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
while (iterable.hasNext()) {
SupCertSetEntity supCertSetEntity = iterable.next();
if (supCertSetEntity.getImports()!=null && supCertSetEntity.getImports() == 1 || StrUtil.isNotEmpty(supCertSetEntity.getCplx()) && supCertSetEntity.getCplx().equals("全部")
|| StrUtil.isNotEmpty(supCertSetEntity.getHchzsb()) && supCertSetEntity.getHchzsb().equals("全部")
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 2
&& StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (supCertSetEntity.getImports() != null && supCertSetEntity.getImports() == 3 && !StrUtil.trimToEmpty(supProductEntity.getRecordCode()).contains("进"))
|| (StrUtil.trimToEmpty(supProductEntity.getProductType()).equals(supCertSetEntity.getCplx()))
|| (StrUtil.trimToEmpty(supProductEntity.getHchzsb()).equals(supCertSetEntity.getHchzsb()))
|| StrUtil.isNotEmpty(supCertSetEntity.getFlbm()) &&(supCertSetEntity.getFlbm().contains(StrUtil.trimToEmpty(supProductEntity.getProductDirectoryCode())))
) {
for (SupCertEntity supCertEntity : supCertEntityList) {
if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
iterable.remove();
break;
}
}
}
} else {
iterable.remove();
}
}
String errMsg = "";
if (supCertSetEntities.size() > 0) {
for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
errMsg = errMsg + "," + supCertSetEntity.getName();
}
return ResultVOUtils.error(500, "必传证书不齐全");
}
}
// 查询是否包含审核未通过的证书 // 查询是否包含审核未通过的证书
if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS ||

2
api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupManufacturerDao.java
Unescape Escape View File

@ -21,4 +21,6 @@ public interface SupManufacturerDao {
boolean insertCompany(SupManufacturerEntity supManufacturerEntity); boolean insertCompany(SupManufacturerEntity supManufacturerEntity);
boolean deleteById(@Param("id") String id); boolean deleteById(@Param("id") String id);
List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest);
} }

3
api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupManufacturerService.java
Unescape Escape View File

@ -23,4 +23,7 @@ public interface SupManufacturerService {
boolean deleteById(String id); boolean deleteById(String id);
List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest);
} }

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

@ -72,4 +72,9 @@ public class SupManufacturerServiceImpl implements SupManufacturerService {
public boolean deleteById(String id) { public boolean deleteById(String id) {
return supManufacturerDao.deleteById(id); return supManufacturerDao.deleteById(id);
} }
@Override
public List<SupManufacturerEntity> getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest) {
return supManufacturerDao.getCompanyByNameAndCode(filterSupManufacturerRequest);
}
} }

21
api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml
Unescape Escape View File

@ -126,4 +126,25 @@
WHERE id = #{id} WHERE id = #{id}
</delete> </delete>
<select id="getCompanyByNameAndCode" parameterType="com.glxp.api.admin.req.purchase.FilterSupManufacturerRequest"
resultType="com.glxp.api.admin.entity.purchase.SupManufacturerEntity">
SELECT sup_manufacturer.* ,company.companyName as supName FROM sup_manufacturer
inner join company on sup_manufacturer.customerId = company.customerId
<where>
<if test="companyName != null and companyName != ''">
and sup_manufacturer.companyName = #{companyName}
</if>
<if test="creditCode != null and creditCode != ''">
and creditCode = #{creditCode}
</if>
<if test="customerId != null and customerId != ''">
and sup_manufacturer.customerId = #{customerId}
</if>
<if test="type != null">
and id != #{id}
</if>
</where>
</select>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save