From c91af9cfb319528b315e34b581e1c963a43feedd Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 24 Mar 2022 22:16:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=EF=BC=8C=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/StockOrderDetailController.java | 2 + .../admin/dao/basic/BasicUnitMaintainDao.java | 1 + .../sale/admin/dao/basic/UdiRelevanceDao.java | 2 + .../basic/CompanyProductRelevanceRequest.java | 2 +- .../CompanyProductRelevanceResponse.java | 2 +- .../basic/BasicUnitMaintainService.java | 2 + .../service/basic/UdiRelevanceService.java | 2 + .../impl/BasicUnitMaintainServiceImpl.java | 5 +++ .../basic/impl/UdiRelevanceServiceImpl.java | 5 +++ .../thread/BasicBackUpdateProductService.java | 2 +- .../admin/thread/BasicUnitImportService.java | 2 +- .../mapper/basic/BasicUnitMaintainDao.xml | 35 ++++++++++++++++ .../mapper/basic/BussinessLocalTypeDao.xml | 8 ++-- .../mybatis/mapper/basic/BussinessTypeDao.xml | 12 +++--- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 40 +++++++++++++++++++ .../info/CompanyProductRelevanceDao.xml | 3 ++ 16 files changed, 111 insertions(+), 14 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java index 0019f75..ad4ef26 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java @@ -430,7 +430,9 @@ public class StockOrderDetailController { } filterUdiInfoRequest.setDiType(1); CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest(); + filterUdiInfoRequest.setIsDisable(false); BeanUtils.copyProperties(filterUdiInfoRequest, companyProductRelevanceRequest); + companyProductRelevanceRequest.setIsDisable(false); List basicInstrumentMaintainRelevanceResponses = null; if (filterUdiInfoRequest.getCustomerId().equals(Constant.SYSTEM_CUSTOMER_ID)) { BussinessLocalTypeEntity bussinessTypeEntity = bussinessLocalTypeService.findBTByAction(filterUdiInfoRequest.getBillType()); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java index 7d9a2ef..e9405d7 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/BasicUnitMaintainDao.java @@ -12,6 +12,7 @@ public interface BasicUnitMaintainDao { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); + boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean insert(BasicUnitMaintainEntity basicUnitMaintainEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java index 59ab6d3..e5c4e4d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/basic/UdiRelevanceDao.java @@ -27,6 +27,8 @@ public interface UdiRelevanceDao { boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean deleteById(@Param("id") String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java index d3f2a74..740c2e1 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/CompanyProductRelevanceRequest.java @@ -18,7 +18,7 @@ public class CompanyProductRelevanceRequest extends ListPageRequest { private String thirdId2; private String thirdId3; private String thirdId4; - + private Boolean isDisable; private String thirdCode; private String thirdSys; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java index 9d8d5c6..3efd803 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/CompanyProductRelevanceResponse.java @@ -47,7 +47,7 @@ public class CompanyProductRelevanceResponse { private String sptm; private String manufactory; private String measname; - + private Boolean isDisable; private long customerId; private String auditStatus; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java index fbeb85f..7efc5cd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/BasicUnitMaintainService.java @@ -12,6 +12,8 @@ public interface BasicUnitMaintainService { List filterList(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest); + boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity); + boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); boolean updateById(BasicUnitMaintainEntity basicUnitMaintainEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java index 1a290ba..f64309d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/UdiRelevanceService.java @@ -46,6 +46,8 @@ public interface UdiRelevanceService { boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); + boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); + boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); boolean deleteById(String id); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index 38ebb22..87a579d 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -31,6 +31,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { return data; } + @Override + public boolean insertBasicUnitMaintainignore(BasicUnitMaintainEntity basicUnitMaintainEntity) { + return basicUnitMaintainDao.insertBasicUnitMaintainignore(basicUnitMaintainEntity); + } + @Override public boolean insertBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity) { return basicUnitMaintainDao.insertBasicUnitMaintain(basicUnitMaintainEntity); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 412eb7a..193ed97 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -230,6 +230,11 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity); } + @Override + public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity); + } + @Override public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java index 09d3a35..586c170 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicBackUpdateProductService.java @@ -233,7 +233,7 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); + udiRelevanceService.insertUdiRelevanceignore(udiRelevanceEntity1); } } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUnitImportService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUnitImportService.java index 87f015a..971b3dd 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUnitImportService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/BasicUnitImportService.java @@ -100,7 +100,7 @@ public class BasicUnitImportService { basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); basicUnitMaintainEntity.setMobile(erpUnitsResponse.getMobile()); basicUnitMaintainEntity.setCorpType(ConstantStatus.CORP_SP); - basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + basicUnitMaintainService.insertBasicUnitMaintainignore(basicUnitMaintainEntity); } } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index c5ada2b..cb9a3d6 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -98,6 +98,41 @@ + + insert + ignore + INTO basic_corp + (thirdId,erpId,name,spell, + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4,updateTime,corpType) + values + ( + #{thirdId}, + #{erpId}, + #{name}, + #{spell}, + #{addr}, + #{status}, + #{type}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{updateTime}, + #{corpType} + ) + + + insert INTO basic_corp(thirdId, erpId, name, spell, addr, status, type, creditNo, contact, mobile, thirdId1, thirdId2, thirdId3, thirdId4, diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index 1029fb5..9ca0b77 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -9,7 +9,7 @@ basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action - AND name LIKE concat(#{name},'%') + AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND action LIKE concat(#{action},'%') @@ -37,7 +37,7 @@ on basic_bustype_local.action = basic_bussiness_type.localAction - AND basic_bustype_local.name LIKE concat(#{name},'%') + AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.action LIKE concat(#{action},'%') @@ -66,7 +66,7 @@ INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code` - AND basic_bustype_local.name LIKE concat(#{name},'%') + AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.action LIKE concat(#{action},'%') @@ -96,7 +96,7 @@ LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action - AND basic_bustype_local.name LIKE concat(#{name},'%') + AND basic_bustype_local.name LIKE concat('%',#{name},'%') AND basic_bustype_local.action LIKE concat(#{action},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index 3ec2b48..65589b4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -21,13 +21,13 @@ on basic_bussiness_type.localAction = basic_bustype_local.action - AND basic_bussiness_type.name LIKE concat(#{name},'%') + AND basic_bussiness_type.name LIKE concat('%',#{name},'%') - AND basic_bussiness_type.action LIKE concat(#{action},'%') + AND basic_bussiness_type.action LIKE concat('%',#{action},'%') - AND basic_bussiness_type.mainAction LIKE concat(#{mainAction},'%') + AND basic_bussiness_type.mainAction LIKE concat('%',#{mainAction},'%') AND basic_bussiness_type.enable =#{enabled} @@ -52,10 +52,10 @@ basic_bustype_local.action - AND name LIKE concat(#{name},'%') + AND basic_bussiness_type.name LIKE concat('%',#{name},'%') - AND `action` LIKE concat(#{action},'%') + AND `action` LIKE concat('%',#{action},'%') AND mainAction LIKE concat(#{mainAction},'%') @@ -100,7 +100,7 @@ INNER JOIN inv_warehouse_user on inv_warehouse.`code` =inv_warehouse_user.`code` - AND basic_bussiness_type.name LIKE concat(#{name},'%') + AND basic_bussiness_type.name LIKE concat('%',#{name},'%') AND basic_bussiness_type.action LIKE concat(#{action},'%') diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 9f8fea9..cff2e63 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -301,6 +301,46 @@ + + insert + ignore + INTO basic_udirel + (id, + thirdId,thirdName,uuid,isUseDy,updateTime, + thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname,ybbm,sptm,isDisable,isLock + ,mainId,mainName,lockStatus,udplatCode,isAdavence + ) + values + ( + #{id}, + #{thirdId}, + #{thirdName}, + #{uuid}, + #{isUseDy}, + #{updateTime}, + #{thirdId1}, + #{thirdId2}, + #{thirdId3}, + #{thirdId4}, + #{thirdName1}, + #{thirdName2}, + #{thirdName3}, + #{thirdName4}, + #{manufactory}, + #{measname}, + #{ybbm}, + #{sptm}, + #{isDisable}, + #{isLock}, + #{mainId}, + #{mainName}, + #{lockStatus}, + #{udplatCode}, + #{isAdavence} + ) + + DELETE FROM basic_udirel diff --git a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml index e7bbba6..5629e2d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/CompanyProductRelevanceDao.xml @@ -135,6 +135,9 @@ and unitFk = #{unitFk} + + AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false ) + ORDER BY updateTime DESC