From 8842f864bf0a6ad98f7dd2ff75e1f44bfda270dd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 18 Aug 2021 14:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B6=E6=AE=B5=E6=80=A7=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-admin/pom.xml | 4 + .../glxp/api/admin/config/RedisConfig.java | 116 ++++ .../basic/BasicThirdSysController.java | 92 ++- .../basic/BasicUnitMaintainController.java | 147 ++++- .../controller/basic/UdiInfoController.java | 62 +- .../basic/UdiRelevanceController.java | 52 +- .../info/SystemParamConfigController.java | 1 - .../info/ThirdSysApiController.java | 51 ++ .../controller/inout/OrderController.java | 16 +- .../inout/OrderDetailController.java | 46 +- .../inventory/InCodeLogController.java | 67 ++ .../inventory/InvErpOnhandController.java | 60 +- .../inventory/InvPrintController.java | 71 ++- .../controller/thrsys/ThrCorpsController.java | 50 +- .../thrsys/ThrInvProductsController.java | 62 +- .../controller/thrsys/ThrOrderController.java | 51 +- .../thrsys/ThrProductsController.java | 47 +- .../dao/basic/BasicThirdSysDetailDao.java | 20 + .../api/admin/dao/basic/UnitMaintainDao.java | 4 +- .../api/admin/dao/info/ThirdSysApiDao.java | 15 + .../api/admin/dao/inventory/InCodeLogDao.java | 21 + .../admin/dao/inventory/InvStockPrintDao.java | 2 + .../glxp/api/admin/dao/thrsys/ThrCorpDao.java | 1 + .../admin/dao/thrsys/ThrInvProductsDao.java | 2 + .../api/admin/dao/thrsys/ThrOrderDao.java | 2 + .../admin/dao/thrsys/ThrOrderDetailDao.java | 4 + .../api/admin/dao/thrsys/ThrProductsDao.java | 1 + .../basic/BasicThirdSysDetailEntity.java | 19 + .../entity/basic/BasicThirdSysEntity.java | 18 +- .../entity/basic/BasicUnitMaintainEntity.java | 6 + .../api/admin/entity/basic/UdiInfoEntity.java | 37 +- .../entity/basic/UdiRelevanceEntity.java | 4 +- .../admin/entity/info/ThirdSysApiEntity.java | 12 + .../entity/inventory/InCodeLogEntity.java | 17 + .../inventory/InsertStockPrintEntity.java | 223 +++++++ .../entity/inventory/StockPrintEntity.java | 4 + .../admin/entity/thrsys/ThrCorpEntity.java | 2 +- .../entity/thrsys/ThrInvProductsEntity.java | 4 +- .../entity/thrsys/ThrOrderDetailEntity.java | 4 +- .../entity/thrsys/ThrProductsEntity.java | 10 + .../api/admin/httpclient/ErpBasicClient.java | 6 +- .../api/admin/httpclient/ErpInvClient.java | 8 + .../basic/BasicUnitMaintainFilterRequest.java | 5 +- .../api/admin/req/basic/CombineRequest.java | 3 + .../FilterBasicThirdSysDetailRequest.java | 11 + .../req/basic/FilterBasicThirdSysRequest.java | 1 + .../req/basic/FilterStockprintRequest.java | 3 + .../admin/req/info/FilterSysApiRequest.java | 10 + .../admin/req/inventory/ErpOnhandRequest.java | 4 +- .../req/inventory/FilterInCodeLogRequest.java | 13 + .../req/inventory/PostStockPrintRequest.java | 13 + .../receipt/UnitMaintainFilterRequest.java | 13 - .../thrsys/FilterThrInvProductsRequest.java | 8 + .../req/thrsys/FilterThrOrderRequest.java | 6 +- .../req/thrsys/FilterThrProductsRequest.java | 5 + .../req/thrsys/PostThrInvProductsRequest.java | 3 +- .../admin/res/basic/BussinessTypResponse.java | 14 - .../admin/res/basic/ErpProductsResponse.java | 11 + .../api/admin/res/inout/ErpOrderResponse.java | 14 +- .../res/inventory/ErpInvProductResponse.java | 3 + .../basic/BasicThirdSysDetailService.java | 16 + .../service/basic/BussinessTypeService.java | 4 + .../service/basic/UdiRelevanceService.java | 2 + .../service/basic/UnitMaintainService.java | 6 +- .../impl/BasicThirdSysDetailServiceImpl.java | 44 ++ .../basic/impl/BussinessTypeServiceImpl.java | 18 +- .../basic/impl/UdiRelevanceServiceImpl.java | 14 +- .../basic/impl/UnitMaintainServiceImpl.java | 25 +- .../service/info/ThirdSysApiService.java | 14 + .../info/impl/ThirdSysApiServiceImpl.java | 36 ++ .../service/inventory/InCodeLogService.java | 17 + .../inventory/InvStockPrintService.java | 2 + .../inventory/impl/InCodeLogServiceImpl.java | 47 ++ .../impl/InvStockPrintServiceImpl.java | 5 + .../admin/service/thrsys/ThrCorpService.java | 1 + .../service/thrsys/ThrInvProductsService.java | 2 + .../service/thrsys/ThrOrderDetailService.java | 4 + .../admin/service/thrsys/ThrOrderService.java | 9 + .../service/thrsys/ThrProductsService.java | 1 + .../thrsys/impl/ThrCorpServiceImpl.java | 5 + .../impl/ThrInvProductsServiceImpl.java | 5 + .../impl/ThrOrderDetailServiceImpl.java | 10 + .../thrsys/impl/ThrOrderServiceImpl.java | 80 +++ .../thrsys/impl/ThrProductsServiceImpl.java | 5 + .../admin/thread/BasicUpdateErpDataTask.java | 18 +- .../thread/BasicUpdateproductService.java | 21 +- .../admin/thread/InvImportStockService.java | 73 ++- .../api/admin/thread/InvUpdateStock1Task.java | 16 +- .../api/admin/thread/InvUpdateStock2Task.java | 12 +- .../api/admin/thread/IoModifyErpTask.java | 119 ++-- .../api/admin/thread/IoTransInoutService.java | 72 ++- .../api/admin/thread/ThrCorpsDlService.java | 81 +++ .../admin/thread/ThrInvProductsDlService.java | 82 +++ .../api/admin/thread/ThrOrdersDlService.java | 95 +++ .../admin/thread/ThrProductsDlService.java | 76 +++ .../com/glxp/api/admin/util/Constant.java | 11 + .../com/glxp/api/admin/util/RedisUtil.java | 577 ++++++++++++++++++ .../main/resources/application-dev.properties | 22 + .../mybatis/mapper/basic/BasicThirdSysDao.xml | 25 +- .../mapper/basic/BasicThirdSysDetailDao.xml | 39 ++ .../mapper/basic/BasicUnitMaintainDao.xml | 18 +- .../mybatis/mapper/basic/UdiInfoDao.xml | 10 +- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 14 +- .../mybatis/mapper/basic/UnitMaintainDao.xml | 9 +- .../mybatis/mapper/info/ThirdSysApiDao.xml | 22 + .../mybatis/mapper/inventory/InCodeLogDao.xml | 56 ++ .../mapper/inventory/InvStockPrintDao.xml | 26 +- .../mybatis/mapper/thrsys/ThrCorpDao.xml | 4 +- .../mapper/thrsys/ThrInvProductsDao.xml | 20 +- .../mybatis/mapper/thrsys/ThrOrderDao.xml | 24 +- .../mapper/thrsys/ThrOrderDetailDao.xml | 6 + .../mybatis/mapper/thrsys/ThrProductsDao.xml | 30 +- 112 files changed, 3136 insertions(+), 395 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java delete mode 100644 api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/util/Constant.java create mode 100644 api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java create mode 100644 api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/info/ThirdSysApiDao.xml create mode 100644 api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 7bbe118d..dad71673 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -160,6 +160,10 @@ org.springframework.boot spring-boot-starter-websocket + + org.springframework.boot + spring-boot-starter-data-redis + diff --git a/api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java b/api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java new file mode 100644 index 00000000..ec987ae0 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/config/RedisConfig.java @@ -0,0 +1,116 @@ +package com.glxp.api.admin.config; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.cache.annotation.CachingConfigurerSupport; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.core.*; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; + +/** + * redis配置类 + * @program: springbootdemo + * @Date: 2019/2/22 15:20 + * @Author: zjjlive + * @Description: + */ +@Configuration +@EnableCaching //开启注解 +public class RedisConfig extends CachingConfigurerSupport { + + /** + * retemplate相关配置 + * @param factory + * @return + */ + @Bean + public RedisTemplate redisTemplate(RedisConnectionFactory factory) { + + RedisTemplate template = new RedisTemplate<>(); + // 配置连接工厂 + template.setConnectionFactory(factory); + + //使用Jackson2JsonRedisSerializer来序列化和反序列化redis的value值（默认使用JDK的序列化方式） + Jackson2JsonRedisSerializer jacksonSeial = new Jackson2JsonRedisSerializer(Object.class); + + ObjectMapper om = new ObjectMapper(); + // 指定要序列化的域，field,get和set,以及修饰符范围，ANY是都有包括private和public + om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY); + // 指定序列化输入的类型，类必须是非final修饰的，final修饰的类，比如String,Integer等会跑出异常 + om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL); + jacksonSeial.setObjectMapper(om); + + // 值采用json序列化 + template.setValueSerializer(jacksonSeial); + //使用StringRedisSerializer来序列化和反序列化redis的key值 + template.setKeySerializer(new StringRedisSerializer()); + + // 设置hash key 和value序列化模式 + template.setHashKeySerializer(new StringRedisSerializer()); + template.setHashValueSerializer(jacksonSeial); + template.afterPropertiesSet(); + + return template; + } + + /** + * 对hash类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public HashOperations hashOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForHash(); + } + + /** + * 对redis字符串类型数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ValueOperations valueOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForValue(); + } + + /** + * 对链表类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ListOperations listOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForList(); + } + + /** + * 对无序集合类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public SetOperations setOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForSet(); + } + + /** + * 对有序集合类型的数据操作 + * + * @param redisTemplate + * @return + */ + @Bean + public ZSetOperations zSetOperations(RedisTemplate redisTemplate) { + return redisTemplate.opsForZSet(); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java index 4848b251..08370083 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicThirdSysController.java @@ -1,10 +1,16 @@ package com.glxp.api.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.basic.UnitMaintainService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -24,11 +30,16 @@ public class BasicThirdSysController { @Resource private BasicThirdSysService basicThirdSysService; - + @Resource + private BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + UdiRelevanceService udiRelevanceService; + @Resource + UnitMaintainService unitMaintainService; @GetMapping("/udiwms/basic/thirdsys/filter") - public BaseResponse filterBasicUnitMaintain(FilterBasicThirdSysRequest filterBasicThirdSysRequest, - BindingResult bindingResult) { + public BaseResponse filter(FilterBasicThirdSysRequest filterBasicThirdSysRequest, + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -43,6 +54,17 @@ public class BasicThirdSysController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/udiwms/basic/thirdsys/selectIp") + public BaseResponse selectIp(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterBasicThirdSysDetailRequest.getThirdSysFk()); + return ResultVOUtils.success(basicThirdSysEntity); + } + @PostMapping("/udiwms/basic/thirdsys/update") public BaseResponse save(@RequestBody @Valid BasicThirdSysEntity basicThirdSysEntity, BindingResult bindingResult) { @@ -51,6 +73,27 @@ public class BasicThirdSysController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } if (basicThirdSysEntity != null) { + BasicThirdSysEntity temp = basicThirdSysService.selectByThirdId(basicThirdSysEntity.getThirdId()); + if (temp.getMainSys() != basicThirdSysEntity.getMainSys()) { + if (udiRelevanceService.isExit() || unitMaintainService.isExit()) { + return ResultVOUtils.error(999, "设置主系统失败"); + } + if ((!temp.getEnabled()) && basicThirdSysEntity.getMainSys()) { + if (!basicThirdSysEntity.getEnabled()) { + return ResultVOUtils.error(999, "请先启用系统！"); + } + } + if (!basicThirdSysEntity.getEnabled() && basicThirdSysEntity.getMainSys()) { + return ResultVOUtils.error(999, "请先启用系统！"); + } + } + if (basicThirdSysEntity.getMainSys()) { + List basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(new FilterBasicThirdSysRequest()); + for (BasicThirdSysEntity basicThirdSysEntity1 : basicThirdSysEntities) { + basicThirdSysEntity1.setMainSys(false); + basicThirdSysService.updateBasicThiSys(basicThirdSysEntity1); + } + } basicThirdSysService.updateBasicThiSys(basicThirdSysEntity); } else { ResultVOUtils.error(999, "参数错误"); @@ -59,4 +102,47 @@ public class BasicThirdSysController { } + @GetMapping("/udiwms/basic/thirdsys/filterDetail") + public BaseResponse filterDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List basicThirdSysEntities; + basicThirdSysEntities = basicThirdSysDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicThirdSysEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicThirdSysEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/basic/thirdsys/filterDetailByKey") + public BaseResponse filterDetailByKey(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService. + selectByKey(filterBasicThirdSysDetailRequest.getKey(), filterBasicThirdSysDetailRequest.getThirdSysFk()); + return ResultVOUtils.success(basicThirdSysDetailEntity); + } + + @PostMapping("/udiwms/basic/thirdsys/saveDetail") + public BaseResponse saveDetail(@RequestBody @Valid BasicThirdSysDetailEntity basicThirdSysDetailEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (basicThirdSysDetailEntity != null) { + basicThirdSysDetailService.updateBasicThirdSysDetail(basicThirdSysDetailEntity); + } else { + ResultVOUtils.error(999, "参数错误"); + } + return ResultVOUtils.success("更新成功"); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index a3c7ab83..b042b0cb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -1,23 +1,30 @@ package com.glxp.api.admin.controller.basic; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.req.basic.CombineSingleUnitRequest; -import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; -import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.basic.CombineSingleUnitRequest; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.receipt.CombineUnitRequest; -import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; import com.glxp.api.admin.res.basic.BasicUnitMaintainResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.thrsys.ThrCorpService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -32,6 +39,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -46,10 +54,13 @@ public class BasicUnitMaintainController { @Resource private BasicUnitMaintainService basicUnitMaintainService; @Resource - private BasicThirdSysService basicThirdSysService; + BasicThirdSysDetailService basicThirdSysDetailService; @Autowired private SystemParamConfigService systemParamConfigService; - + @Resource + private BasicThirdSysService basicThirdSysService; + @Resource + private ThrCorpService thrCorpService; @GetMapping("/udiwms/basic/unit/maintain/filter") public BaseResponse filterBasicUnitMaintain(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, @@ -141,17 +152,22 @@ public class BasicUnitMaintainController { if (combineRequest.getThirdSys() != null) { if ("thirdId".equals(combineRequest.getThirdSys())) { basicUnitMaintainEntity.setThirdId(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setThirdName(erpUnitsResponse.getName()); } else if ("thirdId1".equals(combineRequest.getThirdSys())) { basicUnitMaintainEntity.setThirdId1(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setThirdName1(erpUnitsResponse.getName()); } else if ("thirdId2".equals(combineRequest.getThirdSys())) { basicUnitMaintainEntity.setThirdId2(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setThirdName2(erpUnitsResponse.getName()); } else if ("thirdId3".equals(combineRequest.getThirdSys())) { basicUnitMaintainEntity.setThirdId3(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setThirdName3(erpUnitsResponse.getName()); } else if ("thirdId4".equals(combineRequest.getThirdSys())) { basicUnitMaintainEntity.setThirdId4(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setThirdName4(erpUnitsResponse.getName()); } } -// basicUnitMaintainEntity.setErpId(erpUnitsResponse.getId()); + basicUnitMaintainEntity.setErpId(erpUnitsResponse.getId()); basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); @@ -211,17 +227,120 @@ public class BasicUnitMaintainController { //查询ERP往来单位 @GetMapping("/udiwms/unitMaintain/filterErp") - public BaseResponse filterErp(UnitMaintainFilterRequest unitMaintainFilterRequest, + public BaseResponse filterErp(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(unitMaintainFilterRequest.getThirdSys()); - if (basicThirdSysEntity == null || basicThirdSysEntity.getCorpUrl() == null) + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", unitMaintainFilterRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "往来单位接口地址未定义"); - BaseResponse> udiDlDeviceResponse = - new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysEntity.getCorpUrl()); - return udiDlDeviceResponse; + + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + BaseResponse> udiDlDeviceResponse = + new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue()); + return udiDlDeviceResponse; + } else { + FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest(); + BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest); + filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys()); + List thrCorpEntities + = thrCorpService.filterThrCorps(filterThrCorpRequest); + List thrCorpEntityList = thrCorpEntities.stream().map(item -> + { + ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setId(item.getUnitId()); + return thrCorpEntity; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + } + + //获取产品信息详情（多平台） + @GetMapping("/udiwms/unitMaintain/thirdSys/detail") + public BaseResponse getThirdSysDetail(BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectById(basicUnitMaintainFilterRequest.getId() + ""); + + FilterBasicThirdSysRequest filterBasicThirdSysRequest = new FilterBasicThirdSysRequest(); + filterBasicThirdSysRequest.setEnabled(true); + List basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest); + List basicProductThirdSysResponses = new ArrayList<>(); + if (basicUnitMaintainEntity.getThirdId() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (basicUnitMaintainEntity.getThirdId1() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId1", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (basicUnitMaintainEntity.getThirdId2() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId2", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (basicUnitMaintainEntity.getThirdId3() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId3", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + if (basicUnitMaintainEntity.getThirdId4() != null) { + BasicProductThirdSysResponse basicProductThirdSysResponse = new BasicProductThirdSysResponse(); + BasicThirdSysEntity basicThirdSysEntity = filterThirdSys("thirdId4", basicThirdSysEntities); + if (basicThirdSysEntity != null) + basicProductThirdSysResponse.setSysName(basicThirdSysEntity.getThirdName()); + basicProductThirdSysResponse.setThirdId(basicUnitMaintainEntity.getThirdId()); + basicProductThirdSysResponse.setThirdName(basicUnitMaintainEntity.getThirdName()); + basicProductThirdSysResponses.add(basicProductThirdSysResponse); + } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicProductThirdSysResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicProductThirdSysResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + public BasicThirdSysEntity filterThirdSys(String thirdId, List basicThirdSysEntities) { + if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { + for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) { + if (thirdId.equals(basicThirdSysEntity.getThirdId())) { + return basicThirdSysEntity; + } + } + } + return null; } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index ed2c4350..f6261e8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -1,26 +1,29 @@ package com.glxp.api.admin.controller.basic; import com.alibaba.fastjson.JSONObject; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; -import com.glxp.api.admin.entity.basic.UdiInfoEntity; -import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.info.SystemParamConfigRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; @@ -40,10 +43,10 @@ public class UdiInfoController { UdiRelevanceService udiRelevanceService; @Resource UdiInfoService udiInfoService; - @Resource - private BasicThirdSysService basicThirdSysService; - + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + private ThrProductsService thrProductsService; @Value("${UDI_SERVER_URL}") private String udiUrl; @@ -96,24 +99,41 @@ public class UdiInfoController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(filterErpGoodsRequest.getThirdSys()); - if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", filterErpGoodsRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); - BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysEntity.getPiQueryUrl()); - if (udiDlDeviceResponse.getCode() == 20000) { - List invmandocResponses = udiDlDeviceResponse.getData().getList(); - for (ErpProductsResponse invmandocResponse : invmandocResponses) { - UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); - invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys()); - if (udiRelevanceEntity != null) { - invmandocResponse.setChecked(true); - } else { - invmandocResponse.setChecked(false); + if (basicThirdSysDetailEntity.getEnabled() &&!basicThirdSysDetailEntity.getItrCache()) { + ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); + BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); + if (udiDlDeviceResponse.getCode() == 20000) { + List invmandocResponses = udiDlDeviceResponse.getData().getList(); + if(invmandocResponses != null){ + for (ErpProductsResponse invmandocResponse : invmandocResponses) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode()); + invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys()); + if (udiRelevanceEntity != null) { + invmandocResponse.setChecked(true); + } else { + invmandocResponse.setChecked(false); + } + } } + } + return udiDlDeviceResponse; + } else { + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest); + List thrCorpEntities + = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thrCorpEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thrCorpEntities); + return ResultVOUtils.success(pageSimpleResponse); } - return udiDlDeviceResponse; + } } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index adfbb0b9..c96f99f1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; @@ -16,6 +17,7 @@ import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.BasicProductThirdSysResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inout.WarehouseResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; @@ -58,6 +60,8 @@ public class UdiRelevanceController { private SystemParamConfigService systemParamConfigService; @Resource private BasicThirdSysService basicThirdSysService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; //客户端器械信息下载 @GetMapping("/udi/udirel/download") @@ -109,17 +113,18 @@ public class UdiRelevanceController { @GetMapping("/udi/udirel/updateErp") public BaseResponse updateErp() { SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); - BasicThirdSysEntity basicThirdSysEntity; + String thirdSysId = null; if (thirdSys != null && thirdSys.getParamValue() != null) { - basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys.getParamValue()); + thirdSysId = thirdSys.getParamValue(); } else - basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); - - if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) + thirdSysId = "thirdId"; + BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSysId); + BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId); + if (piDetailEntity == null || piDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl() == null) + if (invPiDetailEntity == null || invPiDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); - updateproductService.updateProduct(basicThirdSysEntity.getOrderQueryUrl(), basicThirdSysEntity.getInvPiUrl()); + updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue()); return ResultVOUtils.success("后台已开启下载更新，请稍后刷新查看！"); } @@ -219,8 +224,7 @@ public class UdiRelevanceController { UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setId(combineRequest.getRelId()); - udiRelevanceEntity.setThirdId(combineRequest.getThirdId()); - udiRelevanceEntity.setThirdName(combineRequest.getErpName()); + udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity); udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); return ResultVOUtils.success("更新成功"); @@ -229,11 +233,11 @@ public class UdiRelevanceController { //单独选入ERP产品 @PostMapping("/udi/udirel/addErp") public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(combineRequest.getThirdSys()); - if (basicThirdSysEntity == null || basicThirdSysEntity.getPiQueryUrl() == null) + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys()); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - String url = basicThirdSysEntity.getPiQueryUrl(); - updateproductService.addProduct(combineRequest.getThirdId(), combineRequest.getErpName(), url); + String url = basicThirdSysDetailEntity.getValue(); + updateproductService.addProduct(combineRequest, url); return ResultVOUtils.success("添加成功"); } @@ -298,29 +302,30 @@ public class UdiRelevanceController { } else if ("thirdId3".equals(postThirdSysPiRequest.getThirdSys())) { udiRelevanceEntity.setThirdId3(postSmpUdiInfoRequest.getErpId()); udiRelevanceEntity.setThirdName3(postSmpUdiInfoRequest.getErpName()); - }else if ("thirdId4".equals(postThirdSysPiRequest.getThirdSys())) { + } else if ("thirdId4".equals(postThirdSysPiRequest.getThirdSys())) { udiRelevanceEntity.setThirdId4(postSmpUdiInfoRequest.getErpId()); udiRelevanceEntity.setThirdName4(postSmpUdiInfoRequest.getErpName()); - }else { + } else { udiRelevanceEntity.setThirdId(postSmpUdiInfoRequest.getErpId()); udiRelevanceEntity.setThirdName(postSmpUdiInfoRequest.getErpName()); } - if(postSmpUdiInfoRequest.getUuid() == null){ + if (postSmpUdiInfoRequest.getUuid() == null) { udiRelevanceEntity.setUuid(CustomUtil.getUUId()); - }else { + } else { udiRelevanceEntity.setUuid(postSmpUdiInfoRequest.getUuid()); } - udiRelevanceEntity.setYbbm(postSmpUdiInfoRequest.getYbbm()); - udiRelevanceEntity.setSptm(postSmpUdiInfoRequest.getSptm()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - BeanUtils.copyProperties(postSmpUdiInfoRequest,udiInfoEntity); + udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm()); + udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm()); + BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity); udiInfoEntity.setUuid(udiRelevanceEntity.getUuid()); udiInfoService.insertUdiInfo(udiInfoEntity); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } } - WebSocketServer.sendInfo("产品信息上传解析完成，请刷新查看！","sid"); + WebSocketServer.sendInfo("产品信息上传解析完成，请刷新查看！", "sid"); return ResultVOUtils.success("产品信息上传成功！"); } @@ -408,6 +413,11 @@ public class UdiRelevanceController { udiRelevanceEntity.setThirdId4(combineRequest.getThirdId()); udiRelevanceEntity.setThirdName4(combineRequest.getErpName()); } + if (combineRequest.getErpProductsResponse() != null) { + udiRelevanceEntity.setMeasname(combineRequest.getErpProductsResponse().getMeasname()); + udiRelevanceEntity.setManufactory(combineRequest.getErpProductsResponse().getManufactory()); + } + return udiRelevanceEntity; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java index 34d487ac..4c5e3fa5 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemParamConfigController.java @@ -90,7 +90,6 @@ public class SystemParamConfigController { @AuthRuleAnnotation("system/param/config/update") @PostMapping("/system/param/config/update") public BaseResponse update(@RequestBody SystemParamConfigSaveRequest systemParamConfigSaveRequest) { -// systemParamConfigSaveRequest.setId(1); systemParamConfigService.updateById(systemParamConfigSaveRequest); if (systemParamConfigSaveRequest.getParentId() == 0) { SystemParamConfigSaveRequest systemParamConfigSaveRequest1 = new SystemParamConfigSaveRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java new file mode 100644 index 00000000..431b28cb --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/ThirdSysApiController.java @@ -0,0 +1,51 @@ +package com.glxp.api.admin.controller.info; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.admin.entity.info.ThirdSysApiEntity; +import com.glxp.api.admin.entity.inout.OrderEntity; +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.req.info.FilterSysApiRequest; +import com.glxp.api.admin.req.inout.OrderFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.admin.service.info.ThirdSysApiService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class ThirdSysApiController { + + + @Resource + private ThirdSysApiService thirdSysApiService; + + @GetMapping("/sys/api/findAll") + public BaseResponse findAll(FilterSysApiRequest filterSysApiRequest) { + List thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(thirdSysApiEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(thirdSysApiEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/sys/api/modifyApi") + public BaseResponse modifyApi(@RequestBody ThirdSysApiEntity thirdSysApiEntity) { + + boolean b = thirdSysApiService.modifySysApi(thirdSysApiEntity); + if (b) + return ResultVOUtils.success("修改成功"); + else + return ResultVOUtils.error(500, "修改失败"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index 1196bd3d..e4b5a72d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.api.admin.controller.inout.utils.InoutUtils; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.entity.inout.OrderEntity; @@ -20,6 +21,7 @@ import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -55,6 +57,8 @@ public class OrderController { private SystemParamConfigService systemParamConfigService; @Resource private BussinessTypeService bussinessTypeService; + @Resource + private ThrOrderService thrOrderService; @GetMapping("udiwms/inout/order/status") @@ -195,11 +199,17 @@ public class OrderController { mainOrderEntity.setErpFk(docidStr); orderService.updateOrder(mainOrderEntity); if (docidStr.length() > 0) { - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(mainOrderEntity.getAction()); - if (bussinessTypResponse.getOrderQueryUrl() == null) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(mainOrderEntity.getAction(), "orderQueryUrl"); + if (basicThirdSysDetailEntity == null) { return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义"); } - List erpOrderEntities = new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrder(docids, mainOrderEntity.getAction()); + List erpOrderEntities; + if (basicThirdSysDetailEntity.getEnabled()) { + erpOrderEntities = new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrder(docids, mainOrderEntity.getAction()); + } else { + erpOrderEntities = thrOrderService.filterAllOrders(docids, basicThirdSysDetailEntity.getThirdSysFk()); + } + if (erpOrderEntities != null && erpOrderEntities.size() > 0) { List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder); myErpOrderService.insertErpOrders(returnOrders); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index 6e6d9948..fd002881 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -3,11 +3,15 @@ package com.glxp.api.admin.controller.inout; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.inout.FilterErpOrderRequest; import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.res.inout.PurchaseinResponse; import com.glxp.api.admin.entity.inout.OrderEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; @@ -20,10 +24,12 @@ import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; import com.glxp.api.admin.thread.IoTransInoutService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -57,6 +63,8 @@ public class OrderDetailController { private SystemParamConfigService systemParamConfigService; @Resource private BussinessTypeService bussinessTypeService; + @Resource + private ThrOrderService thrOrderService; @GetMapping("/udiwms/erpOrder/filter") public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, @@ -65,12 +73,31 @@ public class OrderDetailController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(filterErpOrderRequest.getBillAction()); - if (bussinessTypResponse==null || bussinessTypResponse.getOrderQueryUrl() == null) { - return ResultVOUtils.error(500, "ERP出入库单据接口未定义"); + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); + if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) { + if (basicThirdSysDetailEntity.getValue() == null) { + return ResultVOUtils.error(500, "业务单据查询接口未定义"); + } + return new ErpOrderClient(basicThirdSysDetailEntity.getValue()).getErpOrderResponse(filterErpOrderRequest); + } else { + //todo 订单查询，需加日期 + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + BeanUtils.copyProperties(filterErpOrderRequest, filterThrOrderRequest); + if(filterThrOrderRequest.getBillAction()!=null){ + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(filterErpOrderRequest.getBillAction()); + filterThrOrderRequest.setBillAction(bussinessTypeEntity.getName()); + } + List erpOrderResponses = thrOrderService.filterAllDetail(filterThrOrderRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(erpOrderResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpOrderResponses); + return ResultVOUtils.success(pageSimpleResponse); + } - return new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrderResponse(filterErpOrderRequest); -// + } @@ -155,10 +182,11 @@ public class OrderDetailController { } } } - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); - if (bussinessTypResponse.getOrderModifyUrl() == null) - return ResultVOUtils.error(500, "ERP出入库单据修改接口未定义"); - String url = bussinessTypResponse.getOrderModifyUrl(); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderModifyUrl"); + if (basicThirdSysDetailEntity == null) { + return ResultVOUtils.error(500, "ERP出入库单据查询接口地址未定义"); + } + String url = basicThirdSysDetailEntity.getValue(); Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); if (baseResponse != null && baseResponse.getCode() == 20000) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java new file mode 100644 index 00000000..8cdb1264 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InCodeLogController.java @@ -0,0 +1,67 @@ +package com.glxp.api.admin.controller.inventory; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.inventory.InCodeLogService; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class InCodeLogController { + @Resource + InCodeLogService inCodeLogService; + @Resource + InvStockPrintService invStockPrintService; + + + @GetMapping("/udiwms/inv/incode/filter") + public BaseResponse filter(FilterInCodeLogRequest filterInCodeLogRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List inCodeLogEntities + = inCodeLogService.filterInCodeLog(filterInCodeLogRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(inCodeLogEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(inCodeLogEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + + + @PostMapping("/udiwms/inv/incode/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + FilterInCodeLogRequest filterInCodeLogRequest = new FilterInCodeLogRequest(); + filterInCodeLogRequest.setId(Integer.parseInt(id)); + List inCodeLogEntities = inCodeLogService.filterInCodeLog(filterInCodeLogRequest); + if(inCodeLogEntities!=null && inCodeLogEntities.size()>0){ + InCodeLogEntity inCodeLogEntity = inCodeLogEntities.get(0); + inCodeLogService.deleteById(inCodeLogEntity.getId()+""); + invStockPrintService.deleteByGenKey(inCodeLogEntity.getGenKey()); + } + + return ResultVOUtils.success("删除成功"); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java index 256f89a8..98a19e43 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvErpOnhandController.java @@ -2,27 +2,35 @@ package com.glxp.api.admin.controller.inventory; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.httpclient.ErpInvClient; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.basic.UOnhandQueryRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UOnhandQueryResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import com.glxp.api.admin.util.FilterUdiUtils; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; @@ -32,6 +40,7 @@ import javax.annotation.Resource; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @RestController public class InvErpOnhandController { @@ -39,10 +48,9 @@ public class InvErpOnhandController { @Resource UdiRelevanceService udiRelevanceService; @Resource - private SystemParamConfigService systemParamConfigService; + BasicThirdSysDetailService basicThirdSysDetailService; @Resource - private BasicThirdSysService basicThirdSysService; - + private ThrInvProductsService thrInvProductsService; @GetMapping("/udiwms/inv/getOnHand") public BaseResponse getOnhand(ErpOnhandRequest onhandQueryRequest, @@ -69,23 +77,37 @@ public class InvErpOnhandController { } } -// else if (onhandQueryRequest.getNameCode() != null) { -// UdiRelevanceResponse udiRelevanceResponse = findByNamecode(onhandQueryRequest.getNameCode()); -// onhandQueryRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); -// } - BasicThirdSysEntity basicThirdSysEntity = null; - if(onhandQueryRequest.getThirdSys() == null){ -// basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); - }else { - basicThirdSysEntity = basicThirdSysService.selectByThirdId(onhandQueryRequest.getThirdSys()); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", onhandQueryRequest.getThirdSys()); + if (basicThirdSysDetailEntity.getEnabled()) { + String onHandUrl; + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) + return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); + else + onHandUrl = basicThirdSysDetailEntity.getValue(); + BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl); + return responseBaseResponse; + } else { + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + BeanUtils.copyProperties(onhandQueryRequest, filterThrInvProductsRequest); + filterThrInvProductsRequest.setThirdSysFk(onhandQueryRequest.getThirdSys()); + List thrInvProductsEntities + = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + List erpInvProductResponseList = thrInvProductsEntities.stream().map(item -> + { + ErpInvProductResponse erpInvProductResponse = new ErpInvProductResponse(); + BeanUtils.copyProperties(item, erpInvProductResponse); + erpInvProductResponse.setCode(item.getInventoryCode()); + erpInvProductResponse.setName(item.getInventoryName()); + return erpInvProductResponse; + }).collect(Collectors.toList()); + PageInfo pageInfo; + pageInfo = new PageInfo<>(erpInvProductResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpInvProductResponseList); + return ResultVOUtils.success(pageSimpleResponse); } - String onHandUrl; - if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl()==null) - return ResultVOUtils.error(500, "ERP现存量接口地址未定义"); - else - onHandUrl = basicThirdSysEntity.getInvPiUrl(); - BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl); - return responseBaseResponse; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java index abf84d0f..b5f58a04 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -1,6 +1,7 @@ package com.glxp.api.admin.controller.inventory; import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpInvClient; @@ -9,9 +10,11 @@ import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; import com.glxp.api.admin.req.basic.UpdatePrintStatusRequest; import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inventory.PostStockPrintRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.inventory.InvStockPrintService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -34,7 +37,8 @@ public class InvPrintController { @Resource private SystemParamConfigService systemParamConfigService; @Resource - private BasicThirdSysService basicThirdSysService; + BasicThirdSysDetailService basicThirdSysDetailService; + @PostMapping("/udiwarehouse/stockPrint/filter") public BaseResponse filterAll(@RequestBody FilterStockprintRequest stockprintRequest, @@ -78,18 +82,17 @@ public class InvPrintController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_phone_get_invpi"); String onHandUrl; String thirdSys; - if (systemParamConfigEntity == null) - return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); - else thirdSys = systemParamConfigEntity.getParamValue(); - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys); - if (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl() == null) { + if (stockprintRequest.getThirdSysFk() == null) + thirdSys = "thirdId"; + else + thirdSys = stockprintRequest.getThirdSysFk(); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSys); + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义"); } else { - onHandUrl = basicThirdSysEntity.getInvPiUrl(); + onHandUrl = basicThirdSysDetailEntity.getValue(); } List stockPrintEntities = stockPrintService.filterStockPrint(stockprintRequest); @@ -116,12 +119,6 @@ public class InvPrintController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("/udiwarehouse/stockPrint/import") - public BaseResponse importStock() { - importStockService.updateStock(); - return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); - } - @PostMapping("/udiwarehouse/stockPrint/update") public BaseResponse updatePrintStatus(@RequestBody UpdatePrintStatusRequest updatePrintStatusRequest, BindingResult bindingResult) { @@ -179,6 +176,15 @@ public class InvPrintController { return ResultVOUtils.success("后台已自动更新，请稍后刷新查看！"); } + + //产品信息一键生成内部码 + @GetMapping("/udiwarehouse/stockPrint/import") + public BaseResponse importStock(FilterStockprintRequest filterStockprintRequest) { + importStockService.updateStock(filterStockprintRequest.getThirdSysFk()); + return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); + } + + // 根据存货编码生成内部码 @GetMapping("/udiwarehouse/stockPrint/importBycode") public BaseResponse importBycode(FilterStockprintRequest stockprintRequest) { if (stockprintRequest.getThirdId() == null || stockprintRequest.getThirdId().equals("")) { @@ -195,5 +201,40 @@ public class InvPrintController { return ResultVOUtils.success("后台已开始自动更新，请稍后刷新查看"); } + @PostMapping("udiwms/stockprint/post") + public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (postStockPrintRequest != null) { + List stockPrintEntities = postStockPrintRequest.getDatas(); + if (stockPrintEntities != null && stockPrintEntities.size() > 0) { + for (StockPrintEntity stockPrintEntity : stockPrintEntities) { + FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); + filterStockprintRequest.setThirdSysFk(filterStockprintRequest.getThirdSysFk()); + filterStockprintRequest.setNameCode(stockPrintEntity.getNameCode()); + filterStockprintRequest.setWarehouseCode(stockPrintEntity.getWarehouseCode()); + filterStockprintRequest.setBatchNo(stockPrintEntity.getBatchNo()); + filterStockprintRequest.setThirdId(stockPrintEntity.getThirdId()); + filterStockprintRequest.setSpaceCode(stockPrintEntity.getSpaceCode()); + List stockPrintEntityList = stockPrintService.filterStockPrint(filterStockprintRequest); + if(stockPrintEntityList!=null && stockPrintEntityList.size()>0 ){ + StockPrintEntity temp = stockPrintEntities.get(0); + stockPrintEntity.setId(temp.getId()); + stockPrintService.updateStockPrint(stockPrintEntity); + StockPrintEntity stockPrintEntity1 = stockPrintService.findByNameCode(temp.getId()+""); + stockPrintEntity = stockPrintEntity1; + } + String udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + + "#" + stockPrintEntity.getBatchNo() + "#" + stockPrintEntity.getSerialNo() + "#" + stockPrintEntity.getWarehouseCode() + "#" + stockPrintEntity.getSpaceCode(); + stockPrintEntity.setUdiCode(udiCode); + stockPrintService.insertStockPrint(stockPrintEntity); + } + } + } + return ResultVOUtils.success("提交成功！"); + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java index 29ef8a8f..f5d03f0c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java @@ -4,20 +4,23 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrCorpRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.admin.thread.ThrCorpsDlService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -25,9 +28,12 @@ import java.util.stream.Collectors; @RestController public class ThrCorpsController { - + @Resource + RedisUtil redisUtil; @Resource private ThrCorpService thrCorpService; + @Resource + private ThrCorpsDlService thrCorpsDlService; @GetMapping("/udiwms/thrsys/getCorps") public BaseResponse getCorps(FilterThrCorpRequest filterThrCorpRequest, @@ -47,7 +53,7 @@ public class ThrCorpsController { } @PostMapping("/udiwms/thrsys/postCorps") - public BaseResponse postCorps(PostThrCorpRequest postThrCorpRequest, + public BaseResponse postCorps(@RequestBody PostThrCorpRequest postThrCorpRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -62,6 +68,7 @@ public class ThrCorpsController { item -> { ThrCorpEntity thrCorpEntity = new ThrCorpEntity(); BeanUtils.copyProperties(item, thrCorpEntity); + thrCorpEntity.setUnitId(item.getId()); thrCorpEntity.setThirdSysFk(postThrCorpRequest.getThirdSys()); return thrCorpEntity; } @@ -73,4 +80,37 @@ public class ThrCorpsController { return ResultVOUtils.error(500, "上传数据为空"); } + + + @PostMapping("/udiwms/thrsys/delCorps") + public BaseResponse delCorps(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrCorpService.deleteById(id); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/corp/delAll") + public BaseResponse delAll() { + thrCorpService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/corp/downloadAll") + public BaseResponse downloadAll(FilterThrProductsRequest filterThrProductsRequest) { + String data = (String) redisUtil.get(Constant.dlThrProducts); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新产品信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrCorps, "true", 30); + if (filterThrProductsRequest.getThirdSysFk() == null) { + return ResultVOUtils.error(500, "未选择第三方系统！"); + } + thrCorpsDlService.importCorps(filterThrProductsRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java index 051a8b77..995153ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrInvProductsController.java @@ -2,21 +2,25 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.req.thrsys.PostThrCorpRequest; import com.glxp.api.admin.req.thrsys.PostThrInvProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +import com.glxp.api.admin.thread.ThrInvProductsDlService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -25,13 +29,16 @@ import java.util.stream.Collectors; @RestController public class ThrInvProductsController { - + @Resource + RedisUtil redisUtil; @Resource private ThrInvProductsService thrInvProductsService; + @Resource + private ThrInvProductsDlService thrInvProductsDlService; @GetMapping("/udiwms/thrsys/getInvProducts") - public BaseResponse getCorps(FilterThrInvProductsRequest filterThrInvProductsRequest, - BindingResult bindingResult) { + public BaseResponse getInvProducts(FilterThrInvProductsRequest filterThrInvProductsRequest, + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -47,30 +54,65 @@ public class ThrInvProductsController { } @PostMapping("/udiwms/thrsys/postInvProducts") - public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest, - BindingResult bindingResult) { + public BaseResponse postInvProducts(@RequestBody PostThrInvProductsRequest postThrInvProductsRequest, + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } List thrInvProductsEntities; - List erpOnHandResponses = postThrInvProductsRequest.getDatas(); + List erpOnHandResponses = postThrInvProductsRequest.getDatas(); if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { thrInvProductsEntities = erpOnHandResponses.stream().map( item -> { ThrInvProductsEntity thrInvProductsEntity = new ThrInvProductsEntity(); BeanUtils.copyProperties(item, thrInvProductsEntity); + thrInvProductsEntity.setInventoryCode(item.getCode()); + thrInvProductsEntity.setInventoryName(item.getName()); thrInvProductsEntity.setThirdSysFk(postThrInvProductsRequest.getThirdSys()); return thrInvProductsEntity; } ).collect(Collectors.toList()); thrInvProductsService.insertThrInvProducts(thrInvProductsEntities); return ResultVOUtils.success("往来单位上传成功！"); - } return ResultVOUtils.error(500, "上传数据为空"); } + @PostMapping("/udiwms/thrsys/delInvProducts") + public BaseResponse delInvProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + boolean b = thrInvProductsService.deleteById(id); + if (b) + return ResultVOUtils.success("删除成功"); + else return ResultVOUtils.error(500, "无法删除！"); + } + + + @RequestMapping("/udiwms/thrsys/invProducts/delAll") + public BaseResponse delAll() { + thrInvProductsService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/invProducts/downloadAll") + public BaseResponse downloadAll(FilterThrInvProductsRequest filterThrInvProductsRequest) { + String data = (String) redisUtil.get(Constant.dlThrProducts); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新库存产品信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrProducts, "true", 30); + if (filterThrInvProductsRequest.getThirdSysFk() == null) { + return ResultVOUtils.error(500, "未选择第三方系统！"); + } + thrInvProductsDlService.importProducrs(filterThrInvProductsRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java index 99c3bc02..001d778b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderController.java @@ -3,21 +3,24 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.req.thrsys.PostThrOrderRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.admin.thread.ThrOrdersDlService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -29,6 +32,10 @@ public class ThrOrderController { private ThrOrderService thrOrderService; @Resource private ThrOrderDetailService thrOrderDetailService; + @Resource + private ThrOrdersDlService thrOrdersDlService; + @Resource + RedisUtil redisUtil; @GetMapping("/udiwms/thrsys/getOrders") public BaseResponse getOrders(FilterThrOrderRequest filterThrOrderRequest, @@ -67,7 +74,7 @@ public class ThrOrderController { @PostMapping("/udiwms/thrsys/postOrderDetail") - public BaseResponse postOrderDetail(PostThrOrderRequest postThrOrderRequest, + public BaseResponse postOrderDetail(@RequestBody PostThrOrderRequest postThrOrderRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -108,4 +115,40 @@ public class ThrOrderController { return ResultVOUtils.error(500, "上传数据为空"); } + @PostMapping("/udiwms/thrsys/delOrder") + public BaseResponse delOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + ThrOrderEntity thrOrderEntity = thrOrderService.findById(id); + boolean b = thrOrderService.deleteById(id); + thrOrderDetailService.deleteByOrderIdFk(thrOrderEntity.getId() + ""); + if (b) + return ResultVOUtils.success("删除成功"); + else return ResultVOUtils.error(500, "无法删除！"); + } + + @RequestMapping("/udiwms/thrsys/order/delAll") + public BaseResponse delAll() { + thrOrderService.deleteAll(); + thrOrderDetailService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/orders/downloadAll") + public BaseResponse downloadAll(FilterThrOrderRequest filterThrProductsRequest) { + String data = (String) redisUtil.get(Constant.dlThrOrders); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新业务单据信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrOrders, "true", 30); + if (filterThrProductsRequest.getBillAction() == null) { + return ResultVOUtils.error(500, "未选择业务类型！"); + } + thrOrdersDlService.importOrders(filterThrProductsRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java index 0fd166d0..f9be0515 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsController.java @@ -2,19 +2,21 @@ package com.glxp.api.admin.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.req.thrsys.PostThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.thread.ThrProductsDlService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; @@ -22,9 +24,12 @@ import java.util.stream.Collectors; @RestController public class ThrProductsController { - + @Resource + RedisUtil redisUtil; @Resource private ThrProductsService thrProductsService; + @Resource + private ThrProductsDlService thrProductsDlService; @GetMapping("/udiwms/thrsys/getThrProducts") public BaseResponse getThrProducts(FilterThrProductsRequest filterThrProductsRequest, @@ -44,7 +49,7 @@ public class ThrProductsController { } @PostMapping("/udiwms/thrsys/postThrProducts") - public BaseResponse postThrProducts(PostThrProductsRequest postThrProductsRequest, + public BaseResponse postThrProducts(@RequestBody PostThrProductsRequest postThrProductsRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { @@ -69,4 +74,36 @@ public class ThrProductsController { return ResultVOUtils.error(500, "上传数据为空"); } + @PostMapping("/udiwms/thrsys/delThrProducts") + public BaseResponse delThrProducts(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + thrProductsService.deleteById(id); + return ResultVOUtils.success("删除成功"); + } + + @RequestMapping("/udiwms/thrsys/products/delAll") + public BaseResponse delAll() { + thrProductsService.deleteAll(); + return ResultVOUtils.success("删除成功"); + } + + + @RequestMapping("/udiwms/thrsys/products/downloadAll") + public BaseResponse downloadAll(FilterThrProductsRequest filterThrProductsRequest) { + String data = (String) redisUtil.get(Constant.dlThrProducts); + if (data != null && data.equals("true")) { + return ResultVOUtils.error(500, "当前任务正在下载更新产品信息，请稍后重试！"); + } else { + redisUtil.set(Constant.dlThrProducts, "true", 30); + if (filterThrProductsRequest.getThirdSysFk() == null) { + return ResultVOUtils.error(500, "未选择第三方系统！"); + } + thrProductsDlService.importProducrs(filterThrProductsRequest.getThirdSysFk()); + return ResultVOUtils.success("后台开始下载更新，请稍后刷新查看"); + } + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java new file mode 100644 index 00000000..038c6a0c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicThirdSysDetailDao.java @@ -0,0 +1,20 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface BasicThirdSysDetailDao { + + + boolean updateBasicThirdSysDetail(BasicThirdSysDetailEntity basicThirdSysEntity); + + BasicThirdSysDetailEntity selectByKey(@Param("key") String key,@Param("thirdSys") String thirdSys); + + List filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java index 8d135fa8..cc843bbd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/UnitMaintainDao.java @@ -1,7 +1,7 @@ package com.glxp.api.admin.dao.basic; import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -9,7 +9,7 @@ import java.util.List; @Mapper public interface UnitMaintainDao { - List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + List filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest); boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java new file mode 100644 index 00000000..56c7b438 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/info/ThirdSysApiDao.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.dao.info; + +import com.glxp.api.admin.entity.info.ThirdSysApiEntity; +import com.glxp.api.admin.req.info.FilterSysApiRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ThirdSysApiDao { + + List findSysApi(FilterSysApiRequest filterSysApiRequest); + + boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java new file mode 100644 index 00000000..79ffda7a --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InCodeLogDao.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.dao.inventory; + +import com.glxp.api.admin.entity.inout.StockCheckEntity; +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; +import com.glxp.api.admin.req.inout.FilterStockCheckRequest; +import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface InCodeLogDao { + List filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest); + + boolean insertInCodeLog(InCodeLogEntity stockCheckEntity); + + boolean updateInCodeLog(InCodeLogEntity stockCheckEntity); + + boolean deleteById(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java index 6a8fb139..3566524a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java @@ -23,6 +23,8 @@ public interface InvStockPrintDao { boolean updateStockPrint(StockPrintEntity udiInfoEntity); boolean deleteById(@Param("id") String id); + boolean deleteByGenKey(@Param("genKey") String genKey); + boolean updatePrintStatus(@Param("ids") List ids); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java index bec0e8ce..6dbee327 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java @@ -20,4 +20,5 @@ public interface ThrCorpDao { boolean deleteById(@Param("id") String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java index 553f09c9..d2700d11 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrInvProductsDao.java @@ -20,4 +20,6 @@ public interface ThrInvProductsDao { boolean deleteById(@Param("id") String id); + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java index 2c194a2f..56924127 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDao.java @@ -19,4 +19,6 @@ public interface ThrOrderDao { boolean updateThrOrder(ThrOrderEntity thrOrderEntity); boolean deleteById(@Param("id") String id); + + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java index f4faa3d1..d7726f1a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrOrderDetailDao.java @@ -20,4 +20,8 @@ public interface ThrOrderDetailDao { boolean deleteById(@Param("id") String id); + boolean deleteByOrderIdFk(@Param("orderIdFk")String orderIdFk); + + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java index c4067fdb..3d0ce08b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrProductsDao.java @@ -21,4 +21,5 @@ public interface ThrProductsDao { boolean deleteById(@Param("id") String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java new file mode 100644 index 00000000..9a2b586b --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BasicThirdSysDetailEntity { + + private Integer id; + private String key; + private String value; + private Boolean enabled; + private Boolean itrCache; + private String guideUrl; + private String remark; + private String thirdSysFk; + private String name; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java index f7d4a6d9..fe366076 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysEntity.java @@ -7,21 +7,9 @@ public class BasicThirdSysEntity { private String id; private String thirdId; private String thirdName; - private String piQueryUrl; - private Boolean piQueryEnabled; - private String orderQueryUrl; - private Boolean orderQueryEnabled; - private String orderAddUrl; - private Boolean orderAddEnabled; - private String orderDeleteUrl; - private Boolean orderDeleteEnabled; - private String orderModifyUrl; - private Boolean orderModifyEnabled; - private String invPiUrl; - private Boolean invPiEnabled; - private String corpUrl; - private Boolean corpEnabled; private Boolean enabled; private String remark; - private String thirdSysFk; + private String guideUrl; + private String thridUrl; + private Boolean mainSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java index 2fb51b05..04f21f19 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.java @@ -22,4 +22,10 @@ public class BasicUnitMaintainEntity { private String thirdId3; private String thirdId4; + private String thirdName; + private String thirdName1; + private String thirdName2; + private String thirdName3; + private String thirdName4; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 5dddda0e..a430ae47 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -1,6 +1,5 @@ package com.glxp.api.admin.entity.basic; -import lombok.Data; public class UdiInfoEntity { @@ -31,7 +30,10 @@ public class UdiInfoEntity { private int diType; private String thirdId; private String thirdName; - + private String ybbm; + private String sptm; + private String manufactory; + private String measname; //本地生成信息 private String batchNo; @@ -92,6 +94,29 @@ public class UdiInfoEntity { } return bhzxxsbzsl; } + public String getSptm() { + return sptm; + } + + public void setSptm(String sptm) { + this.sptm = sptm; + } + + public String getManufactory() { + return manufactory; + } + + public void setManufactory(String manufactory) { + this.manufactory = manufactory; + } + + public String getMeasname() { + return measname; + } + + public void setMeasname(String measname) { + this.measname = measname; + } public void setBhzxxsbzsl(Integer bhzxxsbzsl) { this.bhzxxsbzsl = bhzxxsbzsl; @@ -334,4 +359,12 @@ public class UdiInfoEntity { public void setWarehouseCode(String warehouseCode) { this.warehouseCode = warehouseCode; } + + public String getYbbm() { + return ybbm; + } + + public void setYbbm(String ybbm) { + this.ybbm = ybbm; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java index 836564d9..57b0bf22 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.java @@ -19,8 +19,8 @@ public class UdiRelevanceEntity { private String thirdName2; private String thirdName3; private String thirdName4; - private String ybbm; - private String sptm; + private String manufactory; + private String measname; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java new file mode 100644 index 00000000..14727623 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/ThirdSysApiEntity.java @@ -0,0 +1,12 @@ +package com.glxp.api.admin.entity.info; + +import lombok.Data; + +@Data +public class ThirdSysApiEntity { + private String id; + private String name; + private String apiUrl; + private String guideUrl; + private String remark; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java new file mode 100644 index 00000000..a5cee45f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InCodeLogEntity.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.entity.inventory; + +import lombok.Data; + +import java.sql.Date; + +@Data +public class InCodeLogEntity { + + private Integer id; + private String genKey; + private String fromType; + private Date updateTime; + private Integer status; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java new file mode 100644 index 00000000..4c41cff3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/InsertStockPrintEntity.java @@ -0,0 +1,223 @@ +package com.glxp.api.admin.entity.inventory; + +public class InsertStockPrintEntity { + + + private String udiRlIdFk; + private String udiCode; + private String nameCode; + private String cpmctymc; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String codeType; + private String thirdId; + private String thirdName; + private String printStatus; + private String ggxh; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String warehouseName; + private String warehouseCode; + private String spaceCode; + private String spaceName; + private String nnum; + private String thirdSysFk; + + private int id; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUdiRlIdFk() { + return udiRlIdFk; + } + + public void setUdiRlIdFk(String udiRlIdFk) { + this.udiRlIdFk = udiRlIdFk; + } + + public String getUdiCode() { + return udiCode; + } + + public void setUdiCode(String udiCode) { + this.udiCode = udiCode; + } + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public String getCpmctymc() { + return cpmctymc; + } + + public void setCpmctymc(String cpmctymc) { + this.cpmctymc = cpmctymc; + } + + public String getBatchNo() { + if (batchNo == null) { + return ""; + } + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProduceDate() { + if (produceDate == null) { + return ""; + } + return produceDate; + } + + public void setProduceDate(String produceDate) { + this.produceDate = produceDate; + } + + public String getExpireDate() { + if (expireDate == null) { + return ""; + } + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getSerialNo() { + if (serialNo == null) { + return ""; + } + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getCodeType() { + return codeType; + } + + public void setCodeType(String codeType) { + this.codeType = codeType; + } + + public String getThirdId() { + return thirdId; + } + + public void setThirdId(String thirdId) { + this.thirdId = thirdId; + } + + public String getThirdName() { + return thirdName; + } + + public void setThirdName(String thirdName) { + this.thirdName = thirdName; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getGgxh() { + return ggxh; + } + + public void setGgxh(String ggxh) { + this.ggxh = ggxh; + } + + public String getYlqxzcrbarmc() { + return ylqxzcrbarmc; + } + + public void setYlqxzcrbarmc(String ylqxzcrbarmc) { + this.ylqxzcrbarmc = ylqxzcrbarmc; + } + + public String getZczbhhzbapzbh() { + return zczbhhzbapzbh; + } + + public void setZczbhhzbapzbh(String zczbhhzbapzbh) { + this.zczbhhzbapzbh = zczbhhzbapzbh; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getWarehouseCode() { + if (warehouseCode == null) { + return ""; + } + return warehouseCode; + } + + public void setWarehouseCode(String warehouseCode) { + this.warehouseCode = warehouseCode; + } + + public String getSpaceCode() { + if (spaceCode == null) { + return ""; + } + return spaceCode; + } + + public void setSpaceCode(String spaceCode) { + this.spaceCode = spaceCode; + } + + public String getSpaceName() { + return spaceName; + } + + public void setSpaceName(String spaceName) { + this.spaceName = spaceName; + } + + public String getNnum() { + return nnum; + } + + public void setNnum(String nnum) { + this.nnum = nnum; + } + + public String getThirdSysFk() { + return thirdSysFk; + } + + public void setThirdSysFk(String thirdSysFk) { + this.thirdSysFk = thirdSysFk; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java index 1eb0b49b..0efa5155 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java @@ -22,6 +22,10 @@ public class StockPrintEntity { private String zczbhhzbapzbh; private String warehouseName; private String warehouseCode; + private String spaceCode; + private String spaceName; + private String thirdSysFk; private String nnum; + private String genKeyFk; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java index 22f3831c..fcbf1fef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrCorpEntity.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class ThrCorpEntity { - private Integer id; + private String id; private String unitId; private String name; private String spell; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java index 27306a14..34d184cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrInvProductsEntity.java @@ -9,13 +9,15 @@ public class ThrInvProductsEntity { private String inventoryCode; private String inventoryName; private String spec; - private String count; + private Integer count; private String batchNo; private String warehouseName; private String warehouseCode; private String registerCertNo; private String manufacturingDate; private String expirationDate; + private String spaceCode; + private String spaceName; private String thirdSysFk; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java index b45537af..aa170704 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderDetailEntity.java @@ -11,8 +11,8 @@ public class ThrOrderDetailEntity { private String batchNo; private String expireDate; private String productDate; - private String count; - private String reCount; + private Integer count; + private Integer reCount; private String orderIdFk; private String thirdSysFk; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java index 7e087a6e..1e279eca 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrProductsEntity.java @@ -12,5 +12,15 @@ public class ThrProductsEntity { private String registerNo; private String manufactory; private String thirdSysFk; + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index c1159224..93d27962 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -2,10 +2,10 @@ package com.glxp.api.admin.httpclient; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.basic.ErpUnitsResponse; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.util.HttpClient; import com.glxp.api.common.res.BaseResponse; @@ -21,8 +21,10 @@ public class ErpBasicClient { //获取往来单位 - public BaseResponse> getErpCrop(UnitMaintainFilterRequest unitMaintainFilterRequest, String url) { + public BaseResponse> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) { Map paramMap = new HashMap<>(16); + paramMap.put("name", unitMaintainFilterRequest.getName()); + paramMap.put("unitId", unitMaintainFilterRequest.getUnitId()); paramMap.put("key", unitMaintainFilterRequest.getKey()); paramMap.put("page", unitMaintainFilterRequest.getPage()); paramMap.put("limit", unitMaintainFilterRequest.getLimit()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java index 332edbe4..f79dbee4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java @@ -32,6 +32,10 @@ public class ErpInvClient { paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); + if (onhandRequest.getPage() != null) + paramMap.put("page", onhandRequest.getPage()); + if (onhandRequest.getLimit() != null) + paramMap.put("limit", onhandRequest.getLimit()); String response = HttpClient.mipsGet(url, paramMap); try { BaseResponse> onHandsResponse = @@ -53,6 +57,10 @@ public class ErpInvClient { paramMap.put("warehouseCode", onhandRequest.getWarehouseCode()); if (onhandRequest.getInventoryCode() != null && !onhandRequest.getInventoryCode().equals("")) paramMap.put("inventoryCode", onhandRequest.getInventoryCode()); + if (onhandRequest.getPage() != null) + paramMap.put("page", onhandRequest.getPage()); + if (onhandRequest.getLimit() != null) + paramMap.put("limit", onhandRequest.getLimit()); String response = HttpClient.mipsGet(url, paramMap); try { BaseResponse> onHandsResponse = diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java index f262d77b..2cd76f1e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java @@ -6,6 +6,9 @@ import lombok.Data; @Data public class BasicUnitMaintainFilterRequest extends ListPageRequest { + private Integer id; private String key; - + private String unitId; + private String name; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java index 366680c9..d7e10675 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/CombineRequest.java @@ -1,5 +1,7 @@ package com.glxp.api.admin.req.basic; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import lombok.Data; import java.util.List; @@ -10,6 +12,7 @@ public class CombineRequest { List keys; private String thirdId; private String erpName; + private ErpProductsResponse erpProductsResponse; private String relId; private String thirdSys; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java new file mode 100644 index 00000000..d31eed0d --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysDetailRequest.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterBasicThirdSysDetailRequest extends ListPageRequest { + + private String key; + private String thirdSysFk; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java index 7b5276a1..5697d321 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterBasicThirdSysRequest.java @@ -9,5 +9,6 @@ public class FilterBasicThirdSysRequest extends ListPageRequest { private String thirdId; private String thirdName; private Boolean enabled; + private Boolean mainSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java index 59e854cd..a3c0861e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java @@ -14,4 +14,7 @@ public class FilterStockprintRequest extends ListPageRequest { private String batchNo; private String udiRlIdFk; private String warehouseCode; + private String spaceCode; + private String thirdSysFk; + private String genKeyFk; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java new file mode 100644 index 00000000..2d66438e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysApiRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.info; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.awt.*; + +@Data +public class FilterSysApiRequest extends ListPageRequest { +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java index 1ff04f14..53e1b435 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -1,14 +1,16 @@ package com.glxp.api.admin.req.inventory; +import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; import java.util.List; @Data -public class ErpOnhandRequest { +public class ErpOnhandRequest extends ListPageRequest { private String batchNo; private String warehouseCode; + private String inventoryName; private String inventoryCode; private List inventoryCodes; private String udiCode; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java new file mode 100644 index 00000000..217eb553 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterInCodeLogRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class FilterInCodeLogRequest extends ListPageRequest { + private Integer id; + private String genKey; + private Integer status; + private String thirdSysFk; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java new file mode 100644 index 00000000..102636e9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/PostStockPrintRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.inventory; + +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import lombok.Data; + +import java.util.List; + +@Data +public class PostStockPrintRequest { + private String thirdSys; + private List datas; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java deleted file mode 100644 index e42fcc46..00000000 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.glxp.api.admin.req.receipt; - -import com.glxp.api.admin.req.ListPageRequest; -import lombok.Data; - -@Data -public class UnitMaintainFilterRequest extends ListPageRequest { - - private String key; - private String unitId; - private String name; - private String thirdSys; -} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java index fbd157cf..0c00c136 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java @@ -3,10 +3,18 @@ package com.glxp.api.admin.req.thrsys; import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; +import java.util.List; + @Data public class FilterThrInvProductsRequest extends ListPageRequest { private String inventoryCode; private String inventoryName; private String thirdSysFk; + private String batchNo; + private String warehouseCode; + private List inventoryCodes; + private String udiCode; + private String nameCode; + private String thirdSys; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java index 02434b00..b9d19ed6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrOrderRequest.java @@ -6,7 +6,11 @@ import lombok.Data; @Data public class FilterThrOrderRequest extends ListPageRequest { + private String id; private String billNo; private String thirdSysFk; - + private String startDate; //起始日期 + private String endDate; //结束日期 + private String billFlag; //单据状态,0.未签字，1.已签字 + private String billAction; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java index a63a023a..1636b17f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java @@ -7,4 +7,9 @@ import lombok.Data; public class FilterThrProductsRequest extends ListPageRequest { private String name; private String thirdSysFk; + private String startDate; //起始日期 + private String endDate; //结束日期 + private String billNo; //单据号 + private String billFlag; //单据状态,0.未签字，1.已签字 + private String billAction; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java index 997d4279..2bdf0f5c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/PostThrInvProductsRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.req.thrsys; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; import lombok.Data; @@ -9,5 +10,5 @@ import java.util.List; public class PostThrInvProductsRequest { private String thirdSys; - private List datas; + private List datas; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java index 21e5e0e9..22f27b21 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/BussinessTypResponse.java @@ -14,20 +14,6 @@ public class BussinessTypResponse { private String thirdSysFk; private String thirdId; private String thirdName; - private String piQueryUrl; - private Boolean piQueryEnabled; - private String orderQueryUrl; - private Boolean orderQueryEnabled; - private String orderAddUrl; - private Boolean orderAddEnabled; - private String orderDeleteUrl; - private Boolean orderDeleteEnabled; - private String orderModifyUrl; - private Boolean orderModifyEnabled; - private String invPiUrl; - private Boolean invPiEnabled; - private String corpUrl; - private Boolean corpEnabled; private Boolean enabled; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java index fb5caf0c..f0b207b3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/ErpProductsResponse.java @@ -11,6 +11,17 @@ public class ErpProductsResponse { private String spec; //规格型号 private String registerNo; //注册证号 private String manufactory; //生产厂家 + private String cplb; + private String flbm; + private String qxlb; + private String ybbm; + private String sptm; + private String tyshxydm; + private String zczbhhzbapzbh; + private String ylqxzcrbarmc; + private String ylqxzcrbarywmc; + private String cpms; + //辅助字段 diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java index 3fecafd4..b8b32b44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/ErpOrderResponse.java @@ -9,7 +9,7 @@ public class ErpOrderResponse { private String corpId; private String corpName; private String billType; - private String billFlag; + private String billFlag; private List subErpOrders; public String getBillNo() { @@ -76,8 +76,8 @@ public class ErpOrderResponse { private String batchNo; private String expireDate; private String productDate; - private int count; //账面数量 - private int reCount; //实际数量 + private Integer count; //账面数量 + private Integer reCount; //实际数量 public String getProductId() { return productId; @@ -127,19 +127,19 @@ public class ErpOrderResponse { this.productDate = productDate; } - public int getCount() { + public Integer getCount() { return count; } - public void setCount(int count) { + public void setCount(Integer count) { this.count = count; } - public int getReCount() { + public Integer getReCount() { return reCount; } - public void setReCount(int reCount) { + public void setReCount(Integer reCount) { this.reCount = reCount; } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java index 5005f236..e96d2b8a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/inventory/ErpInvProductResponse.java @@ -13,6 +13,9 @@ public class ErpInvProductResponse { private String warehouseCode; private String warehouseName; private String registerCertNo; + private String spaceCode; + private String spaceName; + private String thirdSysFk; private String spec; private Integer count; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java new file mode 100644 index 00000000..ece25f4e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicThirdSysDetailService.java @@ -0,0 +1,16 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; + +import java.util.List; + +public interface BasicThirdSysDetailService { + + boolean updateBasicThirdSysDetail(BasicThirdSysDetailEntity basicThirdSysEntity); + + BasicThirdSysDetailEntity selectByKey(String key,String thirdSys); + + List filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java index 87c29270..b772129f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessTypeService.java @@ -1,6 +1,8 @@ package com.glxp.api.admin.service.basic; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; @@ -18,6 +20,8 @@ public interface BussinessTypeService { BussinessTypResponse findJoinBTByAction(String action); + BasicThirdSysDetailEntity findByActionKey(String action, String key); + boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity); boolean updateBussinessType(BussinessTypeEntity bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java index 08e577de..07279aa4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -12,6 +12,8 @@ public interface UdiRelevanceService { List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + boolean isExit(); + List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); List selectByUuid(String uuid); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java index 9a2da3dc..c3de1a5e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UnitMaintainService.java @@ -1,17 +1,19 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import java.util.List; public interface UnitMaintainService { - List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest); + List filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest); boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity); boolean deleteById(String id); + boolean isExit(); + UnitMaintainEntity selectById(String id); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java new file mode 100644 index 00000000..dee1f9e4 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicThirdSysDetailServiceImpl.java @@ -0,0 +1,44 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.req.basic.FilterBasicThirdSysDetailRequest; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BasicThirdSysDetailServiceImpl implements BasicThirdSysDetailService { + + @Resource + BasicThirdSysDetailDao basicThirdSysDetailDao; + + @Override + public boolean updateBasicThirdSysDetail(BasicThirdSysDetailEntity basicThirdSysEntity) { + return basicThirdSysDetailDao.updateBasicThirdSysDetail(basicThirdSysEntity); + } + + @Override + public BasicThirdSysDetailEntity selectByKey(String key, String thirdSys) { + return basicThirdSysDetailDao.selectByKey(key,thirdSys); + } + + @Override + public List filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest) { + if (filterBasicThirdSysDetailRequest == null) { + return Collections.emptyList(); + } + + if (filterBasicThirdSysDetailRequest.getPage() != null) { + int offset = (filterBasicThirdSysDetailRequest.getPage() - 1) * filterBasicThirdSysDetailRequest.getLimit(); + PageHelper.offsetPage(offset, filterBasicThirdSysDetailRequest.getLimit()); + } + List data = basicThirdSysDetailDao.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest); + return data; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java index 1ae7fab1..11dbedc2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.java @@ -2,9 +2,11 @@ package com.glxp.api.admin.service.basic.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.BussinessTypeDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BussinessTypeService; import org.springframework.stereotype.Service; @@ -17,13 +19,15 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { @Resource BussinessTypeDao bussinessTypeDao; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; @Override public List filterList(BussinessTypeFilterRequest bussinessTypeFilterRequest) { if (bussinessTypeFilterRequest == null) { return Collections.emptyList(); } - if(bussinessTypeFilterRequest.getPage()!=null){ + if (bussinessTypeFilterRequest.getPage() != null) { int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); } @@ -36,7 +40,7 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { if (bussinessTypeFilterRequest == null) { return Collections.emptyList(); } - if(bussinessTypeFilterRequest.getPage()!=null){ + if (bussinessTypeFilterRequest.getPage() != null) { int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); } @@ -78,6 +82,16 @@ public class BussinessTypeServiceImpl implements BussinessTypeService { return null; } + @Override + public BasicThirdSysDetailEntity findByActionKey(String action, String key) { + BussinessTypResponse bussinessTypResponse = findJoinBTByAction(action); + if (bussinessTypResponse != null) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey(key, bussinessTypResponse.getThirdSysFk()); + return basicThirdSysDetailEntity; + } + return null; + } + @Override public boolean insertBussinessType(BussinessTypeEntity bussinessTypeEntity) { return bussinessTypeDao.insertBussinessType(bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 0feb83b3..6efeaa90 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -23,7 +23,7 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { if (filterUdiInfoRequest == null) { return Collections.emptyList(); } - if(filterUdiInfoRequest.getPage()!=null){ + if (filterUdiInfoRequest.getPage() != null) { int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit(); PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit()); } @@ -32,6 +32,18 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return data; } + @Override + public boolean isExit() { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setPage(1); + filterUdiInfoRequest.setLimit(1); + List data = filterUdiRelevance(filterUdiInfoRequest); + if (data != null && data.size() > 0) { + return true; + } + return false; + } + @Override public List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest) { if (filterUdiInfoRequest == null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java index e7e1c04a..2c770f7e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.java @@ -3,7 +3,9 @@ package com.glxp.api.admin.service.basic.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.basic.UnitMaintainDao; import com.glxp.api.admin.entity.basic.UnitMaintainEntity; -import com.glxp.api.admin.req.receipt.UnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.service.basic.UnitMaintainService; import org.springframework.stereotype.Service; @@ -18,12 +20,15 @@ public class UnitMaintainServiceImpl implements UnitMaintainService { UnitMaintainDao unitMaintainDao; @Override - public List filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) { + public List filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest) { if (unitMaintainFilterRequest == null) { return Collections.emptyList(); } - int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit(); - PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit()); + if (unitMaintainFilterRequest.getPage() != null) { + int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit(); + PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit()); + } + List data = unitMaintainDao.filterList(unitMaintainFilterRequest); return data; } @@ -38,6 +43,18 @@ public class UnitMaintainServiceImpl implements UnitMaintainService { return unitMaintainDao.deleteById(id); } + @Override + public boolean isExit() { + BasicUnitMaintainFilterRequest filterUdiInfoRequest = new BasicUnitMaintainFilterRequest(); + filterUdiInfoRequest.setPage(1); + filterUdiInfoRequest.setLimit(1); + List data = filterList(filterUdiInfoRequest); + if (data != null && data.size() > 0) { + return true; + } + return false; + } + @Override public UnitMaintainEntity selectById(String id) { return unitMaintainDao.selectById(id); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java new file mode 100644 index 00000000..ac5a6988 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/ThirdSysApiService.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.service.info; + +import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.admin.entity.info.ThirdSysApiEntity; +import com.glxp.api.admin.req.info.FilterSysApiRequest; + +import java.util.List; + +public interface ThirdSysApiService { + + List findSysApi(FilterSysApiRequest filterSysApiRequest); + + boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java new file mode 100644 index 00000000..5ed9092e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/info/impl/ThirdSysApiServiceImpl.java @@ -0,0 +1,36 @@ +package com.glxp.api.admin.service.info.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.info.ThirdSysApiDao; +import com.glxp.api.admin.entity.info.ThirdSysApiEntity; +import com.glxp.api.admin.req.info.FilterSysApiRequest; +import com.glxp.api.admin.service.info.ThirdSysApiService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class ThirdSysApiServiceImpl implements ThirdSysApiService { + @Resource + ThirdSysApiDao thirdSysApiDao; + + @Override + public List findSysApi(FilterSysApiRequest filterSysApiRequest) { + + if (filterSysApiRequest == null) { + return Collections.emptyList(); + } + if (filterSysApiRequest.getPage() != null) { + int offset = (filterSysApiRequest.getPage() - 1) * filterSysApiRequest.getLimit(); + PageHelper.offsetPage(offset, filterSysApiRequest.getLimit()); + } + return thirdSysApiDao.findSysApi(filterSysApiRequest); + } + + @Override + public boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity) { + return false; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java new file mode 100644 index 00000000..3fe7c877 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InCodeLogService.java @@ -0,0 +1,17 @@ +package com.glxp.api.admin.service.inventory; + +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; +import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; + +import java.util.List; + +public interface InCodeLogService { + + List filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest); + + boolean insertInCodeLog(InCodeLogEntity inCodeLogEntity); + + boolean updateInCodeLog(InCodeLogEntity inCodeLogEntity); + + boolean deleteById(String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java index b9113a76..4ab676b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java @@ -20,6 +20,8 @@ public interface InvStockPrintService { boolean deleteById(String id); + boolean deleteByGenKey(String genKey); + boolean updatePrintStatus(List ids); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java new file mode 100644 index 00000000..2f0b52f6 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InCodeLogServiceImpl.java @@ -0,0 +1,47 @@ +package com.glxp.api.admin.service.inventory.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.inventory.InCodeLogDao; +import com.glxp.api.admin.entity.inventory.InCodeLogEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.req.inventory.FilterInCodeLogRequest; +import com.glxp.api.admin.service.inventory.InCodeLogService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class InCodeLogServiceImpl implements InCodeLogService { + @Resource + InCodeLogDao inCodeLogDao; + + @Override + public List filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest) { + if (filterInCodeLogRequest == null) { + return Collections.emptyList(); + } + if (filterInCodeLogRequest.getPage() != null) { + int offset = (filterInCodeLogRequest.getPage() - 1) * filterInCodeLogRequest.getLimit(); + PageHelper.offsetPage(offset, filterInCodeLogRequest.getLimit()); + } + List data = inCodeLogDao.filterInCodeLog(filterInCodeLogRequest); + return data; + } + + @Override + public boolean insertInCodeLog(InCodeLogEntity inCodeLogEntity) { + return inCodeLogDao.insertInCodeLog(inCodeLogEntity); + } + + @Override + public boolean updateInCodeLog(InCodeLogEntity inCodeLogEntity) { + return inCodeLogDao.updateInCodeLog(inCodeLogEntity); + } + + @Override + public boolean deleteById(String id) { + return inCodeLogDao.deleteById(id); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java index 0f7bb27e..111fa858 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java @@ -60,6 +60,11 @@ public class InvStockPrintServiceImpl implements InvStockPrintService { return stockPrintDao.deleteById(id); } + @Override + public boolean deleteByGenKey(String genKey) { + return stockPrintDao.deleteByGenKey(genKey); + } + @Override public boolean updatePrintStatus(List ids) { return stockPrintDao.updatePrintStatus(ids); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java index f0e12509..0a3a691c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java @@ -17,4 +17,5 @@ public interface ThrCorpService { boolean deleteById(String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java index 72609dfd..a105bbef 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrInvProductsService.java @@ -18,4 +18,6 @@ public interface ThrInvProductsService { boolean deleteById(String id); + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java index 9c0bd95b..af25b7b2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderDetailService.java @@ -18,4 +18,8 @@ public interface ThrOrderDetailService { boolean deleteById(String id); + boolean deleteByOrderIdFk(String id); + + boolean deleteAll(); + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java index 3f1453af..d367ce4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrOrderService.java @@ -1,7 +1,9 @@ package com.glxp.api.admin.service.thrsys; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.res.inout.ErpOrderResponse; import java.util.List; @@ -9,8 +11,14 @@ public interface ThrOrderService { List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest); + List filterAllOrders(List billNos, String action); + + List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest); + ThrOrderEntity findByUnique(String billNo, String thirdSysFk); + ThrOrderEntity findById(String id); + boolean insertThrOrder(ThrOrderEntity thrCorpEntity); boolean insertThrOrders(List thrOrderEntities); @@ -19,4 +27,5 @@ public interface ThrOrderService { boolean deleteById(String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java index 30dfac2b..8435e03f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java @@ -18,4 +18,5 @@ public interface ThrProductsService { boolean deleteById(String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java index b00bf862..92840a2e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -49,4 +49,9 @@ public class ThrCorpServiceImpl implements ThrCorpService { public boolean deleteById(String id) { return thrCorpDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return thrCorpDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java index f033acc4..2142fd61 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -51,4 +51,9 @@ public class ThrInvProductsServiceImpl implements ThrInvProductsService { public boolean deleteById(String id) { return thrInvProductsDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return thrInvProductsDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java index 53df2c67..a8fe26c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -50,4 +50,14 @@ public class ThrOrderDetailServiceImpl implements ThrOrderDetailService { public boolean deleteById(String id) { return thrOrderDetailDao.deleteById(id); } + + @Override + public boolean deleteByOrderIdFk(String id) { + return thrOrderDetailDao.deleteByOrderIdFk(id); + } + + @Override + public boolean deleteAll() { + return deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java index bc49b836..a8b480e1 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrOrderServiceImpl.java @@ -2,12 +2,19 @@ package com.glxp.api.admin.service.thrsys.impl; import com.github.pagehelper.PageHelper; import com.glxp.api.admin.dao.thrsys.ThrOrderDao; +import com.glxp.api.admin.dao.thrsys.ThrOrderDetailDao; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.service.thrsys.ThrOrderService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -15,6 +22,8 @@ import java.util.List; public class ThrOrderServiceImpl implements ThrOrderService { @Resource private ThrOrderDao thrOrderDao; + @Resource + private ThrOrderDetailDao thrOrderDetailDao; @Override public List filterThrOrder(FilterThrOrderRequest filterThrOrderRequest) { @@ -29,6 +38,61 @@ public class ThrOrderServiceImpl implements ThrOrderService { return data; } + @Override + public List filterAllOrders(List billNos, String thirdSys) { + List erpOrderEntities = new ArrayList<>(); + for (String billNo : billNos) { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setBillNo(billNo); + filterThrOrderRequest.setThirdSysFk(thirdSys); + List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); + if (data != null && data.size() > 0) { + for (ThrOrderEntity thrOrderEntity : data) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + ErpOrderEntity erpOrderEntity = new ErpOrderEntity(); + BeanUtils.copyProperties(thrOrderEntity, erpOrderEntity); + BeanUtils.copyProperties(thrOrderDetailEntity, erpOrderEntity); + erpOrderEntities.add(erpOrderEntity); + } + } + } + } + } + return erpOrderEntities; + } + + @Override + public List filterAllDetail(FilterThrOrderRequest filterThrOrderRequest) { + + List erpOrderResponses = new ArrayList<>(); + List data = thrOrderDao.filterThrOrder(filterThrOrderRequest); + if (data != null && data.size() > 0) { + for (ThrOrderEntity thrOrderEntity : data) { + FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest(); + filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + ""); + List thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest); + ErpOrderResponse erpOrderResponse = new ErpOrderResponse(); + BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse); + List subErpOrders = new ArrayList<>(); + if (thrOrderDetailEntities != null && thrOrderDetailEntities.size() > 0) { + for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { + ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder(); + BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + subErpOrders.add(subErpOrder); + } + } + erpOrderResponse.setSubErpOrders(subErpOrders); + erpOrderResponses.add(erpOrderResponse); + } + } + + return erpOrderResponses; + } + @Override public ThrOrderEntity findByUnique(String billNo, String thirdSysFk) { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); @@ -41,6 +105,17 @@ public class ThrOrderServiceImpl implements ThrOrderService { return null; } + @Override + public ThrOrderEntity findById(String id) { + FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setId(id); + List thrOrderEntities = filterThrOrder(filterThrOrderRequest); + if (thrOrderEntities != null && thrOrderEntities.size() > 0) { + return thrOrderEntities.get(0); + } + return null; + } + @Override public boolean insertThrOrder(ThrOrderEntity thrCorpEntity) { return thrOrderDao.insertThrOrder(thrCorpEntity); @@ -60,4 +135,9 @@ public class ThrOrderServiceImpl implements ThrOrderService { public boolean deleteById(String id) { return thrOrderDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return thrOrderDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java index 2e6f81e8..b064970e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java @@ -51,4 +51,9 @@ public class ThrProductsServiceImpl implements ThrProductsService { public boolean deleteById(String id) { return thrProductsDao.deleteById(id); } + + @Override + public boolean deleteAll() { + return thrProductsDao.deleteAll(); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java index 4000c835..890a380c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateErpDataTask.java @@ -1,10 +1,12 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.info.ScheduledEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.info.SystemParamConfigService; import org.slf4j.Logger; @@ -30,7 +32,7 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { @Resource SystemParamConfigService systemParamConfigService; @Resource - BasicThirdSysService basicThirdSysService; + BasicThirdSysDetailService basicThirdSysDetailService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -53,14 +55,16 @@ public class BasicUpdateErpDataTask implements SchedulingConfigurer { SystemParamConfigEntity isUpdate = systemParamConfigService.selectByParamKey("erp_updateErpData"); if (isUpdate != null && "1".equals(isUpdate.getParamValue())) { SystemParamConfigEntity thirdSys = systemParamConfigService.selectByParamKey("erp_updateErpData_thirdSys"); - BasicThirdSysEntity basicThirdSysEntity; + String thirdSysId = null; if (thirdSys != null && thirdSys.getParamValue() != null) { - basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSys.getParamValue()); + thirdSysId = thirdSys.getParamValue(); } else - basicThirdSysEntity = basicThirdSysService.selectByThirdId("thirdId"); - if (basicThirdSysEntity.getPiQueryUrl() != null && basicThirdSysEntity.getInvPiUrl() != null){ - updateproductService.updateProduct(basicThirdSysEntity.getOrderQueryUrl(), basicThirdSysEntity.getInvPiUrl()); - }else { + thirdSysId = "thirdId"; + BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSysId); + BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSysId); + if (piDetailEntity.getValue() != null && invPiDetailEntity.getValue() != null) { + updateproductService.updateProduct(piDetailEntity.getValue(), invPiDetailEntity.getValue()); + } else { logger.info("接口地址未设置"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java index a70c1b2b..df894c72 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateproductService.java @@ -4,6 +4,7 @@ import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.httpclient.ErpInvClient; +import com.glxp.api.admin.req.basic.CombineRequest; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.PageSimpleResponse; @@ -15,6 +16,7 @@ import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -42,17 +44,17 @@ public class BasicUpdateproductService { } } - public void addProduct(String code, String name, String url) { + public void addProduct(CombineRequest combineRequest, String url) { List inventoryCodes = new ArrayList<>(); - inventoryCodes.add(code); + inventoryCodes.add(combineRequest.getThirdId()); if (inventoryCodes.size() > 0) { UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); - udiRelevanceEntity1.setThirdId(code); - udiRelevanceEntity1.setThirdName(name); + udiRelevanceEntity1.setThirdId(combineRequest.getThirdId()); + udiRelevanceEntity1.setThirdName(combineRequest.getErpName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); - filterErpGoodsRequest.setCode(code); + filterErpGoodsRequest.setCode(combineRequest.getThirdId()); filterErpGoodsRequest.setPage(1); filterErpGoodsRequest.setLimit(1); BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, url); @@ -60,30 +62,25 @@ public class BasicUpdateproductService { if (erpProductsResponses != null & erpProductsResponses.size() > 0) { ErpProductsResponse erpProductsResponse = erpProductsResponses.get(0); UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(erpProductsResponse.getCode()); + BeanUtils.copyProperties(erpProductsResponse,udiInfoEntity); +// udiInfoEntity.setNameCode(erpProductsResponse.getCode()); udiInfoEntity.setCpmctymc(erpProductsResponse.getName()); udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); - udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory()); udiInfoEntity.setUuid(CustomUtil.getUUId()); udiInfoService.insertUdiInfo(udiInfoEntity); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); - udiRelevanceEntity1.setThirdId(udiInfoEntity.getNameCode()); - udiRelevanceEntity1.setThirdName(udiInfoEntity.getCpmctymc()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); } udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); } - - } public int getInvmandoc(String invcode, int page, int limit, String productUrl, String onHandUrl) { FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); - filterErpGoodsRequest.setPage(page); filterErpGoodsRequest.setLimit(limit); if (invcode != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java index 5359b0a7..07b6123a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvImportStockService.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; @@ -20,10 +21,7 @@ import com.glxp.api.admin.req.inventory.ErpOnhandRequest; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; import com.glxp.api.admin.res.inventory.ErpOnHandResponse; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.basic.BussinessTypeService; -import com.glxp.api.admin.service.basic.UdiInfoService; -import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.basic.*; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.OrderService; @@ -57,20 +55,20 @@ public class InvImportStockService { private SystemParamConfigService systemParamConfigService; @Resource private BasicThirdSysService basicThirdSysService; - + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; final Logger logger = LoggerFactory.getLogger(InvImportStockService.class); @Async - public void updateStock() { + public void updateStock(String thirsysFk) { int page = 1; int limit = 1000; FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); - SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(systemParamConfigEntity.getParamValue()); + BasicThirdSysDetailEntity invPiDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirsysFk); String url; - if (basicThirdSysEntity != null) { - url = basicThirdSysEntity.getInvPiUrl(); + if (invPiDetailEntity != null) { + url = invPiDetailEntity.getValue(); while (true) { filterUdiInfoRequest.setPage(page); filterUdiInfoRequest.setLimit(limit); @@ -78,26 +76,17 @@ public class InvImportStockService { if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) { List stockPrintEntities = new ArrayList<>(); for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { - ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); - erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId()); - List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); - if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { - for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { - StockPrintEntity stockPrintEntity = new StockPrintEntity(); - stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); - stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); - stockPrintEntity.setWarehouseName(onhandQueryResponse.getWarehouseName()); - stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); - stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); - stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); - setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); - } - } else { - StockPrintEntity stockPrintEntity = new StockPrintEntity(); - setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + if ("thirdId".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId", url, stockPrintEntities, udiRelevanceResponse); + } else if ("thirdId1".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId1", url, stockPrintEntities, udiRelevanceResponse); + } else if ("thirdId2".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId2", url, stockPrintEntities, udiRelevanceResponse); + } else if ("thirdId3".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId3", url, stockPrintEntities, udiRelevanceResponse); + } else if ("thirdId4".equals(thirsysFk)) { + generatorPrints(udiRelevanceResponse.getThirdId(), "thirdId4", url, stockPrintEntities, udiRelevanceResponse); } - - } stockPrintService.insertStockPrints(stockPrintEntities); if (udiRelevanceResponses.size() < limit) { @@ -114,6 +103,28 @@ public class InvImportStockService { WebSocketServer.sendInfo("自动更新失败，ERP库存产品信息查询接口地址未定义", "err"); logger.error("ERP库存产品信息查询接口地址未定义！"); } + } + + public void generatorPrints(String inventoryCode, String thirdSysFk, String url, List stockPrintEntities, UdiRelevanceResponse udiRelevanceResponse) { + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCode(inventoryCode); + List uOnhandQueryResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, url); + if (uOnhandQueryResponses != null && uOnhandQueryResponses.size() > 0) { + for (ErpInvProductResponse onhandQueryResponse : uOnhandQueryResponses) { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setBatchNo(onhandQueryResponse.getBatchNo()); + stockPrintEntity.setNnum(onhandQueryResponse.getCount() + ""); + stockPrintEntity.setWarehouseName(onhandQueryResponse.getWarehouseName()); + stockPrintEntity.setWarehouseCode(onhandQueryResponse.getWarehouseCode()); + stockPrintEntity.setExpireDate(onhandQueryResponse.getExpirationDate()); + stockPrintEntity.setProduceDate(onhandQueryResponse.getManufacturingDate()); + stockPrintEntity.setThirdSysFk(thirdSysFk); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } + } else { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + setCommonparams(stockPrintEntity, udiRelevanceResponse, stockPrintEntities); + } } @@ -157,7 +168,6 @@ public class InvImportStockService { stockPrintEntity.setUdiRlIdFk(udiRelevanceResponse.getId() + ""); stockPrintEntity.setYlqxzcrbarmc(udiRelevanceResponse.getYlqxzcrbarmc()); stockPrintEntity.setZczbhhzbapzbh(udiRelevanceResponse.getZczbhhzbapzbh()); - stockPrintEntity.setCodeType("3"); // if (udiRelevanceResponse.getTyshxydm() != null && !udiRelevanceResponse.getTyshxydm().equals("")) { // @@ -226,8 +236,9 @@ public class InvImportStockService { stockPrintEntity.setWarehouseCode(""); } //货位码类型 + //#di#生产日期#失效日期#批次号#序列号#仓位号#货位号 udiCode = "#" + stockPrintEntity.getNameCode() + "#" + stockPrintEntity.getProduceDate() + "#" + stockPrintEntity.getExpireDate() + - "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode(); + "#" + stockPrintEntity.getBatchNo() + "#" + "#" + stockPrintEntity.getWarehouseCode() + "#"; return udiCode; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java index ab55430f..caeaa6fd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock1Task.java @@ -2,7 +2,9 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -23,6 +25,8 @@ public class InvUpdateStock1Task implements SchedulingConfigurer { private InvImportStockService importStockService; @Resource protected ScheduledDao scheduledDao; + @Resource + private SystemParamConfigService systemParamConfigService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -41,7 +45,15 @@ public class InvUpdateStock1Task implements SchedulingConfigurer { private void process() { - logger.info("定时更新下载电子货位卡"); - importStockService.updateStock(); + + + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_update_stockprint"); + if ("1".equals(systemParamConfigEntity.getParamValue())) { + logger.info("定时更新下载电子货位卡"); + SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); + importStockService.updateStock(systemParamConfigEntity1.getParamValue()); + } + + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java index 348caea7..e21b1f03 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/InvUpdateStock2Task.java @@ -2,7 +2,9 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.dao.info.ScheduledDao; import com.glxp.api.admin.entity.info.ScheduledEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.req.info.ScheduledRequest; +import com.glxp.api.admin.service.info.SystemParamConfigService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.EnableScheduling; @@ -23,6 +25,8 @@ public class InvUpdateStock2Task implements SchedulingConfigurer { private InvImportStockService importStockService; @Resource protected ScheduledDao scheduledDao; + @Resource + private SystemParamConfigService systemParamConfigService; @Override public void configureTasks(ScheduledTaskRegistrar scheduledTaskRegistrar) { @@ -41,8 +45,12 @@ public class InvUpdateStock2Task implements SchedulingConfigurer { private void process() { - logger.info("定时更新下载电子货位卡"); - importStockService.updateStock(); + SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_update_stockprint"); + if ("1".equals(systemParamConfigEntity.getParamValue())) { + logger.info("定时更新下载电子货位卡"); + SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi"); + importStockService.updateStock(systemParamConfigEntity1.getParamValue()); + } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java index 006a381a..63dbd01e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoModifyErpTask.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.constant.ConstantType; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.dao.info.ScheduledDao; @@ -65,7 +66,7 @@ public class IoModifyErpTask implements SchedulingConfigurer { } private void process() { - logger.info("定时修改ERP单，定时签字"); + modifyErp(); } @@ -75,6 +76,7 @@ public class IoModifyErpTask implements SchedulingConfigurer { systemParamConfigEntity = systemParamConfigService.selectByParamKey("erpPruchaseModify"); String isErpPruchaseModify = systemParamConfigEntity.getParamValue(); if ("1".equals(isErpSaleOutModify) || "1".equals(isErpPruchaseModify)) { + logger.info("定时修改ERP单，定时签字"); OrderFilterRequest orderFilterRequest = new OrderFilterRequest(); orderFilterRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN); orderFilterRequest.setContrastStatus(ConstantStatus.ORDER_CHECK_SUCCESS); @@ -86,32 +88,36 @@ public class IoModifyErpTask implements SchedulingConfigurer { filterErpOrderRequest.setLimit(100); filterErpOrderRequest.setOrderId(orderEntity.getId()); List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); - - if (bussinessTypResponse.getOrderModifyUrl() != null) { - String url = bussinessTypResponse.getOrderModifyUrl(); - if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { - Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - if ("1".equals(isErpSaleOutModify)) { - BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); - if (baseResponse != null && baseResponse.getCode() == 20000) { - orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl"); + if (basicThirdSysDetailEntity.getEnabled()) { + if (basicThirdSysDetailEntity.getValue() != null) { + String url = basicThirdSysDetailEntity.getValue(); + if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { + Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + if ("1".equals(isErpSaleOutModify)) { + BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + } } - } - } else { - if ("1".equals(isErpPruchaseModify)) { - BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); - if (baseResponse != null && baseResponse.getCode() == 20000) { - orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + } else { + if ("1".equals(isErpPruchaseModify)) { + BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateExportStatus(orderEntity.getId(), ConstantStatus.ORDER_EXPORT_ED); + } } } } + } else { + logger.error("ERP单据修改接口地址未定义"); } - } else { - logger.error("ERP单据修改接口地址未定义"); + }else { + logger.error("ERP单据修改未启用"); } + } } @@ -126,49 +132,56 @@ public class IoModifyErpTask implements SchedulingConfigurer { List signsOrderEntities = orderService.findAllOrders(signFilterRequest); if (signsOrderEntities != null && signsOrderEntities.size() > 0) { for (OrderEntity orderEntity : signsOrderEntities) { - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); - if (bussinessTypResponse != null && bussinessTypResponse.getOrderModifyUrl() != null) { - String url = bussinessTypResponse.getOrderModifyUrl(); - FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); - filterErpOrderRequest.setOrderId(orderEntity.getId()); - List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); - if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { - Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); - if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { - if ("1".equals(isSaleOutSign)) { - if (listMap != null && listMap.size() > 0) { - for (String key : listMap.keySet()) { - ERPPostBillRequest signRequest = new ERPPostBillRequest(); - signRequest.setBillNo(key); - signRequest.setBillAction(orderEntity.getAction()); - signRequest.setModifyType("sign"); - BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); - if (baseResponse != null && baseResponse.getCode() == 20000) { - orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl"); + if (basicThirdSysDetailEntity.getEnabled()) { + if (basicThirdSysDetailEntity.getValue() != null) { + String url = basicThirdSysDetailEntity.getValue(); + FilterErpOrderRequest filterErpOrderRequest = new FilterErpOrderRequest(); + filterErpOrderRequest.setOrderId(orderEntity.getId()); + List erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest); + if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) { + Map> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId)); + if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) { + if ("1".equals(isSaleOutSign)) { + if (listMap != null && listMap.size() > 0) { + for (String key : listMap.keySet()) { + ERPPostBillRequest signRequest = new ERPPostBillRequest(); + signRequest.setBillNo(key); + signRequest.setBillAction(orderEntity.getAction()); + signRequest.setModifyType("sign"); + BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + } } } } - } - } else { - if ("1".equals(isPruchaseSign)) { - if (listMap != null && listMap.size() > 0) { - for (String key : listMap.keySet()) { - ERPPostBillRequest signRequest = new ERPPostBillRequest(); - signRequest.setBillNo(key); - signRequest.setBillAction(orderEntity.getAction()); - signRequest.setModifyType("sign"); - BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); - if (baseResponse != null && baseResponse.getCode() == 20000) { - orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + } else { + if ("1".equals(isPruchaseSign)) { + if (listMap != null && listMap.size() > 0) { + for (String key : listMap.keySet()) { + ERPPostBillRequest signRequest = new ERPPostBillRequest(); + signRequest.setBillNo(key); + signRequest.setBillAction(orderEntity.getAction()); + signRequest.setModifyType("sign"); + BaseResponse baseResponse = new ErpOrderClient().postBill(signRequest, url); + if (baseResponse != null && baseResponse.getCode() == 20000) { + orderService.updateSignStatus(orderEntity.getId(), ConstantStatus.ORDER_SIGN_ED); + } } } } } } + } else { + logger.error("ERP单据修改接口地址未定义"); } - } else { - logger.error("ERP单据修改接口地址未定义"); + }else { + logger.error("ERP单据修改未启用"); } + + } } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index d0efe8f7..329f0505 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.DataTransUtil; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; @@ -185,44 +186,55 @@ public class IoTransInoutService { List erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk()); List transData = warehouseService.findByReceiptId(orderEntity.getId()); if (erpIds != null && erpIds.size() > 0) { - BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction()); - if (bussinessTypResponse == null || bussinessTypResponse.getOrderQueryUrl() == null) { - orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderEntity.setRemark("获取ERP出入库单据接口地址未定义"); - orderService.updateOrder(orderEntity); - } else { - String erpOrderUrl = bussinessTypResponse.getOrderQueryUrl(); - List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction()); - if (cloudErps != null && cloudErps.size() > 0) { - List returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId()); - ErpOrderEntity temp = returnOrders.get(0); - for (int i = 0; i < returnOrders.size(); i++) { - if (!temp.getCompanyname().equals(returnOrders.get(i).getCompanyname())) { - orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderEntity.setRemark("选择Erp订单往来单位不一致"); - orderService.updateOrder(orderEntity); - return; - } - } - myErpOrderService.deleteByOrderId(orderEntity.getId()); - myErpOrderService.insertErpOrders(returnOrders); - new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService); - } else { + + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(orderEntity.getAction(), "orderQueryUrl"); + if (basicThirdSysDetailEntity.getEnabled()) { + if (basicThirdSysDetailEntity.getValue() == null) { orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderEntity.setRemark("获取ERP出入库单据失败"); + orderEntity.setRemark("获取ERP出入库单据接口地址未定义"); orderService.updateOrder(orderEntity); - myErpOrderService.deleteByOrderId(orderEntity.getId()); - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + } else { + String erpOrderUrl = basicThirdSysDetailEntity.getValue(); + List cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction()); + if (cloudErps != null && cloudErps.size() > 0) { + List returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId()); + ErpOrderEntity temp = returnOrders.get(0); + for (int i = 0; i < returnOrders.size(); i++) { + if (!temp.getCompanyname().equals(returnOrders.get(i).getCompanyname())) { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("选择Erp订单往来单位不一致"); + orderService.updateOrder(orderEntity); + return; + } + } + myErpOrderService.deleteByOrderId(orderEntity.getId()); + myErpOrderService.insertErpOrders(returnOrders); + new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService); + } else { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("获取ERP出入库单据失败"); + orderService.updateOrder(orderEntity); + myErpOrderService.deleteByOrderId(orderEntity.getId()); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + } } + }else { + orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); + orderEntity.setRemark("第三方出入库单据未启用"); + orderService.updateOrder(orderEntity); + myErpOrderService.deleteByOrderId(orderEntity.getId()); + new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } + } else { orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); - orderEntity.setRemark("未选入ERP单据进行校验，请手动选择"); + orderEntity.setRemark("未选入第三方出入库单据进行校验，请手动选择"); orderService.updateOrder(orderEntity); myErpOrderService.deleteByOrderId(orderEntity.getId()); new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); @@ -244,7 +256,7 @@ public class IoTransInoutService { public void repeatCheck(String orderId) { OrderEntity orderEntity = orderService.findById(orderId); checkOrder(orderEntity); - WebSocketServer.sendInfo("单据:"+orderId+"校验已完成，请刷新查看！", null); + WebSocketServer.sendInfo("单据:" + orderId + "校验已完成，请刷新查看！", null); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java new file mode 100644 index 00000000..394c8426 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java @@ -0,0 +1,81 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrCorpService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ThrCorpsDlService { + + @Resource + ThrCorpService thrCorpService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + RedisUtil redisUtil; + + @Async + public void importCorps(String thirdSys) { + BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("corpUrl", thirdSys); + if (piDetailEntity == null || piDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("往来单位接口未设置！", "sid"); + return; + } + int page = 1; + int limit = 100; + while (page != -1) { + page = getCorps(page, limit, piDetailEntity.getValue()); + } + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("往来单位信息下载已完成，请刷新查看！", "sid"); + } + + + public int getCorps(int page, int limit, String corpUrl) { + BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); + basicUnitMaintainFilterRequest.setPage(page); + basicUnitMaintainFilterRequest.setLimit(limit); + BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); + List erpUnitsResponses = erpCrops.getData().getList(); + if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) { + List thrCorpEntities = erpUnitsResponses.stream().map( + item -> { + ThrCorpEntity thrProductsEntity = new ThrCorpEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setUnitId(item.getId()); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrCorpService.insertThrCorpss(thrCorpEntities); + page++; + if (page * limit < erpCrops.getData().getTotal()) { + return page; + } + } else { + return -1; + } + return -1; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java new file mode 100644 index 00000000..1ccec958 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrInvProductsDlService.java @@ -0,0 +1,82 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.httpclient.ErpInvClient; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.res.inventory.ErpInvProductResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ThrInvProductsDlService { + + @Resource + ThrInvProductsService thrInvProductsService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + RedisUtil redisUtil; + + @Async + public void importProducrs(String thirdSys) { + BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("invPiUrl", thirdSys); + if (piDetailEntity == null || piDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("库存产品信息接口未设置！", "sid"); + return; + } + int page = 1; + int limit = 100; + while (page != -1) { + page = getInvmandoc(page, limit, piDetailEntity.getValue()); + } + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("库存产品信息下载已完成，请刷新查看！", "sid"); + } + + + public int getInvmandoc(int page, int limit, String productUrl) { + + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setPage(page); + erpOnhandRequest.setLimit(limit); + + BaseResponse> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(erpOnhandRequest, productUrl); + List erpInvProductResponses = responseBaseResponse.getData().getList(); + if (erpInvProductResponses != null && erpInvProductResponses.size() > 0) { + List thrProductsEntities = erpInvProductResponses.stream().map( + item -> { + ThrInvProductsEntity thrProductsEntity = new ThrInvProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrInvProductsService.insertThrInvProducts(thrProductsEntities); + page++; + if (page * limit < responseBaseResponse.getData().getTotal()) { + return page; + } + } else { + return -1; + } + + return -1; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java new file mode 100644 index 00000000..f320bf17 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java @@ -0,0 +1,95 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; +import com.glxp.api.admin.req.inout.FilterOrderRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpUnitsResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; +import com.glxp.api.admin.service.thrsys.ThrOrderService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ThrOrdersDlService { + @Resource + ThrOrderService thrOrderService; + @Resource + ThrOrderDetailService thrOrderDetailService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + RedisUtil redisUtil; + @Resource + BussinessTypeService bussinessTypeService; + + @Async + public void importOrders(String action) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(action, "orderQueryUrl"); + + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("业务单据查询接口未设置！", "sid"); + return; + } + int page = 1; + int limit = 100; + while (page != -1) { + page = getOrders(page, limit, basicThirdSysDetailEntity.getValue(), basicThirdSysDetailEntity.getThirdSysFk()); + } + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("业务单据信息下载已完成，请刷新查看！", "sid"); + } + + + public int getOrders(int page, int limit, String orderUrl, String thirdSys) { + FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); + filterOrderRequest.setPage(page); + filterOrderRequest.setLimit(limit); + BaseResponse> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest); + List erpOrderResponses = responseBaseResponse.getData().getList(); + if (erpOrderResponses != null && erpOrderResponses.size() > 0) { + for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { + ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); + BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); + thrOrderEntity.setThirdSysFk(thirdSys); + thrOrderService.insertThrOrder(thrOrderEntity); + List thrOrderDetailEntities = new ArrayList<>(); + for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { + ThrOrderDetailEntity thrOrderDetailEntity = new ThrOrderDetailEntity(); + BeanUtils.copyProperties(subPurchase, thrOrderEntity); + thrOrderDetailEntities.add(thrOrderDetailEntity); + } + thrOrderDetailService.insertThrOrderDetails(thrOrderDetailEntities); + } + page++; + if (page * limit < responseBaseResponse.getData().getTotal()) { + return page; + } + } else { + return -1; + } + return -1; + } + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java new file mode 100644 index 00000000..2b42ce70 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java @@ -0,0 +1,76 @@ +package com.glxp.api.admin.thread; + +import com.glxp.api.admin.config.WebSocketServer; +import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; +import com.glxp.api.admin.httpclient.ErpBasicClient; +import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.ErpProductsResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.thrsys.ThrProductsService; +import com.glxp.api.admin.util.Constant; +import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ThrProductsDlService { + @Resource + ThrProductsService thrProductsService; + @Resource + BasicThirdSysDetailService basicThirdSysDetailService; + @Resource + RedisUtil redisUtil; + + @Async + public void importProducrs(String thirdSys) { + BasicThirdSysDetailEntity piDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", thirdSys); + if (piDetailEntity == null || piDetailEntity.getValue() == null) { + WebSocketServer.sendInfo("产品信息接口未设置！", "sid"); + return; + } + int page = 1; + int limit = 100; + while (page != -1) { + page = getInvmandoc(page, limit, piDetailEntity.getValue()); + } + redisUtil.set(Constant.dlThrProducts, "false"); + WebSocketServer.sendInfo("产品信息下载已完成，请刷新查看！", "sid"); + } + + + public int getInvmandoc(int page, int limit, String productUrl) { + + FilterErpGoodsRequest filterErpGoodsRequest = new FilterErpGoodsRequest(); + filterErpGoodsRequest.setPage(page); + filterErpGoodsRequest.setLimit(limit); + BaseResponse> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl); + List erpProductsResponses = erpProducts.getData().getList(); + if (erpProductsResponses != null && erpProductsResponses.size() > 0) { + List thrProductsEntities = erpProductsResponses.stream().map( + item -> { + ThrProductsEntity thrProductsEntity = new ThrProductsEntity(); + BeanUtils.copyProperties(item, thrProductsEntity); + return thrProductsEntity; + } + ).collect(Collectors.toList()); + thrProductsService.insertThrProductss(thrProductsEntities); + page++; + if (page * limit < erpProducts.getData().getTotal()) { + return page; + } + } else { + return -1; + } + + return -1; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/Constant.java b/api-admin/src/main/java/com/glxp/api/admin/util/Constant.java new file mode 100644 index 00000000..2aa81f95 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/Constant.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.util; + +public class Constant { + + public static final String dlThrProducts = "THR_DOWNLOAD_PRODUCTS"; + public static final String dlThrInvProducts = "THR_DOWNLOAD_INV_PRODUCTS"; + public static final String dlThrOrders = "THR_DOWNLOAD_ORDERS"; + public static final String dlThrCorps = "THR_DOWNLOAD_CORPS"; + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java new file mode 100644 index 00000000..0d35a081 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/RedisUtil.java @@ -0,0 +1,577 @@ +package com.glxp.api.admin.util; + + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +/** + * redisTemplate封装 + * + * @author zjjlive@dist.com.cn + */ +@Component +public class RedisUtil { + + @Autowired + private RedisTemplate redisTemplate; + + public RedisUtil(RedisTemplate redisTemplate) { + this.redisTemplate = redisTemplate; + } + + /** + * 指定缓存失效时间 + * + * @param key 键 + * @param time 时间(秒) + * @return + */ + public boolean expire(String key, long time) { + try { + if (time > 0) { + redisTemplate.expire(key, time, TimeUnit.SECONDS); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 根据key 获取过期时间 + * + * @param key 键 不能为null + * @return 时间(秒) 返回0代表为永久有效 + */ + public long getExpire(String key) { + return redisTemplate.getExpire(key, TimeUnit.SECONDS); + } + + /** + * 判断key是否存在 + * + * @param key 键 + * @return true 存在 false不存在 + */ + public boolean hasKey(String key) { + try { + return redisTemplate.hasKey(key); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 删除缓存 + * + * @param key 可以传一个值 或多个 + */ + @SuppressWarnings("unchecked") + public void del(String... key) { + if (key != null && key.length > 0) { + if (key.length == 1) { + redisTemplate.delete(key[0]); + } else { + redisTemplate.delete(CollectionUtils.arrayToList(key)); + } + } + } + + //============================String============================= + + /** + * 普通缓存获取 + * + * @param key 键 + * @return 值 + */ + public Object get(String key) { + return key == null ? null : redisTemplate.opsForValue().get(key); + } + + /** + * 普通缓存放入 + * + * @param key 键 + * @param value 值 + * @return true成功 false失败 + */ + public boolean set(String key, Object value) { + try { + redisTemplate.opsForValue().set(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 普通缓存放入并设置时间 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) time要大于0 如果time小于等于0 将设置无限期 + * @return true成功 false 失败 + */ + public boolean set(String key, Object value, long time) { + try { + if (time > 0) { + redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS); + } else { + set(key, value); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 递增 + * + * @param key 键 + * @param delta 要增加几(大于0) + * @return + */ + public long incr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递增因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, delta); + } + + /** + * 递减 + * + * @param key 键 + * @param delta 要减少几(小于0) + * @return + */ + public long decr(String key, long delta) { + if (delta < 0) { + throw new RuntimeException("递减因子必须大于0"); + } + return redisTemplate.opsForValue().increment(key, -delta); + } + + //================================Map================================= + + /** + * HashGet + * + * @param key 键 不能为null + * @param item 项 不能为null + * @return 值 + */ + public Object hget(String key, String item) { + return redisTemplate.opsForHash().get(key, item); + } + + /** + * 获取hashKey对应的所有键值 + * + * @param key 键 + * @return 对应的多个键值 + */ + public Map hmget(String key) { + return redisTemplate.opsForHash().entries(key); + } + + /** + * HashSet + * + * @param key 键 + * @param map 对应多个键值 + * @return true 成功 false 失败 + */ + public boolean hmset(String key, Map map) { + try { + redisTemplate.opsForHash().putAll(key, map); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * HashSet 并设置时间 + * + * @param key 键 + * @param map 对应多个键值 + * @param time 时间(秒) + * @return true成功 false失败 + */ + public boolean hmset(String key, Map map, long time) { + try { + redisTemplate.opsForHash().putAll(key, map); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value) { + try { + redisTemplate.opsForHash().put(key, item, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 向一张hash表中放入数据,如果不存在将创建 + * + * @param key 键 + * @param item 项 + * @param value 值 + * @param time 时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间 + * @return true 成功 false失败 + */ + public boolean hset(String key, String item, Object value, long time) { + try { + redisTemplate.opsForHash().put(key, item, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 删除hash表中的值 + * + * @param key 键 不能为null + * @param item 项 可以使多个 不能为null + */ + public void hdel(String key, Object... item) { + redisTemplate.opsForHash().delete(key, item); + } + + /** + * 判断hash表中是否有该项的值 + * + * @param key 键 不能为null + * @param item 项 不能为null + * @return true 存在 false不存在 + */ + public boolean hHasKey(String key, String item) { + return redisTemplate.opsForHash().hasKey(key, item); + } + + /** + * hash递增 如果不存在,就会创建一个 并把新增后的值返回 + * + * @param key 键 + * @param item 项 + * @param by 要增加几(大于0) + * @return + */ + public double hincr(String key, String item, double by) { + return redisTemplate.opsForHash().increment(key, item, by); + } + + /** + * hash递减 + * + * @param key 键 + * @param item 项 + * @param by 要减少记(小于0) + * @return + */ + public double hdecr(String key, String item, double by) { + return redisTemplate.opsForHash().increment(key, item, -by); + } + + //============================set============================= + + /** + * 根据key获取Set中的所有值 + * + * @param key 键 + * @return + */ + public Set sGet(String key) { + try { + return redisTemplate.opsForSet().members(key); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 根据value从一个set中查询,是否存在 + * + * @param key 键 + * @param value 值 + * @return true 存在 false不存在 + */ + public boolean sHasKey(String key, Object value) { + try { + return redisTemplate.opsForSet().isMember(key, value); + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将数据放入set缓存 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 成功个数 + */ + public long sSet(String key, Object... values) { + try { + return redisTemplate.opsForSet().add(key, values); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 将set数据放入缓存 + * + * @param key 键 + * @param time 时间(秒) + * @param values 值 可以是多个 + * @return 成功个数 + */ + public long sSetAndTime(String key, long time, Object... values) { + try { + Long count = redisTemplate.opsForSet().add(key, values); + if (time > 0) { + expire(key, time); + } + return count; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 获取set缓存的长度 + * + * @param key 键 + * @return + */ + public long sGetSetSize(String key) { + try { + return redisTemplate.opsForSet().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 移除值为value的 + * + * @param key 键 + * @param values 值 可以是多个 + * @return 移除的个数 + */ + public long setRemove(String key, Object... values) { + try { + Long count = redisTemplate.opsForSet().remove(key, values); + return count; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + //===============================list================================= + + /** + * 获取list缓存的内容 + * + * @param key 键 + * @param start 开始 + * @param end 结束 0 到 -1代表所有值 + * @return + */ + public List lGet(String key, long start, long end) { + try { + return redisTemplate.opsForList().range(key, start, end); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 获取list缓存的长度 + * + * @param key 键 + * @return + */ + public long lGetListSize(String key) { + try { + return redisTemplate.opsForList().size(key); + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + + /** + * 通过索引 获取list中的值 + * + * @param key 键 + * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推 + * @return + */ + public Object lGetIndex(String key, long index) { + try { + return redisTemplate.opsForList().index(key, index); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @return + */ + public boolean lSet(String key, Object value) { + try { + redisTemplate.opsForList().rightPush(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + public boolean lSet(String key, Object value, long time) { + try { + redisTemplate.opsForList().rightPush(key, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @return + */ + public boolean lSet(String key, List value) { + try { + redisTemplate.opsForList().rightPushAll(key, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 将list放入缓存 + * + * @param key 键 + * @param value 值 + * @param time 时间(秒) + * @return + */ + public boolean lSet(String key, List value, long time) { + try { + redisTemplate.opsForList().rightPushAll(key, value); + if (time > 0) { + expire(key, time); + } + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 根据索引修改list中的某条数据 + * + * @param key 键 + * @param index 索引 + * @param value 值 + * @return + */ + public boolean lUpdateIndex(String key, long index, Object value) { + try { + redisTemplate.opsForList().set(key, index, value); + return true; + } catch (Exception e) { + e.printStackTrace(); + return false; + } + } + + /** + * 移除N个值为value + * + * @param key 键 + * @param count 移除多少个 + * @param value 值 + * @return 移除的个数 + */ + public long lRemove(String key, long count, Object value) { + try { + Long remove = redisTemplate.opsForList().remove(key, count, value); + return remove; + } catch (Exception e) { + e.printStackTrace(); + return 0; + } + } + +} diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index f47c0e2c..3a124e7b 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -19,5 +19,27 @@ logging.file=D:/udi.log #UDI数据下载 UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server +##端口号 + +# Redis数据库索引（默认为0） +spring.redis.database=0 +# Redis服务器地址 +spring.redis.host=127.0.0.1 +# Redis服务器连接端口 +spring.redis.port=6379 +# Redis服务器连接密码（默认为空） +spring.redis.password= +#连接池最大连接数（使用负值表示没有限制） +spring.redis.jedis.pool.max-active=8 +# 连接池最大阻塞等待时间（使用负值表示没有限制） +spring.redis.jedis.pool.max-wait=-1 +# 连接池中的最大空闲连接 +spring.redis.jedis.pool.max-idle=8 +# 连接池中的最小空闲连接 +spring.redis.jedis.pool.min-idle=0 +# 连接超时时间（毫秒） +spring.redis.jedis.timeout=300 + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index 98247e04..6e8ed8b3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -5,26 +5,15 @@ UPDATE basic_third_sys - + thirdId=#{thirdId}, thirdName=#{thirdName}, - piQueryUrl=#{piQueryUrl}, - piQueryEnabled=#{piQueryEnabled}, - orderQueryUrl=#{orderQueryUrl}, - orderQueryEnabled=#{orderQueryEnabled}, - orderAddUrl=#{orderAddUrl}, - orderAddEnabled=#{orderAddEnabled}, - orderDeleteUrl=#{orderDeleteUrl}, - orderDeleteEnabled=#{orderDeleteEnabled}, - orderModifyUrl=#{orderModifyUrl}, - orderModifyEnabled=#{orderModifyEnabled}, - invPiUrl=#{invPiUrl}, - invPiEnabled=#{invPiEnabled}, - corpUrl=#{corpUrl}, - corpEnabled=#{corpEnabled}, + guideUrl=#{guideUrl}, remark=#{remark}, + thridUrl=#{thridUrl}, enabled=#{enabled}, - + mainSys=#{mainSys}, + WHERE id=#{id} @@ -41,8 +30,10 @@ AND enabled = #{enabled} + + AND mainSys = #{mainSys} + - + SELECT * FROM basic_third_sys_detail + + + AND basic_third_sys_detail.key = #{key} + + + AND thirdSysFk = #{thirdSysFk} + + + + + + \ No newline at end of file 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 8d7aa77a..befdd711 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -11,7 +11,12 @@ and name like concat('%',#{key},'%') or spell like concat('%',#{key},'%') or erpId like concat('%',#{key},'%') - + + AND id = #{id} + + + AND unitId = #{unitId} + @@ -22,7 +27,8 @@ parameterType="com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity"> INSERT INTO basic_corp (thirdId,erpId,name,spell, - addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4) + addr,status,type,creditNo,contact,mobile,thirdId1,thirdId2,thirdId3,thirdId4, + thirdName,thirdName1,thirdName2,thirdName3,thirdName4) values ( #{thirdId}, @@ -34,7 +40,8 @@ #{type}, #{creditNo}, #{contact}, - #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4} + #{mobile},#{thirdId1},#{thirdId2},#{thirdId3},#{thirdId4}, + #{thirdName},#{thirdName1},#{thirdName2},#{thirdName3},#{thirdName4} ) @@ -56,6 +63,11 @@ thirdId2=#{thirdId2}, thirdId3=#{thirdId3}, thirdId4=#{thirdId4}, + thirdName=#{thirdName}, + thirdName1=#{thirdName1}, + thirdName2=#{thirdName2}, + thirdName3=#{thirdName3}, + thirdName4=#{thirdName4}, WHERE id=#{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 18e30a35..f04ce39b 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -37,7 +37,7 @@ @@ -126,7 +126,7 @@ UPDATE basic_products - + packRatio=#{packRatio}, packLevel=#{packLevel}, bhxjsl=#{bhxjsl}, @@ -147,8 +147,12 @@ uuid=#{uuid}, sjcpbm=#{sjcpbm}, versionNumber=#{versionNumber}, + sptm=#{sptm}, + manufactory=#{manufactory}, + ybbm=#{ybbm}, + measname=#{measname}, diType=#{diType}, - + WHERE nameCode = #{nameCode} \ No newline at end of file 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 7644c1d5..e7d085f1 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -10,7 +10,7 @@ basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, - basic_udirel.ybbm,basic_udirel.sptm, + basic_udirel.manufactory,basic_udirel.measname, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel, basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl, basic_products.bhxjcpbm,basic_products.bzcj, @@ -54,7 +54,7 @@ basic_udirel.thirdId,basic_udirel.thirdName,basic_udirel.isUseDy, basic_udirel.thirdId1,basic_udirel.thirdId2,basic_udirel.thirdId3,basic_udirel.thirdId4, basic_udirel.thirdName1,basic_udirel.thirdName2,basic_udirel.thirdName3,basic_udirel.thirdName4, - basic_udirel.ybbm,basic_udirel.sptm, + basic_udirel.manufactory,basic_udirel.measname, basic_products.nameCode,basic_products.packRatio,basic_products.packLevel,basic_products.bhxjsl,basic_products.bhzxxsbzsl,basic_products.zxxsbzbhsydysl,basic_products.bhxjcpbm,basic_products.bzcj,basic_products.addType,basic_products.deviceRecordKey,basic_products.cpmctymc,basic_products.cplb,basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm,basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc,basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType FROM basic_products right JOIN basic_udirel @@ -76,7 +76,7 @@ AND thirdId = #{thirdId} - group by thirdId + group by uuid ORDER BY updateTime DESC @@ -105,7 +105,7 @@ replace INTO basic_udirel ( thirdId,thirdName,uuid,isUseDy,updateTime, - thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,ybbm,sptm + thirdId1,thirdId2,thirdId3,thirdId4,thirdName1,thirdName2,thirdName3,thirdName4,manufactory,measname ) values ( @@ -116,7 +116,7 @@ #{updateTime}, #{thirdId1}, #{thirdId2}, #{thirdId3}, #{thirdId4}, #{thirdName1}, #{thirdName2}, #{thirdName3}, #{thirdName4}, - #{ybbm}, #{sptm} + #{manufactory}, #{measname} ) @@ -149,8 +149,8 @@ thirdName2=#{thirdName2}, thirdName3=#{thirdName3}, thirdName4=#{thirdName4}, - ybbm=#{ybbm}, - sptm=#{sptm}, + manufactory=#{manufactory}, + measname=#{measname}, updateTime=#{updateTime} WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml index 36ab4d15..465a0ef8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UnitMaintainDao.xml @@ -3,7 +3,7 @@ - + SELECT * FROM sys_thirdsys_api + + + + UPDATE sys_thirdsys_api SET + name = #{name}, + apiUrl = #{apiUrl}, + guideUrl = #{guideUrl}, + remark = #{remark} + where id = #{id} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml new file mode 100644 index 00000000..3fbf5f58 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InCodeLogDao.xml @@ -0,0 +1,56 @@ + + + + + + + + + + insert INTO inv_incode_log + (genKey,fromType,updateTime,thirdSysFk,status) + values + ( + #{genKey}, + #{fromType}, + #{updateTime}, + #{thirdSysFk},#{status} + ) + + + + + DELETE FROM inv_incode_log WHERE id = #{id} + + + + UPDATE inv_incode_log + + genKey=#{genKey}, + fromType=#{fromType}, + updateTime=#{updateTime}, + thirdSysFk=#{thirdSysFk}, + status=#{status}, + + WHERE id = #{id} + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml index 0f311022..283e4c49 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -26,6 +26,13 @@ AND thirdId = #{thirdId} + + AND thirdSysFk = #{thirdSysFk} + + + AND genKeyFk = #{genKeyFk} + + @@ -46,7 +53,7 @@ ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk ) values ( @@ -65,7 +72,7 @@ #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{warehouseName}, - #{warehouseCode} + #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk} ) @@ -74,7 +81,7 @@ ( udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode + ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk ) values @@ -96,7 +103,7 @@ #{item.ylqxzcrbarmc}, #{item.zczbhhzbapzbh}, #{item.warehouseName}, - #{item.warehouseCode} + #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk} ) @@ -105,9 +112,13 @@ DELETE FROM inv_stockprint WHERE id = #{id} + + DELETE FROM inv_stockprint WHERE genKey = #{genKey} + + UPDATE inv_stockprint - + udiCode=#{udiCode}, udiRlIdFk=#{udiRlIdFk}, nameCode=#{nameCode}, @@ -125,8 +136,11 @@ zczbhhzbapzbh=#{zczbhhzbapzbh}, warehouseName=#{warehouseName}, warehouseCode=#{warehouseCode}, + spaceCode=#{spaceCode}, + spaceName=#{spaceName}, + genKeyFk=#{genKeyFk}, - + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index e610daae..8efd2bed 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -66,7 +66,9 @@ DELETE FROM thr_corp WHERE id = #{id} - + + DELETE FROM thr_corp + UPDATE thr_corp diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 9bd0e598..f2ad8451 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -7,11 +7,12 @@ resultType="com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity"> SELECT * FROM thr_inv_products + - AND inventoryCode = #{inventoryCode} + AND inventoryCode LIKE concat(#{inventoryCode},'%') - AND inventoryName = #{inventoryName} + AND inventoryName LIKE concat(#{inventoryName},'%') AND thirdSysFk = #{thirdSysFk} @@ -27,14 +28,14 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName ) values ( #{inventoryCode}, #{inventoryName}, #{count}, #{spec}, #{warehouseName}, #{warehouseCode}, #{registerCertNo}, #{manufacturingDate}, #{expirationDate}, - #{thirdSysFk} + #{thirdSysFk},#{batchNo},#{spaceCode},,#{spaceName} ) @@ -43,7 +44,7 @@ ( inventoryCode,inventoryName,count,spec, warehouseName,warehouseCode,registerCertNo,manufacturingDate, - expirationDate,thirdSysFk + expirationDate,thirdSysFk,batchNo,spaceCode,spaceName ) values @@ -53,7 +54,7 @@ #{item.inventoryCode}, #{item.inventoryName}, #{item.count}, #{item.spec}, #{item.warehouseName}, #{item.warehouseCode}, #{item.registerCertNo}, #{item.manufacturingDate}, #{item.expirationDate}, - #{item.thirdSysFk} + #{item.thirdSysFk},#{item.batchNo},#{item.spaceCode},,#{item.spaceName} ) @@ -62,6 +63,11 @@ DELETE FROM thr_inv_products WHERE id = #{id} + + + DELETE FROM thr_inv_products + + UPDATE thr_inv_products @@ -75,6 +81,8 @@ registerCertNo=#{registerCertNo}, manufacturingDate=#{manufacturingDate}, expirationDate=#{expirationDate}, + spaceCode=#{spaceCode}, + spaceName=#{spaceName}, thirdSysFk=#{thirdSysFk}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml index 10f13e86..b08970b8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml @@ -7,15 +7,27 @@ resultType="com.glxp.api.admin.entity.thrsys.ThrOrderEntity"> SELECT * FROM thr_order - - AND unitId = #{unitId} + + AND billNo = #{billNo} - - AND name = #{name} + + AND id = #{id} + + + AND billType = #{billAction} + + + AND billFlag = #{billFlag} AND thirdSysFk = #{thirdSysFk} + + = DATE_FORMAT(#{startDate}, '%Y-%m-%d') ]]> + + + + @@ -63,6 +75,10 @@ DELETE FROM thr_order WHERE id = #{id} + + DELETE FROM thr_order + + UPDATE thr_order diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml index 0716d68b..102ca311 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDetailDao.xml @@ -52,6 +52,9 @@ DELETE FROM thr_order_detail WHERE id = #{id} + + DELETE FROM thr_order_detail WHERE orderIdFk = #{orderIdFk} + UPDATE thr_order_detail @@ -70,5 +73,8 @@ WHERE id = #{id} + + DELETE FROM thr_order_detail + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml index 004d64be..6b0a5734 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml @@ -21,7 +21,9 @@ replace INTO thr_products ( - code,name,measname,spec,registerNo,manufactory,thirdSysFk + code,name,measname,spec,registerNo,manufactory, + cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, + thirdSysFk ) values ( @@ -31,14 +33,18 @@ #{spec}, #{registerNo}, #{manufactory}, + #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm}, + #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms} #{thirdSysFk} ) - + replace INTO thr_products ( - code,name,measname,spec,registerNo,manufactory,thirdSysFk + code,name,measname,spec,registerNo,manufactory, + cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms, + thirdSysFk ) values @@ -51,6 +57,8 @@ #{item.spec}, #{item.registerNo}, #{item.manufactory}, + #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm}, + #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms}, #{item.thirdSysFk} ) @@ -60,7 +68,7 @@ DELETE FROM thr_products WHERE id = #{id} - + UPDATE thr_products code=#{code}, @@ -68,11 +76,23 @@ measname=#{measname}, spec=#{spec}, registerNo=#{registerNo}, + cplb=#{cplb}, + flbm=#{flbm}, + qxlb=#{qxlb}, + ybbm=#{ybbm}, + sptm=#{sptm}, + tyshxydm=#{tyshxydm}, + zczbhhzbapzbh=#{zczbhhzbapzbh}, + ylqxzcrbarmc=#{ylqxzcrbarmc}, + ylqxzcrbarywmc=#{ylqxzcrbarywmc}, manufactory=#{manufactory}, + cpms=#{cpms}, thirdSysFk=#{thirdSysFk}, WHERE id = #{id} - + + DELETE FROM thr_products + \ No newline at end of file