From 2260eca219dfbf15afca6b37f52ab363b2526737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 23 Dec 2022 16:47:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 6 ++- .../purchase/SupCompanyController.java | 49 ++++++++++++++----- .../purchase/SupContactController.java | 2 +- .../admin/dao/purchase/CustomerContacDao.java | 2 +- .../api/admin/dao/purchase/SupCompanyDao.java | 2 +- .../entity/business/StockOrderEntity.java | 2 +- .../req/business/StockOrderPostRequest.java | 2 +- .../admin/res/basic/UdiRelevanceResponse.java | 1 + .../purchase/CustomerContactService.java | 2 +- .../service/purchase/SupCompanyService.java | 2 +- .../impl/CustomerContactServiceImpl.java | 2 +- .../purchase/impl/SupCompanyServiceImpl.java | 2 +- .../mybatis/mapper/business/StockOrderDao.xml | 5 +- .../mapper/purchase/CustomerContactDao.xml | 2 +- .../mapper/purchase/PurApplyDetailDao.xml | 1 + .../mybatis/mapper/purchase/SupCompanyDao.xml | 2 +- .../main/resources/schemas/schema_v2.1.sql | 2 + 17 files changed, 60 insertions(+), 26 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 7aaf93b9..d892f5fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -298,7 +298,10 @@ public class UdiRelevanceController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - + //判断父id不为空就吧值给到id里面防止id变成详情id + if(udiRelevanceResponse.getPid()!=null){ + udiRelevanceResponse.setId(udiRelevanceResponse.getPid()); + } UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity); udiRelevanceEntity.setId(udiRelevanceResponse.getId() + ""); @@ -319,6 +322,7 @@ public class UdiRelevanceController { udiInfoEntity.setCpms(udiRelevanceResponse.getCpms()); udiInfoEntity.setPrice(udiRelevanceResponse.getPrice()); udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc()); + udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl()); udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch()); udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire()); udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java index e536bac5..6fc4a0ef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupCompanyController.java @@ -61,6 +61,8 @@ public class SupCompanyController { BasicUnitMaintainService basicUnitMaintainService; @Resource SupCertSetService supCertSetService; + @Resource + SupCompanyService supCompanyService; @AuthRuleAnnotation("") @GetMapping("/api/pur/getSupComapnys") @@ -79,23 +81,46 @@ public class SupCompanyController { public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) { - //查询该用户对应的资质证书 + //判断是不是存在草稿 if(companyEntity.getAuditStatus()==6){ - FilterSupCertRequest filterSupCertRequest = new FilterSupCertRequest(); - filterSupCertRequest.setCustomerId(companyEntity.getCustomerId()); - filterSupCertRequest.setType(ConstantStatus.CERT_COMPANY); - List supCertEntityList = supCertService.filterCompanyCert(filterSupCertRequest); - if(supCertEntityList.size()>0){ - for (SupCertEntity obj:supCertEntityList){ - if (StrUtil.isBlank(obj.getFilePath())){ - return ResultVOUtils.error(999,obj.getName()+"未上传资质证书！"); - } + List supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); for(SupCertEntity obj:supCertEntityList){ + if(obj.getAuditStatus()==0){ + return ResultVOUtils.error(999,"证书中存在草稿不允许提交！"); } } - } + //提交审核 + FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest(); + filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY); + filterCertSetsRequest.setNeed(1); + List supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest); + //验证 + ListIterator iterable = supCertSetEntities.listIterator(); + while (iterable.hasNext()) { + SupCertSetEntity supCertSetEntity = iterable.next(); + if (supCertSetEntity.isNeed()) { + for (SupCertEntity supCertEntity : supCertEntityList) { + if (supCertEntity.getName().equals(supCertSetEntity.getName())) { + if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) { + iterable.remove(); + break; + } + } + } + } + } + String errMsg = ""; + if (supCertSetEntities.size() > 0) { + for (SupCertSetEntity supCertSetEntity : supCertSetEntities) { + errMsg = errMsg + "," + supCertSetEntity.getName(); + } + return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！"); + } + + + } String customerId = CustomUtil.getId(); //重新生成customerId CustomerContactEntity customerContactEntity = new CustomerContactEntity(); @@ -282,7 +307,7 @@ public class SupCompanyController { @AuthRuleAnnotation("") @PostMapping("api/pur/supCompany/delete") public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) { - boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + boolean b = supCompanyService.deleteCompany(deleteRequest.getId()); if (b) return ResultVOUtils.success("删除成功"); else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java index e1754c63..26ec7e93 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/purchase/SupContactController.java @@ -52,7 +52,7 @@ public class SupContactController { @AuthRuleAnnotation("") @GetMapping("salewarehouse/customerContact/delete") public BaseResponse deleteContact(DeleteRequest deleteRequest) { - boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId())); + boolean b = customerContactService.deleteById(deleteRequest.getId()); if (b) return ResultVOUtils.success("删除成功"); else { diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java index e28016c5..65097df7 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/CustomerContacDao.java @@ -16,7 +16,7 @@ public interface CustomerContacDao { boolean updateCustomerContact(CustomerContactEntity customerContactEntity); - boolean deleteById(Long customerId); + boolean deleteById(String customerId); CustomerContactEntity selectById(Long customerId); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java index 7e092849..ae20649d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/purchase/SupCompanyDao.java @@ -23,6 +23,6 @@ public interface SupCompanyDao { boolean insertCompany(SupCompanyEntity companyEntity); - boolean deleteCompany(Long customerId); + boolean deleteCompany(String customerId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java index 0dd947c8..4afeb825 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java @@ -52,7 +52,7 @@ public class StockOrderEntity { private String dept; private String deptName; - + private Boolean noInvOut; private String reviewUserName; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java index 9fa33663..2da6aaa6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java @@ -30,6 +30,6 @@ public class StockOrderPostRequest { private String deptCode; private BigDecimal price; private String unitIdFk; - + private Boolean noInvOut; private Integer editStatus; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 9bda28b1..d6bf35d9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -89,6 +89,7 @@ public class UdiRelevanceResponse { private Integer rlId; private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 + private Integer pid; //用来存父id public int getBhzxxsbzsl() { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java index 725ab38b..2e3702af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/CustomerContactService.java @@ -15,7 +15,7 @@ public interface CustomerContactService { boolean updateCustomerContact(CustomerContactEntity customerContactEntity); - boolean deleteById(Long id); + boolean deleteById(String id); boolean deleteContact(DeleteRequest deleteRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java index c2ee954e..f8452693 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/SupCompanyService.java @@ -24,5 +24,5 @@ public interface SupCompanyService { boolean insertCompany(SupCompanyEntity companyEntity); - boolean deleteCompany(Long customerId); + boolean deleteCompany(String customerId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java index 670e665a..e3bbac43 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/CustomerContactServiceImpl.java @@ -40,7 +40,7 @@ public class CustomerContactServiceImpl implements CustomerContactService { } @Override - public boolean deleteById(Long id) { + public boolean deleteById(String id) { return customerContacDao.deleteById(id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java index 5d2a885c..339dc3ee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/purchase/impl/SupCompanyServiceImpl.java @@ -80,7 +80,7 @@ public class SupCompanyServiceImpl implements SupCompanyService { @Override - public boolean deleteCompany(Long customerId) { + public boolean deleteCompany(String customerId) { return supCompanyDao.deleteCompany(customerId); } } diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index a9e8a789..5a38ca93 100644 --- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -30,7 +30,7 @@ thirdSysFk, status, statusInfo, `type`, sourceType, printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk, totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime, - updateTime, invWarehouseCode, fromSubInvCode, dept) + updateTime, invWarehouseCode, fromSubInvCode, dept, noInvOut) values (#{id}, #{billNo}, #{billdate}, @@ -45,7 +45,7 @@ #{sourceType}, #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice}, #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime}, - #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept}) + #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept} ,#{noInvOut}) UPDATE stock_order @@ -77,6 +77,7 @@ invWarehouseCode=#{invWarehouseCode}, fromSubInvCode=#{fromSubInvCode}, dept=#{dept}, + noInvOut=#{noInvOut}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml index c38a309a..66019609 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/CustomerContactDao.xml @@ -38,7 +38,7 @@ WHERE customerId=#{customerId} - + delete from customer_contact where customerId = #{customerId} diff --git a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 45c0910f..c1db7657 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -40,6 +40,7 @@ AND supId = #{supId} + GROUP BY productId 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 fa1b2bd1..fee9e2ac 100644 --- a/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/purchase/SupCompanyDao.xml @@ -49,7 +49,7 @@ - + delete from sup_company where customerId = #{customerId} diff --git a/api-admin/src/main/resources/schemas/schema_v2.1.sql b/api-admin/src/main/resources/schemas/schema_v2.1.sql index 47e273e3..7b16d267 100644 --- a/api-admin/src/main/resources/schemas/schema_v2.1.sql +++ b/api-admin/src/main/resources/schemas/schema_v2.1.sql @@ -2,11 +2,13 @@ CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1); CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1); +CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1); CALL Pro_Temp_ColumnWork ('sup_cert','filePath','varchar(255) ', 2); + -- 创建表时必须 create table if not exists 表名 CREATE TABLE if not exists `device_collect_order` ( `id` int NOT NULL AUTO_INCREMENT COMMENT 'id',