阶段性代码备份,

master
anthonywj 4 years ago
parent 07d04c4101
commit 8842f864bf

@ -160,6 +160,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
</dependencies>
<build>

@ -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<String, Object> redisTemplate(RedisConnectionFactory factory) {
RedisTemplate<String, Object> 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<String, String, Object> hashOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForHash();
}
/**
* redis
*
* @param redisTemplate
* @return
*/
@Bean
public ValueOperations<String, Object> valueOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForValue();
}
/**
*
*
* @param redisTemplate
* @return
*/
@Bean
public ListOperations<String, Object> listOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForList();
}
/**
*
*
* @param redisTemplate
* @return
*/
@Bean
public SetOperations<String, Object> setOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForSet();
}
/**
*
*
* @param redisTemplate
* @return
*/
@Bean
public ZSetOperations<String, Object> zSetOperations(RedisTemplate<String, Object> redisTemplate) {
return redisTemplate.opsForZSet();
}
}

@ -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,10 +30,15 @@ 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,
public BaseResponse filter(FilterBasicThirdSysRequest filterBasicThirdSysRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -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<BasicThirdSysEntity> 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<BasicThirdSysDetailEntity> basicThirdSysEntities;
basicThirdSysEntities = basicThirdSysDetailService.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest);
PageInfo<BasicThirdSysDetailEntity> pageInfo;
pageInfo = new PageInfo<>(basicThirdSysEntities);
PageSimpleResponse<BasicThirdSysDetailEntity> 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("更新成功");
}
}

@ -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, "往来单位接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled() && !basicThirdSysDetailEntity.getItrCache()) {
BaseResponse<PageSimpleResponse<ErpUnitsResponse>> udiDlDeviceResponse =
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysEntity.getCorpUrl());
new ErpBasicClient().getErpCrop(unitMaintainFilterRequest, basicThirdSysDetailEntity.getValue());
return udiDlDeviceResponse;
} else {
FilterThrCorpRequest filterThrCorpRequest = new FilterThrCorpRequest();
BeanUtils.copyProperties(unitMaintainFilterRequest, filterThrCorpRequest);
filterThrCorpRequest.setThirdSysFk(unitMaintainFilterRequest.getThirdSys());
List<ThrCorpEntity> thrCorpEntities
= thrCorpService.filterThrCorps(filterThrCorpRequest);
List<ThrCorpEntity> thrCorpEntityList = thrCorpEntities.stream().map(item ->
{
ThrCorpEntity thrCorpEntity = new ThrCorpEntity();
BeanUtils.copyProperties(item, thrCorpEntity);
thrCorpEntity.setId(item.getUnitId());
return thrCorpEntity;
}).collect(Collectors.toList());
PageInfo<ThrCorpEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntityList);
PageSimpleResponse<ThrCorpEntity> 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<BasicThirdSysEntity> basicThirdSysEntities = basicThirdSysService.filterBasicThiSys(filterBasicThirdSysRequest);
List<BasicProductThirdSysResponse> 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<BasicProductThirdSysResponse> pageInfo;
pageInfo = new PageInfo<>(basicProductThirdSysResponses);
PageSimpleResponse<BasicProductThirdSysResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicProductThirdSysResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
if (thirdId.equals(basicThirdSysEntity.getThirdId())) {
return basicThirdSysEntity;
}
}
}
return null;
}
}

@ -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,13 +99,15 @@ 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产品信息接口地址未定义");
if (basicThirdSysDetailEntity.getEnabled() &&!basicThirdSysDetailEntity.getItrCache()) {
ErpBasicClient erpBasicHttpClient = new ErpBasicClient();
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysEntity.getPiQueryUrl());
BaseResponse<PageSimpleResponse<ErpProductsResponse>> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue());
if (udiDlDeviceResponse.getCode() == 20000) {
List<ErpProductsResponse> invmandocResponses = udiDlDeviceResponse.getData().getList();
if(invmandocResponses != null){
for (ErpProductsResponse invmandocResponse : invmandocResponses) {
UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(invmandocResponse.getCode());
invmandocResponse.setThirdSys(filterErpGoodsRequest.getThirdSys());
@ -113,7 +118,22 @@ public class UdiInfoController {
}
}
}
}
return udiDlDeviceResponse;
} else {
FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
List<ThrProductsEntity> thrCorpEntities
= thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
PageInfo<ThrProductsEntity> pageInfo;
pageInfo = new PageInfo<>(thrCorpEntities);
PageSimpleResponse<ThrProductsEntity> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(thrCorpEntities);
return ResultVOUtils.success(pageSimpleResponse);
}
}
}

