diff --git a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java index cd7237d5..3a1adaa0 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java @@ -24,7 +24,7 @@ public enum BasicExportTypeEnum { /** * 单据类型 */ - DOCUMENT_TYPE("document_type", "单据类型"), + DOCUMENT_TYPE_DATA("document_type_data", "单据类型"), /** * 其他数据 diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 80730ada..4d484458 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -84,6 +84,63 @@ public class SupCertController { } + + + private BaseResponse insertCompanyCert(String customerId, PostSelCertRequest request) { + if (CollUtil.isEmpty(request.getSupCertSetEntities())) { + return ResultVOUtils.error(500, "请选入资质证书！"); + } + if (request.getCertType() == null) { + return ResultVOUtils.error(500, "参数错误！"); + } + + int certType = request.getCertType(); + String productIdFk = request.getProductIdFk(); + String manufacturerIdFk = request.getManufacturerIdFk(); + + String errMsg = ""; + ArrayList list = new ArrayList<>(); + int i = request.getSupCertSetEntities().size(); + for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { + i--; + FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); + supCertRequest.setName(supCertSetEntity.getName()); + supCertRequest.setCustomerId(customerId); + supCertRequest.setManufacturerIdFk(manufacturerIdFk); + if (productIdFk != null) { + supCertRequest.setProductIdFk(productIdFk); + supCertRequest.setType(3); + } else { + supCertRequest.setType(2); + } + + List supCertEntities = supCertService.selectCompanyCert(supCertRequest); + if (!supCertEntities.isEmpty()) { + list.add(supCertEntities.get(0).getName()); + if (i == 0) { + errMsg = list.stream().map(s -> "," + s).collect(Collectors.joining()); + return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); + } + } + } + + for (SupCertSetEntity supCertSetEntity : request.getSupCertSetEntities()) { + SupCertEntity supCertEntity = new SupCertEntity(); + supCertEntity.setName(supCertSetEntity.getName()); + supCertEntity.setManufacturerIdFk(manufacturerIdFk); + supCertEntity.setProductIdFk(productIdFk); + supCertEntity.setCustomerId(customerId); + supCertEntity.setType(certType); + supCertEntity.setCreateTime(new Date()); + supCertEntity.setStatus(0); + supCertEntity.setAuditStatus(ConstantStatus.AUDIT_DRAFT); + supCertEntity.setUpdateTime(new Date()); + boolean b = supCertService.insertCompanyCert(supCertEntity); + } + return ResultVOUtils.success("成功"); + } + + @AuthRuleAnnotation("") @PostMapping("/sup/info/selectAllCert") @Log(title = "资质证书", businessType = BusinessType.INSERT) @@ -100,76 +157,11 @@ public class SupCertController { if (postSelCertRequest.getCertType() == null) { return ResultVOUtils.error(500, "参数错误！"); } - if (postSelCertRequest.getManufacturerIdFk() == null) { - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - }else{ - if(postSelCertRequest.getProductIdFk()==null) { - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); - supCertRequest.setType(2); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - }else{ - String errMsg = ""; - ArrayList list = new ArrayList<>(); - int i = postSelCertRequest.getSupCertSetEntities().size(); - for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { - i--; - FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); - supCertRequest.setName(supCertSetEntity.getName()); - supCertRequest.setCustomerId(customerId); - supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); - supCertRequest.setProductIdFk(postSelCertRequest.getProductIdFk()); - supCertRequest.setType(3); - List supCertEntities = supCertService.selectCompanyCert(supCertRequest); - if (supCertEntities.size() != 0) { - list.add(supCertEntities.get(0).getName()); - if (supCertEntities.size() != 0 && i == 0) { - for (String s : list) { - errMsg = errMsg + "," + s; - } - return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); - } - } - } - } - } - + String errMsg=checkCert(postSelCertRequest,customerId); + if(StrUtil.isNotEmpty(errMsg)){ + return ResultVOUtils.error(999, errMsg.substring(1) + "已存在！"); + } for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { SupCertEntity supCertEntity = new SupCertEntity(); supCertEntity.setName(supCertSetEntity.getName()); @@ -187,6 +179,48 @@ public class SupCertController { } + + public String checkCert(PostSelCertRequest postSelCertRequest,String customerId){ + + String errMsg = ""; + ArrayList list = new ArrayList<>(); + int i = postSelCertRequest.getSupCertSetEntities().size(); + for (SupCertSetEntity supCertSetEntity : postSelCertRequest.getSupCertSetEntities()) { + i--; + FilterSupCertRequest supCertRequest = new FilterSupCertRequest(); + supCertRequest.setName(supCertSetEntity.getName()); + supCertRequest.setCustomerId(customerId); + if(StrUtil.isEmpty(postSelCertRequest.getProductIdFk()) && StrUtil.isNotEmpty(postSelCertRequest.getManufacturerIdFk())) { + supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertRequest.setType(2); + } + if(StrUtil.isNotEmpty(postSelCertRequest.getProductIdFk()) && StrUtil.isNotEmpty(postSelCertRequest.getManufacturerIdFk())) { + supCertRequest.setManufacturerIdFk(postSelCertRequest.getManufacturerIdFk()); + supCertRequest.setProductIdFk(postSelCertRequest.getProductIdFk()); + supCertRequest.setType(3); + } + List supCertEntities = supCertService.selectCompanyCert(supCertRequest); + if (supCertEntities.size() != 0) { + list.add(supCertEntities.get(0).getName()); + if (supCertEntities.size() != 0 && i == 0) { + for (String s : list) { + errMsg = errMsg + "," + s; + } + return errMsg; + } + }else{ + if(i == 0 && list.size()>0){ + for (String s : list) { + errMsg = errMsg + "," + s; + } + return errMsg; + } + } + } + return errMsg; + } + + @AuthRuleAnnotation("") @GetMapping("/sale/info/getCompanyCert") public BaseResponse getCompanyCert(FilterSupCertRequest filterSupCertRequest) { diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index a5a19141..7b901cf2 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -334,7 +334,7 @@ public class SpsSyncDownloadController { case OTHER_DATA: saveUploadOtherData(JSONUtil.toBean(obj, SpsSyncOtherDataResponse.class)); break; - case DOCUMENT_TYPE: + case DOCUMENT_TYPE_DATA: saveUploadDocumentTypeData(JSONUtil.toBean(obj, SpsSyncBusResponse.class)); break; case COUNTRY_DI_DATA: diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java index 183559c1..e1012bbe 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; @@ -19,15 +18,15 @@ public interface BasicCorpDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List id); diff --git a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java index 35940bb1..89342ad1 100644 --- a/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java +++ b/src/main/java/com/glxp/api/res/inv/InvPreinProductResponse.java @@ -105,4 +105,7 @@ public class InvPreinProductResponse { */ private String invCode; + //计量单位 + private String measname; + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index 0aa2748b..20ad0c9d 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -1,13 +1,11 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.BooleanUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; import org.springframework.stereotype.Service; @@ -52,13 +50,13 @@ public class BasicCorpServiceImpl extends ServiceImpl data = innerOrderDao.queryPageList(innerOrderRequest); - return data.get(0); + if(data!=null && data.size()>0){ + return data.get(0); + } + return new InnerOrderEntity(); } @Override diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml index 19ad6126..500566cd 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml @@ -151,7 +151,7 @@ ) - + insert INTO basic_corp(thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, thirdName, thirdName1, thirdName2, thirdName3, thirdName4, updateTime, corpType, outType,createUser,createTime,updateUser,remark) @@ -174,7 +174,7 @@ - + UPDATE basic_corp thirdId=#{thirdId}, @@ -214,7 +214,7 @@ - select * FROM basic_corp WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 9633c6fc..edd54bf9 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -21,7 +21,8 @@ auth_dept.name deptName, auth_warehouse.name invName, ipp.deptCode, - ipp.invCode + ipp.invCode, + bp.measname from inv_prein_product ipp inner join basic_udirel on ipp.relIdFk = basic_udirel.id inner join basic_products bp on basic_udirel.uuid = bp.uuid