From 01d873f317ef621084b4e61bf60d16364257e29a Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 2 Aug 2024 15:33:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicDestinyRelController.java | 5 - .../controller/basic/BasicGenJsonService.java | 3 +- .../BasicProductsExportLogController.java | 3 +- .../inout/IoOrderMutiController.java | 2 +- .../purchase/SupProductController.java | 3 +- .../thrsys/ForThirdSysApiController.java | 2 - .../api/req/basic/FilterUdiRelRequest.java | 5 + .../api/res/basic/UdiRelevanceResponse.java | 6 + .../basic/BasicSkPrescribeService.java | 52 +- .../service/basic/UdiRelevanceService.java | 543 +++++++++++++++--- .../BasicProductsImportLogServiceImpl.java | 2 +- .../basic/impl/UdiRelevanceServiceImpl.java | 461 --------------- .../basic/impl/UdiRlSupServiceImpl.java | 4 - .../impl/DeviceChangeOrderServiceImpl.java | 8 - .../service/inout/IoChangeInoutService.java | 3 - .../impl/IoOrderDetailBizServiceImpl.java | 6 - .../inout/impl/IoOrderMutiServiceImpl.java | 5 - .../api/service/inv/InvCountOrderService.java | 6 - .../inv/impl/InvPlaceOrderServiceImpl.java | 5 - .../service/inv/impl/InvPlaceServiceImpl.java | 2 - .../inv/impl/StockCompareServiceImpl.java | 3 - .../thrsys/impl/ThrInvOrderServiceImpl.java | 2 - .../thrsys/impl/ThrProductsServiceImpl.java | 3 - 23 files changed, 493 insertions(+), 641 deletions(-) delete mode 100644 src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java diff --git a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java index 7a6b02278..67d7e8654 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicDestinyRelController.java @@ -1,7 +1,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -27,7 +26,6 @@ import com.glxp.api.service.basic.BasicSkProjectService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.impl.BasicDestinyRelService; import com.glxp.api.util.BeanCopyUtils; -import com.glxp.api.util.StringUtils; import com.glxp.api.util.udi.FilterUdiUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -39,12 +37,9 @@ import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; @RestController public class BasicDestinyRelController { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java index 81c6fcd2c..ccb497a6b 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.file.FileWriter; @@ -24,9 +25,7 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.basic.BasicCorpExportLogService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.basic.BasicProductsExportLogService; -import com.glxp.api.service.basic.UdiRelevanceService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java index 3e1fd7f29..40d7c4397 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsExportLogController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.beans.BeanUtils; import com.github.pagehelper.PageInfo; import com.glxp.api.common.enums.ResultEnum; @@ -16,9 +17,7 @@ import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlDlResponse; import com.glxp.api.service.basic.BasicProductsExportLogService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.CustomUtil; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java index 0fbed8f7a..d9a2d63d7 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderMutiController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.inout; import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -17,7 +18,6 @@ import com.glxp.api.res.inout.IoOrderMutiResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.*; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 8b6990913..7a86dfbe8 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.purchase; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -28,12 +29,10 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.SupProductResponse; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupCertSetService; import com.glxp.api.service.purchase.SupManufacturerService; import com.glxp.api.service.purchase.SupProductService; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java index ea8be6e9d..8d86adc0d 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ForThirdSysApiController.java @@ -16,7 +16,6 @@ import com.glxp.api.req.forthird.ForInvOutScanCodeRequest; import com.glxp.api.req.inv.FilterInvProductRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.forthird.ForInvOutScanCodeResponse; import com.glxp.api.res.inv.InvProductResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.UdiRelevanceService; @@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.Arrays; -import java.util.List; @RestController public class ForThirdSysApiController { diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index df7d7b358..39cc757f1 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -118,5 +118,10 @@ public class FilterUdiRelRequest extends ListPageRequest { private String cpms; private Integer productsType;//默认是耗材 + /** + * 收费项目编码 + */ + private String payFeeCode; + } diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index af8df84c7..7b3e81baa 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -281,4 +281,10 @@ public class UdiRelevanceResponse { return false; return isUseDy; } + + + /** + * 收费项目编码 + */ + private String payFeeCode; } diff --git a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java index 50f232328..23af4fbc1 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicSkPrescribeService.java @@ -154,33 +154,35 @@ public class BasicSkPrescribeService extends ServiceImpl thrProductsEntities = thrProductsService.list(new QueryWrapper().eq("prcitmcode", skPrescribeItemEntity.getItemCode())); -// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(); -// BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByThrCode(skPrescribeItemEntity.getAdNum(), thrProductsEntity.getCode()); -// if (basicSkPrescribeDiEntity == null) { -// basicSkPrescribeDiEntity = new BasicSkPrescribeDiEntity(); -// } -// basicSkPrescribeDiEntity.setPrescribeCode(skPrescribeItemEntity.getPrescribeCode()); -// basicSkPrescribeDiEntity.setSickerCode(skPrescribeItemEntity.getSickerCode()); -// basicSkPrescribeDiEntity.setCount(IntUtil.value(skPrescribeItemEntity.getCount())); -// basicSkPrescribeDiEntity.setMeasureCount(basicSkPrescribeDiEntity.getMeasureCount() + ""); -// basicSkPrescribeDiEntity.setMeasureUnit(skPrescribeItemEntity.getMeasureUnit()); -// basicSkPrescribeDiEntity.setPId(thrProductsEntity.getPrcitmcode()); -// UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), "thirdId"); -// basicSkPrescribeDiEntity.setAmount(skPrescribeItemEntity.getAmount()); -// basicSkPrescribeDiEntity.setRelId(udiRelevanceEntity.getId()); -// basicSkPrescribeDiEntity.setThrCode(thrProductsEntity.getCode()); -// basicSkPrescribeDiEntity.setThrName(thrProductsEntity.getName()); -// basicSkPrescribeDiEntity.setCategory(thrProductsEntity.getCplb()); -// basicSkPrescribeDiEntity.setGgxh(thrProductsEntity.getStandard()); -// basicSkPrescribeDiEntity.setAdNum(skPrescribeItemEntity.getAdNum()); -// basicSkPrescribeDiEntity.setUpdateTime(new Date()); -// basicSkPrescribeDiService.save(basicSkPrescribeDiEntity); -// -// } + if (skPrescribeItemEntity.getItemCode() != null) { + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByPayFeeCode(skPrescribeItemEntity.getItemCode()); + BasicSkPrescribeDiEntity basicSkPrescribeDiEntity = basicSkPrescribeDiService.findByThrCode(skPrescribeItemEntity.getAdNum(), udiRelevanceResponse.getNameCode()); + if (basicSkPrescribeDiEntity == null) { + basicSkPrescribeDiEntity = new BasicSkPrescribeDiEntity(); + } + basicSkPrescribeDiEntity.setPrescribeCode(skPrescribeItemEntity.getPrescribeCode()); + basicSkPrescribeDiEntity.setSickerCode(skPrescribeItemEntity.getSickerCode()); + basicSkPrescribeDiEntity.setCount(IntUtil.value(skPrescribeItemEntity.getCount())); + basicSkPrescribeDiEntity.setMeasureCount(basicSkPrescribeDiEntity.getMeasureCount() + ""); + basicSkPrescribeDiEntity.setMeasureUnit(skPrescribeItemEntity.getMeasureUnit()); + basicSkPrescribeDiEntity.setPId(udiRelevanceResponse.getPayFeeCode()); + basicSkPrescribeDiEntity.setAmount(skPrescribeItemEntity.getAmount()); + basicSkPrescribeDiEntity.setRelId(udiRelevanceResponse.getId()); + basicSkPrescribeDiEntity.setThrCode(udiRelevanceResponse.getNameCode()); + basicSkPrescribeDiEntity.setThrName(udiRelevanceResponse.getCpmctymc()); + basicSkPrescribeDiEntity.setCategory(udiRelevanceResponse.getCplb()); + basicSkPrescribeDiEntity.setGgxh(udiRelevanceResponse.getGgxh()); + basicSkPrescribeDiEntity.setAdNum(skPrescribeItemEntity.getAdNum()); + basicSkPrescribeDiEntity.setUpdateTime(new Date()); + basicSkPrescribeDiService.save(basicSkPrescribeDiEntity); + } } diff --git a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java index b5f9e821f..732c06e6e 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiRelevanceService.java @@ -1,114 +1,471 @@ package com.glxp.api.service.basic; - -import com.baomidou.mybatisplus.extension.service.IService; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.UdiRelevanceDao; +import com.glxp.api.entity.basic.BasicProductsEntity; +import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; +import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.MainIdRelIdAndProductResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; - +import com.glxp.api.service.thrsys.ThrSystemService; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.udi.FilterUdiUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Map; - -/** - * 耗材字典关联 - */ -public interface UdiRelevanceService extends IService { - - List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); - - List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest); - - List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); - - List filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest); - - UdiRelevanceResponse selectByNameCode(String nameCode); +import java.util.stream.Collectors; + +@Service +@Transactional(rollbackFor = Exception.class) +public class UdiRelevanceService extends ServiceImpl { + @Resource + UdiRelevanceDao udiRelevanceDao; + @Resource + UdiRlSupService udiRlSupService; + @Resource + ThrSystemService basicThirdSysService; + + public List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest) { + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); + return data; + } + + public List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) { + + + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + List data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest); + return data; + + } + + public List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) { + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + List data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest); + return data; + } + + + public List filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) { + + List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); + return data; + } + + + public List selectAllByNameCode(String nameCode) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUniqueNameCode(nameCode); + List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); + return udiRelevanceResponses; + } + + + public UdiRelevanceResponse selectByNameCode(String nameCode) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUniqueNameCode(nameCode); + List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) + return udiRelevanceResponses.get(0); + return null; + } + + + public UdiRelevanceResponse selectByRelId(String relId) { + if (StrUtil.isEmpty(relId)) + return null; + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(Long.parseLong(relId)); + UdiRelevanceResponse udiRelevanceResponses = selectOneUdi(filterUdiRelRequest); + return udiRelevanceResponses; + } + + + public List selectAllByNameCode(String nameCode, String unitFk) { + List udiRelevanceResponses; + if (StrUtil.isNotEmpty(unitFk)) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUniqueNameCode(nameCode); + filterUdiRelRequest.setUnitFk(unitFk); + filterUdiRelRequest.setIsDisable(false); + filterUdiRelRequest.setKey("key"); + udiRelevanceResponses = filterUdiJoinSup(filterUdiRelRequest); + } else { + udiRelevanceResponses = selectGroupByNameCode(nameCode, false); + } + return udiRelevanceResponses; + } /** - * 根据耗材字典ID查询耗材相关数据 + * 根据收费项目查询产品信息 * - * @param relId * @return */ - UdiRelevanceResponse selectByRelId(String relId); - - //根据DI查询产品信息 - List selectAllByNameCode(String nameCode); - - - List selectAllByNameCode(String nameCode, String unitFk); - - boolean isExit(); - - List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest); - - boolean isExitByUuid(String uuid); - - List batchSelectByUuid(List uuids); - - List batchSelectByIds(List ids); - - List selectByUuid(String uuid); - - UdiRelevanceEntity selectById(Long id); - - UdiRelevanceResponse selectGroupById(Long id); - - UdiRelevanceResponse selectUdiId(Long id); - - - UdiRelevanceResponse selectSupGroupById(Long id, String supId); + public UdiRelevanceResponse selectByPayFeeCode(String payFeeCode) { + + if (StrUtil.isEmpty(payFeeCode)) { + return null; + } + List udiRelevanceResponses; + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setPayFeeCode(payFeeCode); + udiRelevanceResponses = filterUdiJoinSup(filterUdiRelRequest); + if (CollUtil.isNotEmpty(udiRelevanceResponses)) { + return udiRelevanceResponses.get(0); + } +// if (udiRelevanceResponses.size() == 1) { +// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); +// if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) { +// return selectByMainId(nameCode); +// } +// } + return null; + + + } + + + public boolean isExit() { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setPage(1); + filterUdiRelRequest.setLimit(1); + List data = filterUdiRelevance(filterUdiRelRequest); + if (data != null && data.size() > 0) { + return true; + } + return false; + } + + + public List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest) { + if (filterUdiRelRequest == null) { + return Collections.emptyList(); + } + if (filterUdiRelRequest.getPage() != null) { + int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); + PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); + } + + List data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); + return data; + } + + + public boolean isExitByUuid(String uuid) { + List udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid); + if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { + return true; + } + return false; + } + + + public List batchSelectByUuid(List uuids) { + return udiRelevanceDao.batchSelectByUuid(uuids); + } + + + public List batchSelectByIds(List ids) { + return udiRelevanceDao.batchSelectByIds(ids); + } + + + public List selectByUuid(String uuid) { + return udiRelevanceDao.selectByUuid(uuid); + } + + + public UdiRelevanceEntity selectById(Long id) { + return udiRelevanceDao.selectById(id); + } + + + public UdiRelevanceResponse selectGroupById(Long id) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(id); + filterUdiRelRequest.setDiType(1); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + + public UdiRelevanceResponse selectUdiId(Long id) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setId(id); + List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + + public UdiRelevanceResponse selectSupGroupById(Long id, String supId) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + if (StrUtil.isNotEmpty(supId)) + filterUdiRelRequest.setUnitFk(supId); + filterUdiRelRequest.setId(id); + filterUdiRelRequest.setDiType(1); + return udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest); + } + + + public UdiRelevanceEntity selectUpdateByUuid(String uuid) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setUuid(uuid); + List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + + public UdiRelevanceEntity selectUpdateByThirdId(String thirdId) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + if (thirdId != null) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + filterUdiRelRequest.setThirdId(thirdId); + } else if (mainSys.equals("thirdId1")) { + filterUdiRelRequest.setThirdId1(thirdId); + } else if (mainSys.equals("thirdId2")) { + filterUdiRelRequest.setThirdId2(thirdId); + } else if (mainSys.equals("thirdId3")) { + filterUdiRelRequest.setThirdId3(thirdId); + } else if (mainSys.equals("thirdId4")) { + filterUdiRelRequest.setThirdId4(thirdId); + } + } + List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + + public UdiRelevanceEntity selectByMainIdLimitOne(String mainId) { + + if (mainId == null) + return null; + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setMainId(mainId); + return udiRelevanceDao.selectByThirdId(filterUdiRelRequest); + } + + + public List selectByMainId(String mainId) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + filterUdiRelRequest.setMainId(mainId); + List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); + return udiRelevanceResponses; + } + + + public UdiRelevanceEntity selectUpteaByAll(String uuid, String thirdId) { + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + if (thirdId != null) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + filterUdiRelRequest.setUuid(uuid); + if (mainSys.equals("thirdId")) { + filterUdiRelRequest.setThirdId(thirdId); + } else if (mainSys.equals("thirdId1")) { + filterUdiRelRequest.setThirdId1(thirdId); + } else if (mainSys.equals("thirdId2")) { + filterUdiRelRequest.setThirdId2(thirdId); + } else if (mainSys.equals("thirdId3")) { + filterUdiRelRequest.setThirdId3(thirdId); + } else if (mainSys.equals("thirdId4")) { + filterUdiRelRequest.setThirdId4(thirdId); + } + } + + List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); + if (data != null && data.size() > 0) + return data.get(0); + return null; + } + + + public UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys) { + + if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { + return null; + } + + FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiRelRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiRelRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiRelRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiRelRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiRelRequest.setThirdId4(thirdId); + } + + return udiRelevanceDao.selectByThirdId(filterUdiRelRequest); + } + + + public List selectListByThirdId(String thirdId, String thirdSys) { + if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { + return null; + } + + CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest(); + if ("thirdId".equals(thirdSys)) { + filterUdiRelRequest.setThirdId(thirdId); + } else if ("thirdId1".equals(thirdSys)) { + filterUdiRelRequest.setThirdId1(thirdId); + } else if ("thirdId2".equals(thirdSys)) { + filterUdiRelRequest.setThirdId2(thirdId); + } else if ("thirdId3".equals(thirdSys)) { + filterUdiRelRequest.setThirdId3(thirdId); + } else if ("thirdId4".equals(thirdSys)) { + filterUdiRelRequest.setThirdId4(thirdId); + } + filterUdiRelRequest.setDiType(1); + List data = udiRlSupService.filterUdiGp(filterUdiRelRequest); + return data; + } + + + public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity); + } + + + public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) { + return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity); + } + + + public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { + ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); + } + return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); + } + + + public boolean deleteById(String id) { + return udiRelevanceDao.deleteById(id); + } + + + public boolean deleteByIds(List ids) { + return udiRelevanceDao.deleteByIds(ids); + } + + + public boolean deleteByUuid(String uuid) { + return udiRelevanceDao.deleteByUuid(uuid); + } + + + public String findUuidById(String relId) { + return udiRelevanceDao.selectUuidById(relId); + } + + + public List selectGroupByNameCode(String nameCode, Boolean isDisable) { + return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); + } + + + public String getRelIdByUdiCode(String code) { + if (StrUtil.isBlank(code)) { + return null; + } + UdiEntity udi = FilterUdiUtils.getUdi(code); + return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi()); + } + + + public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) { + return udiRelevanceDao.selectOneUdi(filterUdiRelRequest); + } + + + public MainIdRelIdAndProductResponse selectMainIdRelIdAndProductMap(List thrCodes, String thirdSys) { + MainIdRelIdAndProductResponse mainIdRelIdAndProductResponse = new MainIdRelIdAndProductResponse(); + Map mainIdRelIdMap = new HashMap<>(); + Map relIdBasicProductsEntityMap = new HashMap<>(); + QueryWrapper qw = new QueryWrapper<>(); + qw.in(thirdSys, thrCodes); + qw.ne("isDisable", true); + qw.select("id", "mainId"); + List udiRelevanceEntityList = udiRelevanceDao.selectList(qw); + if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { + mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); +// List relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList()); +// List basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds); +// if (CollectionUtil.isNotEmpty(basicProductsEntities)){ +// relIdBasicProductsEntityMap = basicProductsEntities.stream().collect(Collectors.toMap(BasicProductsEntity::getId, x -> x)); +// } + } - UdiRelevanceEntity selectUpdateByUuid(String uuid); + mainIdRelIdAndProductResponse.setMainIdRelIdMap(mainIdRelIdMap); + mainIdRelIdAndProductResponse.setRelIdBasicProductsEntityMap(relIdBasicProductsEntityMap); + return mainIdRelIdAndProductResponse; + } - UdiRelevanceEntity selectUpdateByThirdId(String thirdId); - - UdiRelevanceEntity selectByMainIdLimitOne(String mainId); - - List selectByMainId(String mainId); - - UdiRelevanceEntity selectUpteaByAll(String uuid, String thirdId); - - UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys); - - List selectListByThirdId(String thirdId, String thirdSys); - - boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - - boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity); - - boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity); - - boolean deleteById(String id); - - boolean deleteByIds(List id); - - boolean deleteByUuid(String uuid); - - /** - * 查询产品的uuid - * - * @param relId - * @return - */ - String findUuidById(String relId); - - List selectGroupByNameCode(String nameCode, Boolean isDisable); - - /** - * 根据UDI码查询耗材字典ID - * - * @param code - * @return - */ - String getRelIdByUdiCode(String code); - UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest); + public Integer findPurType(Long relId) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectOne(new QueryWrapper().select("purType").eq("id", relId).last("limit 1")); + if (udiRelevanceEntity == null) + return 0; + return IntUtil.value(udiRelevanceEntity.getPurType()); + } - MainIdRelIdAndProductResponse selectMainIdRelIdAndProductMap(List thrCodes, String thirdSys); - Integer findPurType(Long relId); } diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 428f19054..0bf01f8bb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.basic.impl; import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.service.basic.UdiRelevanceService; import org.springframework.beans.BeanUtils; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -22,7 +23,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.BasicProductsImportDetailService; import com.glxp.api.service.basic.BasicProductsImportLogService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrDataService; import com.glxp.api.service.thrsys.ThrSystemService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java deleted file mode 100644 index 01ee4df5f..000000000 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ /dev/null @@ -1,461 +0,0 @@ -package com.glxp.api.service.basic.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson2.util.JSONObject1O; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.req.basic.CompanyProductRelevanceRequest; -import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.res.basic.MainIdRelIdAndProductResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.basic.UdiRlSupService; -import com.glxp.api.service.thrsys.ThrSystemService; -import com.glxp.api.util.IntUtil; -import com.glxp.api.util.udi.FilterUdiUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service -@Transactional(rollbackFor = Exception.class) -public class UdiRelevanceServiceImpl extends ServiceImpl implements UdiRelevanceService { - @Resource - UdiRelevanceDao udiRelevanceDao; - @Resource - UdiRlSupService udiRlSupService; - @Resource - ThrSystemService basicThirdSysService; - - @Override - public List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest) { - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } - List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); - return data; - } - - @Override - public List filterCertUdi(FilterUdiRelRequest filterUdiRelRequest) { - - - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } - List data = udiRelevanceDao.filterCertUdi(filterUdiRelRequest); - return data; - - } - - @Override - public List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest) { - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } - List data = udiRelevanceDao.filterUdiJoinSup(filterUdiRelRequest); - return data; - } - - - @Override - public List filterUdiEntity(FilterUdiRelRequest filterUdiRelRequest) { - - List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); - return data; - } - - @Override - public List selectAllByNameCode(String nameCode) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setUniqueNameCode(nameCode); - List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); - return udiRelevanceResponses; - } - - @Override - public UdiRelevanceResponse selectByNameCode(String nameCode) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setUniqueNameCode(nameCode); - List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); - if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) - return udiRelevanceResponses.get(0); - return null; - } - - @Override - public UdiRelevanceResponse selectByRelId(String relId) { - if (StrUtil.isEmpty(relId)) - return null; - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setId(Long.parseLong(relId)); - UdiRelevanceResponse udiRelevanceResponses = selectOneUdi(filterUdiRelRequest); - return udiRelevanceResponses; - } - - @Override - public List selectAllByNameCode(String nameCode, String unitFk) { - List udiRelevanceResponses; - if (StrUtil.isNotEmpty(unitFk)) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setUniqueNameCode(nameCode); - filterUdiRelRequest.setUnitFk(unitFk); - filterUdiRelRequest.setIsDisable(false); - filterUdiRelRequest.setKey("key"); - udiRelevanceResponses = filterUdiJoinSup(filterUdiRelRequest); - } else { - udiRelevanceResponses = selectGroupByNameCode(nameCode, false); - } -// if (udiRelevanceResponses.size() == 1) { -// UdiRelevanceResponse udiRelevanceResponse = udiRelevanceResponses.get(0); -// if (udiRelevanceResponse == null || udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) { -// return selectByMainId(nameCode); -// } -// } - return udiRelevanceResponses; - - - } - - @Override - public boolean isExit() { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setPage(1); - filterUdiRelRequest.setLimit(1); - List data = filterUdiRelevance(filterUdiRelRequest); - if (data != null && data.size() > 0) { - return true; - } - return false; - } - - @Override - public List filterUdiGp(FilterUdiRelRequest filterUdiRelRequest) { - if (filterUdiRelRequest == null) { - return Collections.emptyList(); - } - if (filterUdiRelRequest.getPage() != null) { - int offset = (filterUdiRelRequest.getPage() - 1) * filterUdiRelRequest.getLimit(); - PageHelper.offsetPage(offset, filterUdiRelRequest.getLimit()); - } - - List data = udiRelevanceDao.filterUdiGp(filterUdiRelRequest); - return data; - } - - @Override - public boolean isExitByUuid(String uuid) { - List udiRelevanceEntities = udiRelevanceDao.selectByUuid(uuid); - if (udiRelevanceEntities != null && !udiRelevanceEntities.isEmpty()) { - return true; - } - return false; - } - - @Override - public List batchSelectByUuid(List uuids) { - return udiRelevanceDao.batchSelectByUuid(uuids); - } - - @Override - public List batchSelectByIds(List ids) { - return udiRelevanceDao.batchSelectByIds(ids); - } - - @Override - public List selectByUuid(String uuid) { - return udiRelevanceDao.selectByUuid(uuid); - } - - @Override - public UdiRelevanceEntity selectById(Long id) { - return udiRelevanceDao.selectById(id); - } - - @Override - public UdiRelevanceResponse selectGroupById(Long id) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setId(id); - filterUdiRelRequest.setDiType(1); - List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); - return null; - } - - @Override - public UdiRelevanceResponse selectUdiId(Long id) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setId(id); - List data = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); - return null; - } - - @Override - public UdiRelevanceResponse selectSupGroupById(Long id, String supId) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - if (StrUtil.isNotEmpty(supId)) - filterUdiRelRequest.setUnitFk(supId); - filterUdiRelRequest.setId(id); - filterUdiRelRequest.setDiType(1); - return udiRelevanceDao.selectOneUdiJoinSup(filterUdiRelRequest); - } - - - @Override - public UdiRelevanceEntity selectUpdateByUuid(String uuid) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setUuid(uuid); - List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); - return null; - } - - @Override - public UdiRelevanceEntity selectUpdateByThirdId(String thirdId) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - if (thirdId != null) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - String mainSys = basicThirdSysEntity.getThirdId(); - if (mainSys.equals("thirdId")) { - filterUdiRelRequest.setThirdId(thirdId); - } else if (mainSys.equals("thirdId1")) { - filterUdiRelRequest.setThirdId1(thirdId); - } else if (mainSys.equals("thirdId2")) { - filterUdiRelRequest.setThirdId2(thirdId); - } else if (mainSys.equals("thirdId3")) { - filterUdiRelRequest.setThirdId3(thirdId); - } else if (mainSys.equals("thirdId4")) { - filterUdiRelRequest.setThirdId4(thirdId); - } - } - List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); - return null; - } - - @Override - public UdiRelevanceEntity selectByMainIdLimitOne(String mainId) { - - if (mainId == null) - return null; - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setMainId(mainId); - return udiRelevanceDao.selectByThirdId(filterUdiRelRequest); - } - - @Override - public List selectByMainId(String mainId) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - filterUdiRelRequest.setMainId(mainId); - List udiRelevanceResponses = filterUdiRelevance(filterUdiRelRequest); - return udiRelevanceResponses; - } - - @Override - public UdiRelevanceEntity selectUpteaByAll(String uuid, String thirdId) { - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - if (thirdId != null) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - String mainSys = basicThirdSysEntity.getThirdId(); - filterUdiRelRequest.setUuid(uuid); - if (mainSys.equals("thirdId")) { - filterUdiRelRequest.setThirdId(thirdId); - } else if (mainSys.equals("thirdId1")) { - filterUdiRelRequest.setThirdId1(thirdId); - } else if (mainSys.equals("thirdId2")) { - filterUdiRelRequest.setThirdId2(thirdId); - } else if (mainSys.equals("thirdId3")) { - filterUdiRelRequest.setThirdId3(thirdId); - } else if (mainSys.equals("thirdId4")) { - filterUdiRelRequest.setThirdId4(thirdId); - } - } - - List data = udiRelevanceDao.filterEntity(filterUdiRelRequest); - if (data != null && data.size() > 0) - return data.get(0); - return null; - } - - @Override - public UdiRelevanceEntity selectByThirdId(String thirdId, String thirdSys) { - - if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { - return null; - } - - FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); - if ("thirdId".equals(thirdSys)) { - filterUdiRelRequest.setThirdId(thirdId); - } else if ("thirdId1".equals(thirdSys)) { - filterUdiRelRequest.setThirdId1(thirdId); - } else if ("thirdId2".equals(thirdSys)) { - filterUdiRelRequest.setThirdId2(thirdId); - } else if ("thirdId3".equals(thirdSys)) { - filterUdiRelRequest.setThirdId3(thirdId); - } else if ("thirdId4".equals(thirdSys)) { - filterUdiRelRequest.setThirdId4(thirdId); - } - - return udiRelevanceDao.selectByThirdId(filterUdiRelRequest); - } - - @Override - public List selectListByThirdId(String thirdId, String thirdSys) { - if (StrUtil.isEmpty(thirdId) || StrUtil.isEmpty(thirdSys)) { - return null; - } - - CompanyProductRelevanceRequest filterUdiRelRequest = new CompanyProductRelevanceRequest(); - if ("thirdId".equals(thirdSys)) { - filterUdiRelRequest.setThirdId(thirdId); - } else if ("thirdId1".equals(thirdSys)) { - filterUdiRelRequest.setThirdId1(thirdId); - } else if ("thirdId2".equals(thirdSys)) { - filterUdiRelRequest.setThirdId2(thirdId); - } else if ("thirdId3".equals(thirdSys)) { - filterUdiRelRequest.setThirdId3(thirdId); - } else if ("thirdId4".equals(thirdSys)) { - filterUdiRelRequest.setThirdId4(thirdId); - } - filterUdiRelRequest.setDiType(1); - List data = udiRlSupService.filterUdiGp(filterUdiRelRequest); - return data; - } - - @Override - public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { - return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity); - } - - @Override - public boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity) { - return udiRelevanceDao.insertUdiRelevanceignore(udiRelevanceEntity); - } - - @Override - public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) { - ThrSystemEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - String mainSys = basicThirdSysEntity.getThirdId(); - if (mainSys.equals("thirdId")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId()); - } else if (mainSys.equals("thirdId1")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1()); - } else if (mainSys.equals("thirdId2")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2()); - } else if (mainSys.equals("thirdId3")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3()); - } else if (mainSys.equals("thirdId4")) { - udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4()); - } - return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity); - } - - @Override - public boolean deleteById(String id) { - return udiRelevanceDao.deleteById(id); - } - - @Override - public boolean deleteByIds(List ids) { - return udiRelevanceDao.deleteByIds(ids); - } - - @Override - public boolean deleteByUuid(String uuid) { - return udiRelevanceDao.deleteByUuid(uuid); - } - - @Override - public String findUuidById(String relId) { - return udiRelevanceDao.selectUuidById(relId); - } - - @Override - public List selectGroupByNameCode(String nameCode, Boolean isDisable) { - return udiRelevanceDao.selectGroupByNameCode(nameCode, isDisable); - } - - @Override - public String getRelIdByUdiCode(String code) { - if (StrUtil.isBlank(code)) { - return null; - } - UdiEntity udi = FilterUdiUtils.getUdi(code); - return udiRelevanceDao.selectRelIdByNameCode(udi.getUdi()); - } - - @Override - public UdiRelevanceResponse selectOneUdi(FilterUdiRelRequest filterUdiRelRequest) { - return udiRelevanceDao.selectOneUdi(filterUdiRelRequest); - } - - @Override - public MainIdRelIdAndProductResponse selectMainIdRelIdAndProductMap(List thrCodes, String thirdSys) { - MainIdRelIdAndProductResponse mainIdRelIdAndProductResponse = new MainIdRelIdAndProductResponse(); - Map mainIdRelIdMap = new HashMap<>(); - Map relIdBasicProductsEntityMap = new HashMap<>(); - QueryWrapper qw = new QueryWrapper<>(); - qw.in(thirdSys, thrCodes); - qw.ne("isDisable", true); - qw.select("id", "mainId"); - - List udiRelevanceEntityList = udiRelevanceDao.selectList(qw); - if (CollectionUtil.isNotEmpty(udiRelevanceEntityList)) { - mainIdRelIdMap = udiRelevanceEntityList.stream().collect(Collectors.toMap(UdiRelevanceEntity::getMainId, udiRelevanceEntity -> udiRelevanceEntity)); -// List relIds = udiRelevanceEntityList.stream().map(UdiRelevanceEntity::getId).collect(Collectors.toList()); -// List basicProductsEntities = udiRelevanceDao.selectProductByRelIds(relIds); -// if (CollectionUtil.isNotEmpty(basicProductsEntities)){ -// relIdBasicProductsEntityMap = basicProductsEntities.stream().collect(Collectors.toMap(BasicProductsEntity::getId, x -> x)); -// } - } - - mainIdRelIdAndProductResponse.setMainIdRelIdMap(mainIdRelIdMap); - mainIdRelIdAndProductResponse.setRelIdBasicProductsEntityMap(relIdBasicProductsEntityMap); - return mainIdRelIdAndProductResponse; - } - - @Override - public Integer findPurType(Long relId) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceDao.selectOne(new QueryWrapper().select("purType").eq("id", relId).last("limit 1")); - if (udiRelevanceEntity == null) - return 0; - return IntUtil.value(udiRelevanceEntity.getPurType()); - } - - -} diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index c9f4df46a..bc22d37d3 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -5,16 +5,12 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRlSupDao; -import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.basic.UdiRlSupService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java index fda618b59..64995fcf7 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceChangeOrderServiceImpl.java @@ -6,25 +6,21 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.dev.DeviceChangeLogEntity; import com.glxp.api.entity.dev.DeviceChangeOrderEntity; import com.glxp.api.entity.dev.DeviceChangeOrderItemEntity; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.enums.dev.DeviceChangeStatusEnum; import com.glxp.api.enums.dev.DeviceChangeTypeEnum; import com.glxp.api.enums.dev.DeviceStatusEnum; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.dev.DeviceChangeOrderDetailQuery; import com.glxp.api.req.dev.DeviceChangeOrderGenerateOrderId; import com.glxp.api.req.dev.DeviceChangeOrderParam; @@ -34,7 +30,6 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.basic.SysApprovalFlowService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.dev.DeviceChangeLogService; @@ -53,12 +48,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.sql.SQLException; -import java.time.LocalDate; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** * 针对表【device_change_order(设备变更单)】的数据库操作Service实现 diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index d74913328..30b1a9189 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -1,9 +1,6 @@ package com.glxp.api.service.inout; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.req.thrsys.UdiwmsOrderDetailRequest; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductDetailService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 7a241cfee..1b272e842 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.BasicDestinyRelMapper; @@ -13,11 +12,8 @@ import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.BasicSkPrescribeItemEntity; -import com.glxp.api.entity.basic.BasicSkProjectDetailEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.exception.JsonException; @@ -33,11 +29,9 @@ import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; -import com.glxp.api.service.basic.BasicSkPrescirbeDetailService; import com.glxp.api.service.basic.BasicSkProjectService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.basic.impl.BasicDestinyRelService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java index 841413f4f..e69d9a9d6 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderMutiServiceImpl.java @@ -1,9 +1,7 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -15,7 +13,6 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.IoOrderMutiRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderMutiResponse; -import com.glxp.api.res.inout.IoOrderMutiSetResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -24,13 +21,11 @@ import com.glxp.api.service.inout.*; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.UdiCalCountUtil; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.inout.IoOrderMutiMapper; import javax.annotation.Resource; -import javax.validation.Valid; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java index 0c8635136..6c64d694b 100644 --- a/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvCountOrderService.java @@ -2,8 +2,6 @@ package com.glxp.api.service.inv; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; @@ -18,13 +16,11 @@ import com.glxp.api.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.dao.inout.IoCodeTempDao; -import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inv.*; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.*; @@ -44,8 +40,6 @@ import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; -import org.apache.regexp.RE; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java index 189f7f9a0..952d9d83f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inv.impl; -import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -19,18 +18,15 @@ import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceOrderRequest; import com.glxp.api.req.inv.FilterInvPlaceRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvPlaceOrderDetailResponse; import com.glxp.api.res.inv.InvPlaceOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inv.InvPlaceOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -39,7 +35,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index 0ddf724d2..69498231c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -14,7 +14,6 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.InvSpaceDao; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.*; -import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.inv.*; import com.glxp.api.req.inv.AddInvPlaceOrderRequest; @@ -30,7 +29,6 @@ import com.glxp.api.service.inv.InvPlaceService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java index fa0a61f47..f98d40499 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/StockCompareServiceImpl.java @@ -1,8 +1,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -24,7 +22,6 @@ import com.glxp.api.http.ErpInvClient; import com.glxp.api.req.inv.*; import com.glxp.api.req.inv.StockCompareDetailParam.selectInfo; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.BasicSkPrescribeResponse; import com.glxp.api.res.inv.ThrInvResultResponse; import com.glxp.api.service.CustomServiceImpl; import com.glxp.api.service.auth.InvWarehouseService; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index 710a98986..335430562 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -56,10 +56,8 @@ import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; -import org.apache.regexp.RE; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 0a3f2e00e..6e6feeed2 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -6,7 +6,6 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.thrsys.PostRelProductRequest; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.util.*; -import org.apache.regexp.RE; import org.springframework.beans.BeanUtils; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; @@ -38,8 +37,6 @@ import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.util.Collections;