@ -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;
}

@ -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();

@ -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<ThirdSysApiEntity> thirdSysApiEntities = thirdSysApiService.findSysApi(filterSysApiRequest);
PageInfo<ThirdSysApiEntity> pageInfo;
pageInfo = new PageInfo<>(thirdSysApiEntities);
PageSimpleResponse<ThirdSysApiEntity> 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, "修改失败");
}
}

@ -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<ErpOrderEntity> erpOrderEntities = new ErpOrderClient(bussinessTypResponse.getOrderQueryUrl()).getErpOrder(docids, mainOrderEntity.getAction());
List<ErpOrderEntity> 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<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, mainOrder);
myErpOrderService.insertErpOrders(returnOrders);

@ -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(bussinessTypResponse.getOrderQueryUrl()).getErpOrderResponse(filterErpOrderRequest);
//
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<ErpOrderResponse> erpOrderResponses = thrOrderService.filterAllDetail(filterThrOrderRequest);
PageInfo<ErpOrderResponse> pageInfo;
pageInfo = new PageInfo<>(erpOrderResponses);
PageSimpleResponse<ErpOrderResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpOrderResponses);
return ResultVOUtils.success(pageSimpleResponse);
}
}
@ -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<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
BaseResponse baseResponse = new ErpOrderClient().postBill(listMap, orderEntity.getAction(), url);
if (baseResponse != null && baseResponse.getCode() == 20000) {

@ -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<InCodeLogEntity> inCodeLogEntities
= inCodeLogService.filterInCodeLog(filterInCodeLogRequest);
PageInfo<InCodeLogEntity> pageInfo;
pageInfo = new PageInfo<>(inCodeLogEntities);
PageSimpleResponse<InCodeLogEntity> 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<InCodeLogEntity> 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("删除成功");
}
}

@ -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 (basicThirdSysEntity == null || basicThirdSysEntity.getInvPiUrl()==null)
return ResultVOUtils.error(500, "ERP现存量接口地址未定义");
if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
return ResultVOUtils.error(500, "ERP库存产品信息接口地址未定义");
else
onHandUrl = basicThirdSysEntity.getInvPiUrl();
onHandUrl = basicThirdSysDetailEntity.getValue();
BaseResponse<PageSimpleResponse<ErpInvProductResponse>> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(onhandQueryRequest, onHandUrl);
return responseBaseResponse;
} else {
FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest();
BeanUtils.copyProperties(onhandQueryRequest, filterThrInvProductsRequest);
filterThrInvProductsRequest.setThirdSysFk(onhandQueryRequest.getThirdSys());
List<ThrInvProductsEntity> thrInvProductsEntities
= thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest);
List<ErpInvProductResponse> 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<ErpInvProductResponse> pageInfo;
pageInfo = new PageInfo<>(erpInvProductResponseList);
PageSimpleResponse<ErpInvProductResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(erpInvProductResponseList);
return ResultVOUtils.success(pageSimpleResponse);
}
}

@ -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<StockPrintEntity> 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<StockPrintEntity> 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<StockPrintEntity> 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("提交成功!");
}
}

@ -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("后台开始下载更新,请稍后刷新查看");
}
}
}

