From a0daf79e3dacda9af37d408d5cca9d11260b65d8 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, 21 Apr 2023 16:42:34 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/SupCertController.java | 172 +++++++++++------- 1 file changed, 103 insertions(+), 69 deletions(-) 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) { From 93ce0d6898110e52b08c7dd4a9d28fc54f2bf4a9 Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 21 Apr 2023 16:44:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=B1=E5=86=85=E5=90=91=E5=A4=96?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/constant/BasicExportTypeEnum.java | 2 +- .../glxp/api/controller/sync/SpsSyncDownloadController.java | 2 +- src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java | 3 +-- .../com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java | 4 +--- src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml | 2 +- 5 files changed, 5 insertions(+), 8 deletions(-) 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/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..94d18dc6 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,7 +18,7 @@ public interface BasicCorpDao extends BaseMapperPlus - + 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) From 29ed4192198d5c385dd03f5a7264e5009f5a269c Mon Sep 17 00:00:00 2001 From: wj <1285151836@qq.com> Date: Fri, 21 Apr 2023 17:06:00 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=94=B1=E5=86=85=E5=90=91=E5=A4=96?= =?UTF-8?q?=E5=90=8C=E6=AD=A5--=E6=96=B9=E6=B3=95=E5=90=8D=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java | 4 ++-- .../com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java | 4 ++-- src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) 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 94d18dc6..e1012bbe 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpDao.java @@ -20,13 +20,13 @@ public interface BasicCorpDao extends BaseMapperPlus batchSelectByIds(@Param("ids") List id); 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 cf5a9357..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 @@ -56,7 +56,7 @@ public class BasicCorpServiceImpl extends ServiceImpl - + UPDATE basic_corp thirdId=#{thirdId}, @@ -214,7 +214,7 @@ - select * FROM basic_corp WHERE id = #{id} From eba5a792a3bc4b2c72c9715ddbc26325d54233eb Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 21 Apr 2023 17:23:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E5=86=85=E9=83=A8?= =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java index 5a0c2bf7..797567e4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java @@ -29,7 +29,10 @@ public class InnerOrderServiceImpl implements InnerOrderService { InnerOrderRequest innerOrderRequest = new InnerOrderRequest(); innerOrderRequest.setRecordKey(recordKey); List data = innerOrderDao.queryPageList(innerOrderRequest); - return data.get(0); + if(data!=null && data.size()>0){ + return data.get(0); + } + return new InnerOrderEntity(); } @Override From efc0e6d21f75041ef8e4ff820dbe0304601f306f Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 21 Apr 2023 17:33:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/res/inv/InvPreinProductResponse.java | 3 +++ src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) 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/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