diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java index 62a3c8a..f27effd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvSubWarehouseController.java @@ -70,9 +70,8 @@ public class InvSubWarehouseController { // if (StrUtil.isEmpty(filterInvWarehouseRequest.getPcode()) || filterInvWarehouseRequest.getUserId() == null) { // return ResultVOUtils.error(500, "用户或仓库不能未空！"); // } - + AuthAdmin authAdmin = customerService.getUserBean(); if (StrUtil.isNotEmpty(filterInvWarehouseRequest.getPcode())) { - AuthAdmin authAdmin = customerService.getUserBean(); if (filterInvWarehouseRequest.getFilter() == null || filterInvWarehouseRequest.getFilter() == 1) { if (authAdmin.getCustomerId().equals("110")) filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); @@ -81,31 +80,39 @@ public class InvSubWarehouseController { } } } else { - //走这边表示单据选择的是往来单位里面调出调入的库 - //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); - if (systemParamConfigEntity.getParamValue().equals("0")) { - //不允许调拨 - // 查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - //查询仓库信息 - if(invSubWarehouseEntity!=null){ - InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); - filterInvWarehouseRequest.setSubordinateCode(invWarehouseEntity.getPcode()); + //查询自己关联的分库 + if(filterInvWarehouseRequest.getFilter()==3 && authAdmin.getCustomerId().equals("110")){ + filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); + }else if(filterInvWarehouseRequest.getFilter()==3 && !authAdmin.getCustomerId().equals("110")){ + filterInvWarehouseRequest.setSpUse(true); + }else{ + //走这边表示单据选择的是往来单位里面调出调入的库 + //判断单据类型是1就是设置单据需要需要查询除自己以外的分库 + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("corp_innor_inv"); + if (systemParamConfigEntity.getParamValue().equals("0")) { + //不允许调拨 + // 查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + //查询仓库信息 + if(invSubWarehouseEntity!=null){ + InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCodeAll(invSubWarehouseEntity.getParentId()); + filterInvWarehouseRequest.setSuperiorCode(invWarehouseEntity.getCode()); + filterInvWarehouseRequest.setSuperiorPcode(invWarehouseEntity.getPcode()); + filterInvWarehouseRequest.setCode(null); + }else { + return ResultVOUtils.error(999,"分库编号为空！"); + } + + + } else { + //允许调拨 + //查询总库信息 + InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); + filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); filterInvWarehouseRequest.setCode(null); - }else { - return ResultVOUtils.error(999,"分库编号为空！"); } - - - } else { - //允许调拨 - //查询总库信息 - InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.filterGroupInvSubAndcode(filterInvWarehouseRequest.getCode()); - filterInvWarehouseRequest.setWarehouseCode(invSubWarehouseEntity.getParentId()); - filterInvWarehouseRequest.setCode(null); } + } List invSubWarehouseEntities = invSubWarehouseService.filterGroupInvSub(filterInvWarehouseRequest); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java index 3be4f5d..bb4ef31 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inventory/InvWarehouseController.java @@ -186,7 +186,7 @@ public class InvWarehouseController { filterInvWarehouseRequest.setPcode("0"); filterInvWarehouseRequest.setStatus(1); filterInvWarehouseRequest.setSpUse(true); - invWarehouseEntities = invWarehouseService.filterGroupInvWarehouse(filterInvWarehouseRequest); + invWarehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest); } else { filterInvWarehouseRequest.setUserId(authAdmin.getId() + ""); filterInvWarehouseRequest.setPid(0); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java index edf0b02..28c4f1c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java @@ -168,10 +168,46 @@ public class SupCompanyController { public BaseResponse auditCompany(@RequestBody SupCompanyEntity companyEntity) { + if(companyEntity.getAuditStatus()==1){ + //查询用户上传的证书 + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); + filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); + List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + + //查询用户该上传的证书 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + filterCertSetsRequest.setNeed(1); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + + //验证 + ListIterator 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 || companyEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); filterSupCertRequest.setAuditStatus(24); filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java index 1133fda..540fe28 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java @@ -103,14 +103,14 @@ public class SupManufacturerController { FilterSupManufacturerRequest filterSupManufacturerRequest=new FilterSupManufacturerRequest(); filterSupManufacturerRequest.setCompanyName(supManufacturerEntity.getCompanyName()); filterSupManufacturerRequest.setCustomerId(getCustomerId()); - List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + List companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest); if(companyEntities.size()>0){ return ResultVOUtils.error(999,"企业名称不能重复！"); } filterSupManufacturerRequest=new FilterSupManufacturerRequest(); filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); - companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest); if(companyEntities.size()>0){ return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); } @@ -213,7 +213,7 @@ public class SupManufacturerController { filterSupManufacturerRequest.setId(supManufacturerEntity.getId()); filterSupManufacturerRequest.setCustomerId(getCustomerId()); filterSupManufacturerRequest.setType(1); - List companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + List companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest); if(companyEntities.size()>0){ return ResultVOUtils.error(999,"企业名称不能重复！"); } @@ -222,7 +222,7 @@ public class SupManufacturerController { filterSupManufacturerRequest.setId(supManufacturerEntity.getId()); filterSupManufacturerRequest.setCreditCode(supManufacturerEntity.getCreditCode()); filterSupManufacturerRequest.setType(1); - companyEntities = supManufacturerService.getCompany(filterSupManufacturerRequest); + companyEntities = supManufacturerService.getCompanyByNameAndCode(filterSupManufacturerRequest); if(companyEntities.size()>0){ return ResultVOUtils.error(999,"统一社会信用代码不能重复！"); } @@ -315,10 +315,62 @@ public class SupManufacturerController { if (StrUtil.isEmpty(supManufacturerEntity.getManufacturerId()) || StrUtil.isEmpty(supManufacturerEntity.getCustomerId())) { 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 supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + //查询必须上传的资质证书 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + //判断有没有存在必须上传而没有上传的证书 + ListIterator 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 || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); + FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); filterSupCertRequest.setAuditStatus(24); filterSupCertRequest.setCustomerId(supManufacturerEntity.getCustomerId()); filterSupCertRequest.setManufacturerIdFk(supManufacturerEntity.getManufacturerId()); 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..4e13a24 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 @@ -213,7 +213,7 @@ public class SupProductController { } } //提交审核 - if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); @@ -230,7 +230,6 @@ public class SupProductController { ListIterator 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 @@ -259,7 +258,7 @@ public class SupProductController { } return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); } - } + supProductEntity.setUpdateTime(new Date()); SupProductResponse originEntity = supProductService.findByProductId(supProductEntity.getProductId()); supCertService.updateProductId(originEntity.getCustomerId(), supProductEntity.getCustomerId(), originEntity.getManufacturerIdFk(), @@ -281,6 +280,55 @@ public class SupProductController { 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 supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); + + //查询用户该上传的证书 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + + ListIterator 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 || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS) { diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java index c611b23..a007607 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/SupManufacturerDao.java @@ -21,4 +21,6 @@ public interface SupManufacturerDao { boolean insertCompany(SupManufacturerEntity supManufacturerEntity); boolean deleteById(@Param("id") String id); + + List getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java index 4c3a67e..f0c7575 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inventory/FilterInvWarehouseRequest.java @@ -28,5 +28,6 @@ public class FilterInvWarehouseRequest extends ListPageRequest { private int billType;//判断是否是单据类型需要的分库 private String warehouseCode; private String superiorCode;//上级 + private String superiorPcode;//上级 private String subordinateCode;//下级 } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java index 6262bf2..c665039 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/SupManufacturerService.java @@ -22,4 +22,6 @@ public interface SupManufacturerService { boolean deleteById(String id); + List getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest); + } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java index c7b37c3..8749d9e 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/purchase/impl/SupManufacturerServiceImpl.java @@ -73,4 +73,9 @@ public class SupManufacturerServiceImpl implements SupManufacturerService { public boolean deleteById(String id) { return supManufacturerDao.deleteById(id); } + + @Override + public List getCompanyByNameAndCode(FilterSupManufacturerRequest filterSupManufacturerRequest) { + return supManufacturerDao.getCompanyByNameAndCode(filterSupManufacturerRequest); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml index e78d641..defddde 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvSubWarehouseDao.xml @@ -49,7 +49,7 @@ AND inv_warehouse.spUse = #{spUse} - AND (inv_warehouse.code = #{subordinateCode} + AND (inv_warehouse.code = #{superiorPcode} OR inv_warehouse.pcode = #{superiorCode}) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml index 4a09bce..bc1b398 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -126,4 +126,25 @@ WHERE id = #{id} + + \ No newline at end of file