@ -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,12 +29,15 @@ 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,
public BaseResponse getInvProducts(FilterThrInvProductsRequest filterThrInvProductsRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
@ -47,30 +54,65 @@ public class ThrInvProductsController {
}
@PostMapping("/udiwms/thrsys/postInvProducts")
public BaseResponse postInvProducts(PostThrInvProductsRequest postThrInvProductsRequest,
public BaseResponse postInvProducts(@RequestBody PostThrInvProductsRequest postThrInvProductsRequest,
BindingResult bindingResult) {
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
List<ThrInvProductsEntity> thrInvProductsEntities;
List<ErpOnHandResponse> erpOnHandResponses = postThrInvProductsRequest.getDatas();
List<ErpInvProductResponse> 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("后台开始下载更新,请稍后刷新查看");
}
}
}

@ -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("后台开始下载更新,请稍后刷新查看");
}
}
}

@ -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("后台开始下载更新,请稍后刷新查看");
}
}
}

@ -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<BasicThirdSysDetailEntity> filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
}

@ -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<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest);
List<UnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest);
boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);

@ -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<ThirdSysApiEntity> findSysApi(FilterSysApiRequest filterSysApiRequest);
boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity);
}

@ -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<InCodeLogEntity> filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest);
boolean insertInCodeLog(InCodeLogEntity stockCheckEntity);
boolean updateInCodeLog(InCodeLogEntity stockCheckEntity);
boolean deleteById(@Param("id") String id);
}

@ -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<String> ids);

@ -20,4 +20,5 @@ public interface ThrCorpDao {
boolean deleteById(@Param("id") String id);
boolean deleteAll();
}

@ -20,4 +20,6 @@ public interface ThrInvProductsDao {
boolean deleteById(@Param("id") String id);
boolean deleteAll();
}

@ -19,4 +19,6 @@ public interface ThrOrderDao {
boolean updateThrOrder(ThrOrderEntity thrOrderEntity);
boolean deleteById(@Param("id") String id);
boolean deleteAll();
}

@ -20,4 +20,8 @@ public interface ThrOrderDetailDao {
boolean deleteById(@Param("id") String id);
boolean deleteByOrderIdFk(@Param("orderIdFk")String orderIdFk);
boolean deleteAll();
}

@ -21,4 +21,5 @@ public interface ThrProductsDao {
boolean deleteById(@Param("id") String id);
boolean deleteAll();
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}
}

@ -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;
}

@ -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;
}

@ -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;
}

@ -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;
}
}

@ -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;
}

@ -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;

@ -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;

@ -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;

@ -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;
}

@ -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<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(UnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
public BaseResponse<PageSimpleResponse<ErpUnitsResponse>> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) {
Map<String, Object> 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());

@ -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<PageSimpleResponse<ErpOnHandResponse>> 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<PageSimpleResponse<ErpInvProductResponse>> onHandsResponse =

@ -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;
}

@ -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<String> keys;
private String thirdId;
private String erpName;
private ErpProductsResponse erpProductsResponse;
private String relId;
private String thirdSys;

@ -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;
}

@ -9,5 +9,6 @@ public class FilterBasicThirdSysRequest extends ListPageRequest {
private String thirdId;
private String thirdName;
private Boolean enabled;
private Boolean mainSys;
}

@ -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;
}

@ -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 {
}

@ -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<String> inventoryCodes;
private String udiCode;

@ -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;
}

@ -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<StockPrintEntity> datas;
}

@ -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;
}

@ -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<String> inventoryCodes;
private String udiCode;
private String nameCode;
private String thirdSys;
}

@ -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;
}

@ -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;
}

@ -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<ErpOnHandResponse> datas;
private List<ErpInvProductResponse> datas;
}

@ -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;
}

@ -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;
//辅助字段

@ -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;
}
}

@ -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;
}

@ -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<BasicThirdSysDetailEntity> filterBasicThirdSysDetail(FilterBasicThirdSysDetailRequest filterBasicThirdSysDetailRequest);
}

@ -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);

@ -12,6 +12,8 @@ public interface UdiRelevanceService {
List<UdiRelevanceResponse> filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest);
boolean isExit();
List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest);
List<UdiRelevanceEntity> selectByUuid(String uuid);

