diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java index d920d6f..e66747d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java @@ -105,6 +105,7 @@ public class PurPlanController { PurPlanDetailEntity purApplyDetailEntity = new PurPlanDetailEntity(); BeanUtils.copyProperties(stockOrderDetailEntity, purApplyDetailEntity); purApplyDetailEntity.setOrderIdFk(purApplyEntity.getId() + ""); + purApplyDetailEntity.setCount(Integer.valueOf(stockOrderDetailEntity.getCount())); purPlanDetailService.insert(purApplyDetailEntity); purPlanDetailEntities.add(purApplyDetailEntity); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java index 6bb4eda..b0d1f9f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCertSetController.java @@ -37,6 +37,7 @@ public class SupCertSetController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } + filterCertSetsRequest.setNeed(0); List supCertEntityList = supCertSetService.filterCertSets(filterCertSetsRequest); PageInfo pageInfo; @@ -54,7 +55,14 @@ public class SupCertSetController { if (supCertSetEntity == null) { supCertSetEntity = new SupCertSetEntity(); } + supCertSetEntity.setUpdateTime(new Date()); + if(supCertSetEntity.getType()==3){ + if(supCertSetEntity.getFlbmList().size()>0){ + String flbm = String.join(",", supCertSetEntity.getFlbmList()); + supCertSetEntity.setFlbm(flbm); + } + } boolean b = supCertSetService.insertCertSet(supCertSetEntity); return ResultVOUtils.success("添加成功！"); } 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 b569f07..895c828 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 @@ -94,6 +94,73 @@ public class SupManufacturerController { supManufacturerEntity.setCustomerId(customerId); } + supManufacturerEntity.setCreateTime(new Date()); + supManufacturerEntity.setUpdateTime(new Date()); + //提交审核 + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId()); + if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属配送企业资质未通过审核，暂时无法提交！"); + } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); + filterCertSetsRequest.setNeed(0); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + + if (supCertSetEntity.isNeed() + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) + || + (!supCertSetEntity.isNeed() + && supCertSetEntity.getForeign() != null + && supCertSetEntity.getForeign() == 1 + && supManufacturerEntity.getCompanyType().equals("1")) + || + (!supCertSetEntity.isNeed() + && 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) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + + } + + supManufacturerEntity.setCreateTime(new Date()); supManufacturerEntity.setUpdateTime(new Date()); boolean b = supManufacturerService.insertCompany(supManufacturerEntity); @@ -112,7 +179,7 @@ public class SupManufacturerController { return ResultVOUtils.error(500, "参数错误！"); } //提交审核 - if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { //判断是否上级供应商是否审核通过 SupCompanyEntity supCompanyEntity = supCompanyService.findCompany(supManufacturerEntity.getCustomerId()); if (supCompanyEntity.getAuditStatus() == ConstantStatus.AUDIT_UN @@ -123,6 +190,7 @@ public class SupManufacturerController { //验证证书是否齐全 FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); filterCertSetsRequest.setType(ConstantStatus.CERT_MANUFACTURER); + filterCertSetsRequest.setNeed(0); List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); List supCertEntityList = supCertService.findAll(supManufacturerEntity.getCustomerId(), supManufacturerEntity.getManufacturerId()); ListIterator iterable = supCertSetEntities.listIterator(); @@ -134,11 +202,19 @@ public class SupManufacturerController { (!supCertSetEntity.isNeed() && supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 2 && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) - + || + (!supCertSetEntity.isNeed() && + supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 + && StrUtil.trimToEmpty(supManufacturerEntity.getCompanyType()).equals("2")) || (!supCertSetEntity.isNeed() && supCertSetEntity.getForeign() != null && supCertSetEntity.getForeign() == 1 + && supManufacturerEntity.getCompanyType().equals("1")) + || + (!supCertSetEntity.isNeed() + && supCertSetEntity.getForeign() != null + && supCertSetEntity.getForeign() == 3 && supManufacturerEntity.getCompanyType().equals("1"))) { for (SupCertEntity supCertEntity : supCertEntityList) { 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 640b139..5fba1de 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 @@ -97,6 +97,55 @@ public class SupProductController { @AuthRuleAnnotation("") @PostMapping("/sup/product/addRegistration") public BaseResponse addRegistration(@RequestBody SupProductEntity supProductEntity) { + supProductEntity.setCreateTime(new Date()); + supProductEntity.setUpdateTime(new Date()); + //提交审核 + if (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_UN) { + //判断是否上级供应商是否审核通过 + + SupManufacturerEntity supManufacturerEntity = supManufacturerService.findManufacturer(supProductEntity.getManufacturerIdFk()); + if (supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_UN + || supManufacturerEntity.getAuditStatus() == ConstantStatus.AUDIT_DRAFT) { + return ResultVOUtils.error(500, "所属生产企业资质未通过审核，暂时无法提交！"); + } + + //验证证书是否齐全 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_PRODUCT); + filterCertSetsRequest.setNeed(0); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + List supCertEntityList = supCertService.findAll(supProductEntity.getCustomerId(), supProductEntity.getManufacturerIdFk(), supProductEntity.getProductId()); + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + + if (supCertSetEntity.getImports() == 1|| (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, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + } supProductEntity.setCreateTime(new Date()); supProductEntity.setUpdateTime(new Date()); boolean b = supProductService.insertRegistration(supProductEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurApplyDetailDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurApplyDetailDao.java index ac74759..5148b19 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurApplyDetailDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/purchase/PurApplyDetailDao.java @@ -19,7 +19,7 @@ public interface PurApplyDetailDao { Boolean update(PurApplyDetailEntity purApplyRequest); - Boolean deleteByIds(List ids); + Boolean deleteByIds(@Param("ids") List ids); Boolean deleteByOrderId(@Param("orderIdFk") String orderIdFk); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java index 7b6f3dc..1ff252f 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/purchase/PurApplyRequest.java @@ -93,6 +93,8 @@ public class PurApplyRequest extends ListPageRequest { */ private Date createTime; + private String auditRemark; + private String targetInv; private String targetSubInv; diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index 8005538..1a6101b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -24,7 +24,7 @@ and ( pur_apply.status = 3 or pur_apply.status=2 or pur_apply.status=4) - and ( pur_apply.status = 1 or pur_apply.status=2) + and ( pur_apply.status = 1 or pur_apply.status=2 or pur_apply.status=4) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index cdd93bb..db3ea80 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -25,7 +25,7 @@ and ( pur_plan.status = 3 or pur_plan.status=2 or pur_plan.status=4) - and ( pur_plan.status = 1 or pur_plan.status=2) + and ( pur_plan.status = 1 or pur_plan.status=2 or pur_plan.status=4) diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml index 07bed67..0cc54f8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCertSetDao.xml @@ -10,10 +10,10 @@ and `name` = #{name} - + and `type` = #{type} - + and `need` = #{need} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml index 28ae5a4..b647829 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -23,7 +23,7 @@ and companyName like concat('%',#{companyName},'%') - and creditNum like ('%',#{creditNum},'%') + and creditNum like concat('%',#{creditNum},'%') and auditStatus = #{auditStatus} 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 7c7b7f0..7eaa434 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml @@ -19,7 +19,7 @@