@ -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<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest);
List<UnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest);
boolean insertUnitMaintain(UnitMaintainEntity unitMaintainEntity);
boolean deleteById(String id);
boolean isExit();
UnitMaintainEntity selectById(String id);
}

@ -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<BasicThirdSysDetailEntity> 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<BasicThirdSysDetailEntity> data = basicThirdSysDetailDao.filterBasicThirdSysDetail(filterBasicThirdSysDetailRequest);
return data;
}
}

@ -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<BussinessTypeEntity> 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);

@ -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<UdiRelevanceResponse> data = filterUdiRelevance(filterUdiInfoRequest);
if (data != null && data.size() > 0) {
return true;
}
return false;
}
@Override
public List<UdiRelevanceResponse> filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest) {
if (filterUdiInfoRequest == null) {

@ -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<UnitMaintainEntity> filterList(UnitMaintainFilterRequest unitMaintainFilterRequest) {
public List<UnitMaintainEntity> filterList(BasicUnitMaintainFilterRequest unitMaintainFilterRequest) {
if (unitMaintainFilterRequest == null) {
return Collections.emptyList();
}
if (unitMaintainFilterRequest.getPage() != null) {
int offset = (unitMaintainFilterRequest.getPage() - 1) * unitMaintainFilterRequest.getLimit();
PageHelper.offsetPage(offset, unitMaintainFilterRequest.getLimit());
}
List<UnitMaintainEntity> 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<UnitMaintainEntity> data = filterList(filterUdiInfoRequest);
if (data != null && data.size() > 0) {
return true;
}
return false;
}
@Override
public UnitMaintainEntity selectById(String id) {
return unitMaintainDao.selectById(id);

@ -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<ThirdSysApiEntity> findSysApi(FilterSysApiRequest filterSysApiRequest);
boolean modifySysApi(ThirdSysApiEntity thirdSysApiEntity);
}

@ -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<ThirdSysApiEntity> 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;
}
}

@ -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<InCodeLogEntity> filterInCodeLog(FilterInCodeLogRequest filterInCodeLogRequest);
boolean insertInCodeLog(InCodeLogEntity inCodeLogEntity);
boolean updateInCodeLog(InCodeLogEntity inCodeLogEntity);
boolean deleteById(String id);
}

@ -20,6 +20,8 @@ public interface InvStockPrintService {
boolean deleteById(String id);
boolean deleteByGenKey(String genKey);
boolean updatePrintStatus(List<String> ids);
}

@ -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<InCodeLogEntity> 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<InCodeLogEntity> 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);
}
}

@ -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<String> ids) {
return stockPrintDao.updatePrintStatus(ids);

@ -17,4 +17,5 @@ public interface ThrCorpService {
boolean deleteById(String id);
boolean deleteAll();
}

@ -18,4 +18,6 @@ public interface ThrInvProductsService {
boolean deleteById(String id);
boolean deleteAll();
}

@ -18,4 +18,8 @@ public interface ThrOrderDetailService {
boolean deleteById(String id);
boolean deleteByOrderIdFk(String id);
boolean deleteAll();
}

@ -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<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest);
List<ErpOrderEntity> filterAllOrders(List<String> billNos, String action);
List<ErpOrderResponse> filterAllDetail(FilterThrOrderRequest filterThrOrderRequest);
ThrOrderEntity findByUnique(String billNo, String thirdSysFk);
ThrOrderEntity findById(String id);
boolean insertThrOrder(ThrOrderEntity thrCorpEntity);
boolean insertThrOrders(List<ThrOrderEntity> thrOrderEntities);
@ -19,4 +27,5 @@ public interface ThrOrderService {
boolean deleteById(String id);
boolean deleteAll();
}

@ -18,4 +18,5 @@ public interface ThrProductsService {
boolean deleteById(String id);
boolean deleteAll();
}

@ -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();
}
}

@ -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();
}
}

@ -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();
}
}

@ -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<ThrOrderEntity> filterThrOrder(FilterThrOrderRequest filterThrOrderRequest) {
@ -29,6 +38,61 @@ public class ThrOrderServiceImpl implements ThrOrderService {
return data;
}
@Override
public List<ErpOrderEntity> filterAllOrders(List<String> billNos, String thirdSys) {
List<ErpOrderEntity> erpOrderEntities = new ArrayList<>();
for (String billNo : billNos) {
FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest();
filterThrOrderRequest.setBillNo(billNo);
filterThrOrderRequest.setThirdSysFk(thirdSys);
List<ThrOrderEntity> data = thrOrderDao.filterThrOrder(filterThrOrderRequest);
if (data != null && data.size() > 0) {
for (ThrOrderEntity thrOrderEntity : data) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> 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<ErpOrderResponse> filterAllDetail(FilterThrOrderRequest filterThrOrderRequest) {
List<ErpOrderResponse> erpOrderResponses = new ArrayList<>();
List<ThrOrderEntity> data = thrOrderDao.filterThrOrder(filterThrOrderRequest);
if (data != null && data.size() > 0) {
for (ThrOrderEntity thrOrderEntity : data) {
FilterThrOrderDetailRequest filterThrOrderDetailRequest = new FilterThrOrderDetailRequest();
filterThrOrderDetailRequest.setOrderIdFk(thrOrderEntity.getId() + "");
List<ThrOrderDetailEntity> thrOrderDetailEntities = thrOrderDetailDao.filterThrOrderDetailDetail(filterThrOrderDetailRequest);
ErpOrderResponse erpOrderResponse = new ErpOrderResponse();
BeanUtils.copyProperties(thrOrderEntity, erpOrderResponse);
List<ErpOrderResponse.SubErpOrder> 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<ThrOrderEntity> 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();
}
}

@ -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();
}
}

@ -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("接口地址未设置");
}

@ -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<String> 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<PageSimpleResponse<ErpProductsResponse>> 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) {

@ -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<StockPrintEntity> stockPrintEntities = new ArrayList<>();
for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
erpOnhandRequest.setInventoryCode(udiRelevanceResponse.getThirdId());
List<ErpInvProductResponse> 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<StockPrintEntity> stockPrintEntities, UdiRelevanceResponse udiRelevanceResponse) {
ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest();
erpOnhandRequest.setInventoryCode(inventoryCode);
List<ErpInvProductResponse> 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;
}

@ -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() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_update_stockprint");
if ("1".equals(systemParamConfigEntity.getParamValue())) {
logger.info("定时更新下载电子货位卡");
importStockService.updateStock();
SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi");
importStockService.updateStock(systemParamConfigEntity1.getParamValue());
}
}
}

@ -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() {
SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("erp_update_stockprint");
if ("1".equals(systemParamConfigEntity.getParamValue())) {
logger.info("定时更新下载电子货位卡");
importStockService.updateStock();
SystemParamConfigEntity systemParamConfigEntity1 = systemParamConfigService.selectByParamKey("erp_stockprint_get_invpi");
importStockService.updateStock(systemParamConfigEntity1.getParamValue());
}
}
}

@ -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,10 +88,10 @@ public class IoModifyErpTask implements SchedulingConfigurer {
filterErpOrderRequest.setLimit(100);
filterErpOrderRequest.setOrderId(orderEntity.getId());
List<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction());
if (bussinessTypResponse.getOrderModifyUrl() != null) {
String url = bussinessTypResponse.getOrderModifyUrl();
BasicThirdSysDetailEntity basicThirdSysDetailEntity = bussinessTypeService.findByActionKey(filterErpOrderRequest.getBillAction(), "orderQueryUrl");
if (basicThirdSysDetailEntity.getEnabled()) {
if (basicThirdSysDetailEntity.getValue() != null) {
String url = basicThirdSysDetailEntity.getValue();
if (erpOrderEntities != null && !erpOrderEntities.isEmpty()) {
Map<String, List<ErpOrderEntity>> listMap = erpOrderEntities.stream().collect(Collectors.groupingBy(ErpOrderEntity::getErpOrderId));
if (orderEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
@ -111,6 +113,10 @@ public class IoModifyErpTask implements SchedulingConfigurer {
} else {
logger.error("ERP单据修改接口地址未定义");
}
}else {
logger.error("ERP单据修改未启用");
}
}
}
@ -126,9 +132,11 @@ public class IoModifyErpTask implements SchedulingConfigurer {
List<OrderEntity> 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();
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<ErpOrderEntity> erpOrderEntities = myErpOrderService.filterMyErpOrder(filterErpOrderRequest);
@ -169,6 +177,11 @@ public class IoModifyErpTask implements SchedulingConfigurer {
} else {
logger.error("ERP单据修改接口地址未定义");
}
}else {
logger.error("ERP单据修改未启用");
}
}
}
}

@ -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,14 +186,16 @@ public class IoTransInoutService {
List<String> erpIds = DataTransUtil.strToErpList(orderEntity.getErpFk());
List<WarehouseEntity> transData = warehouseService.findByReceiptId(orderEntity.getId());
if (erpIds != null && erpIds.size() > 0) {
BussinessTypResponse bussinessTypResponse = bussinessTypeService.findJoinBTByAction(orderEntity.getAction());
if (bussinessTypResponse == null || bussinessTypResponse.getOrderQueryUrl() == null) {
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出入库单据接口地址未定义");
orderService.updateOrder(orderEntity);
} else {
String erpOrderUrl = bussinessTypResponse.getOrderQueryUrl();
String erpOrderUrl = basicThirdSysDetailEntity.getValue();
List<ErpOrderEntity> cloudErps = new ErpOrderClient(erpOrderUrl).getErpOrder(erpIds, orderEntity.getAction());
if (cloudErps != null && cloudErps.size() > 0) {
List<ErpOrderEntity> returnOrders = new ContrastErpUtil().transErp(cloudErps, udiRelevanceService, orderEntity.getId());
@ -218,11 +221,20 @@ public class IoTransInoutService {
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);
}

@ -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<PageSimpleResponse<ErpUnitsResponse>> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl);
List<ErpUnitsResponse> erpUnitsResponses = erpCrops.getData().getList();
if (erpUnitsResponses != null && erpUnitsResponses.size() > 0) {
List<ThrCorpEntity> 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;
}
}

@ -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<PageSimpleResponse<ErpInvProductResponse>> responseBaseResponse = new ErpInvClient().getInvPrdoductResponse(erpOnhandRequest, productUrl);
List<ErpInvProductResponse> erpInvProductResponses = responseBaseResponse.getData().getList();
if (erpInvProductResponses != null && erpInvProductResponses.size() > 0) {
List<ThrInvProductsEntity> 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;
}
}

@ -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<PageSimpleResponse<ErpOrderResponse>> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest);
List<ErpOrderResponse> 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<ThrOrderDetailEntity> 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;
}
}

@ -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<PageSimpleResponse<ErpProductsResponse>> erpProducts = new ErpBasicClient().getErpProducts(filterErpGoodsRequest, productUrl);
List<ErpProductsResponse> erpProductsResponses = erpProducts.getData().getList();
if (erpProductsResponses != null && erpProductsResponses.size() > 0) {
List<ThrProductsEntity> 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;
}
}

@ -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";
}

@ -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<String, Object> redisTemplate;
public RedisUtil(RedisTemplate<String, Object> 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 () time0 time0
* @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<Object, Object> hmget(String key) {
return redisTemplate.opsForHash().entries(key);
}
/**
* HashSet
*
* @param key
* @param map
* @return true false
*/
public boolean hmset(String key, Map<String, Object> 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<String, Object> 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=============================
/**
* keySet
*
* @param key
* @return
*/
public Set<Object> sGet(String key) {
try {
return redisTemplate.opsForSet().members(key);
} catch (Exception e) {
e.printStackTrace();
return null;
}
}
/**
* valueset,
*
* @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<Object> 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<Object> 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<Object> 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;
}
}
/**
* Nvalue
*
* @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;
}
}
}

@ -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

@ -5,26 +5,15 @@
<update id="updateBasicThiSys" parameterType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
UPDATE basic_third_sys
<set>
<trim prefix="set" suffixOverrides=",">
<if test="thirdId != null">thirdId=#{thirdId},</if>
<if test="thirdName != null">thirdName=#{thirdName},</if>
<if test="piQueryUrl != null">piQueryUrl=#{piQueryUrl},</if>
<if test="piQueryEnabled != null">piQueryEnabled=#{piQueryEnabled},</if>
<if test="orderQueryUrl != null">orderQueryUrl=#{orderQueryUrl},</if>
<if test="orderQueryEnabled != null">orderQueryEnabled=#{orderQueryEnabled},</if>
<if test="orderAddUrl != null">orderAddUrl=#{orderAddUrl},</if>
<if test="orderAddEnabled != null">orderAddEnabled=#{orderAddEnabled},</if>
<if test="orderDeleteUrl != null">orderDeleteUrl=#{orderDeleteUrl},</if>
<if test="orderDeleteEnabled != null">orderDeleteEnabled=#{orderDeleteEnabled},</if>
<if test="orderModifyUrl != null">orderModifyUrl=#{orderModifyUrl},</if>
<if test="orderModifyEnabled != null">orderModifyEnabled=#{orderModifyEnabled},</if>
<if test="invPiUrl != null">invPiUrl=#{invPiUrl},</if>
<if test="invPiEnabled != null">invPiEnabled=#{invPiEnabled},</if>
<if test="corpUrl != null">corpUrl=#{corpUrl},</if>
<if test="corpEnabled != null">corpEnabled=#{corpEnabled},</if>
<if test="guideUrl != null">guideUrl=#{guideUrl},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="thridUrl != null">thridUrl=#{thridUrl},</if>
<if test="enabled != null">enabled=#{enabled},</if>
</set>
<if test="mainSys != null">mainSys=#{mainSys},</if>
</trim>
WHERE id=#{id}
</update>
@ -41,8 +30,10 @@
<if test="enabled != '' and enabled != null">
AND enabled = #{enabled}
</if>
<if test="mainSys != '' and mainSys != null">
AND mainSys = #{mainSys}
</if>
</where>
</select>
<select id="selectByThirdId" parameterType="Map" resultType="com.glxp.api.admin.entity.basic.BasicThirdSysEntity">
select * FROM basic_third_sys WHERE thirdId = #{thirdId}

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.glxp.api.admin.dao.basic.BasicThirdSysDetailDao">
<update id="updateBasicThirdSysDetail" parameterType="com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity">
UPDATE basic_third_sys_detail
<trim prefix="set" suffixOverrides=",">
<if test="value != null">value=#{value},</if>
<if test="enabled != null">enabled=#{enabled},</if>
<if test="itrCache != null">itrCache=#{itrCache},</if>
<if test="guideUrl != null">guideUrl=#{guideUrl},</if>
<if test="remark != null">remark=#{remark},</if>
<if test="name != null">name=#{name},</if>
<if test="thirdSysFk != null">thirdSysFk=#{thirdSysFk},</if>
</trim>
WHERE id=#{id}
</update>
<select id="filterBasicThirdSysDetail" parameterType="com.glxp.api.admin.req.basic.FilterBasicThirdSysRequest"
resultType="com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity">
SELECT * FROM basic_third_sys_detail
<where>
<if test="key != '' and key != null">
AND basic_third_sys_detail.key = #{key}
</if>
<if test="thirdSysFk != '' and thirdSysFk != null">
AND thirdSysFk = #{thirdSysFk}
</if>
</where>
</select>
<select id="selectByKey" parameterType="Map"
resultType="com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity">
select * FROM basic_third_sys_detail
inner join basic_third_sys on basic_third_sys_detail.thirdSysFk = basic_third_sys.thirdId
WHERE basic_third_sys_detail.key = #{key} and basic_third_sys_detail.thirdSysFk = #{thirdSys} and basic_third_sys.enabled = 1
</select>
</mapper>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save