UDI
/
udi-spms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

关联关系优化

Browse Source
dev_drug
qiuyt 2 months ago
parent 52787a7080
commit a131d5a734
3 changed files with 80 additions and 161 deletions
Show Stats Download Patch File Download Diff File

61
src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.glxp.api.dao.inout.IoCodeTempDao;
import com.glxp.api.entity.auth.AuthAdmin;
import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
import com.glxp.api.entity.basic.EntrustReceEntity;
import com.glxp.api.entity.collect.RelCodeBatch;
import com.glxp.api.entity.inout.*;
import com.glxp.api.entity.system.SystemParamConfigEntity;
import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust;
@ -47,8 +48,10 @@ import com.glxp.api.service.sync.SpsSyncDownloadService;
import com.glxp.api.service.system.SystemParamConfigService;
import com.glxp.api.util.*;
import com.glxp.api.util.alihealth.AlihealthYljgUtils;
import com.glxp.api.util.redis.RedisDelayedQueue;
import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@ -129,13 +132,14 @@ public class IoOrderReviewController extends BaseController {
private RelCodeDetailService relCodeDetailService;
@Resource
private IoCodeDao ioCodeDao;
//前端二次审核
@AuthRuleAnnotation("")
@PostMapping("/spms/inout/order/web/updateStatus")
@Log(title = "单据管理", businessType = BusinessType.UPDATE)
public BaseResponse webUpdateStatus(@RequestBody ReviewFinishRequest updateExportStatusRequest,
BindingResult bindingResult) {
log.error("单据审核进来了==="+updateExportStatusRequest);
log.error("单据审核进来了===" + updateExportStatusRequest);
if (bindingResult.hasErrors()) {
return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
}
@ -145,12 +149,12 @@ public class IoOrderReviewController extends BaseController {
}
if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
BaseResponse baseResponse = updateReview(getUser(), orderEntity);
log.error("单据审核进来了===orderEntity===="+orderEntity);
log.error("单据审核进来了===orderEntity====" + orderEntity);
if(baseResponse.getCode() == 20000) {
if (baseResponse.getCode() == 20000) {
//todo 审核通过上传关联关系
BasicBussinessTypeEntity businessType = basicBussinessTypeService.findByAction(orderEntity.getAction());
log.error("单据审核进来了===businessType===="+businessType);
log.error("单据审核进来了===businessType====" + businessType);
if (businessType.getCorpType() == ConstantStatus.CORP_SP && businessType.getMainAction().equals(ConstantType.TYPE_PUT) && businessType.getProductType() == 2) {
aliBillsDispose(orderEntity);
@ -165,9 +169,6 @@ public class IoOrderReviewController extends BaseController {
}
}
//前端第三次验收
@ -463,8 +464,14 @@ public class IoOrderReviewController extends BaseController {
ioCheckInoutService.checkThird(orderEntity);
return ResultVOUtils.success("更新成功");
}
@Value("${REL_CODE_DELAY_SECONDS:7200}")
private Integer relCodeDelaySeconds;
@Resource
private RedisDelayedQueue redisDelayedQueue;
// 异步处理阿里单据
public BaseResponse aliBillsDispose( IoOrderEntity orderEntity) {
public BaseResponse aliBillsDispose(IoOrderEntity orderEntity) {
ThreadUtil.execAsync(() -> {
//1.上传入库单
AlihealthYljgUploadinoutbillReqeust alihealthYljgUploadinoutbillReqeust = new AlihealthYljgUploadinoutbillReqeust();
@ -476,39 +483,33 @@ public class IoOrderReviewController extends BaseController {
alihealthYljgUploadinoutbillReqeust.setClient_type("2");
// 查询改单据传的码
List<IoCodeEntity> ioCodeEntityList = ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("orderId", orderEntity.getBillNo()));
if(ioCodeEntityList!=null && ioCodeEntityList.size() >0){
if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) {
List<String> codeList = new ArrayList<>();
for (IoCodeEntity ioCodeEntity : ioCodeEntityList) {
codeList.add(ioCodeEntity.getCode());
}
Set<String> set = new HashSet<>(codeList);
alihealthYljgUploadinoutbillReqeust.setTrace_codes( String.join(",", codeList));
alihealthYljgUploadinoutbillReqeust.setTrace_codes(String.join(",", codeList));
// 单据上传先注释了
// BaseResponse baseResponseUploadinoutbill = alihealthYljgUtils.yljgUploadinoutbill(alihealthYljgUploadinoutbillReqeust,orderEntity.getFromCorp());
// if(baseResponseUploadinoutbill.getCode() == 20000){
// try {
// Thread.sleep(1000);
log.error("要查询阿里关联关系的码==="+set);
relCodeBatchService.addRelCodeAli(set, orderEntity.getFromCorp());
//
// } catch (InterruptedException e) {
// }
// }else {
// log.error("阿里调用上传单据失败==="+baseResponseUploadinoutbill.getMessage());
//
// }
log.error("要查询阿里关联关系的码===" + set);
String erpId = orderEntity.getFromCorp();
for (String code : set) {
relCodeBatchService.addRelCodeAli(code, orderEntity.getFromCorp());
RelCodeBatch relCodeBatch = relCodeBatchService.getOne(
new QueryWrapper<RelCodeBatch>().eq("curCode", code)
);
if (Objects.isNull(relCodeBatch)) {
redisDelayedQueue.addTaskToQueue(code + "&&&" + erpId, relCodeDelaySeconds, "rel_code_queue");
} else {
log.error("有关联关系了此码===" + code);
}
}
}
});
return ResultVOUtils.success("更新成功");
}
@Resource
SpsSyncDownloadService spsSyncDownloadService;

53
src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java
Unescape Escape View File

@ -83,6 +83,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
private CustomerInfoService customerInfoService;
@Resource
private RelCodeBatchService relCodeBatchService;
/**
* 上传保存关联信息
*
@ -701,26 +702,23 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
}
return;
}
@Resource
private AlihealthYljgUtils alihealthYljgUtils;
@Resource
private RedisDelayedQueue redisDelayedQueue;
@Resource
@Value("${REL_CODE_DELAY_SECONDS:7200}")
private Integer relCodeDelaySeconds;
// 处理阿里新增关联关系
public void addRelCodeAli(Set<String> set, String erpId){
try {
public void addRelCodeAli(String code, String erpId) {
//2.下载关联关系存到关联关系表
for (String code : set) {
AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust();
alihealthYljgSinglerelationReqeust.setCode(code);
BaseResponse<AlihealthYljgSinglerelationResponse> baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust);
if (baseResponse.getCode() == 20000) {
AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData();
// 返回的码关联关系进行插入
List<RelCodeBatch> batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId,code);
List<RelCodeBatch> batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId, code);
for (RelCodeBatch relCodeBatch : batchList) {
RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode())
.last("limit 1")
@ -731,14 +729,14 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
relCodeBatchService.save(relCodeBatch);
} else {
if(relCodeBatchOne.getOneLevelCount()!=null){
relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() +relCodeBatch.getOneLevelCount() );
if (relCodeBatchOne.getOneLevelCount() != null) {
relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() + relCodeBatch.getOneLevelCount());
}
if(relCodeBatchOne.getTwoLevelCount()!=null){
relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() +relCodeBatch.getTwoLevelCount() );
if (relCodeBatchOne.getTwoLevelCount() != null) {
relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() + relCodeBatch.getTwoLevelCount());
}
if(relCodeBatchOne.getThreeLevelCount()!=null){
relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() +relCodeBatch.getThreeLevelCount() );
if (relCodeBatchOne.getThreeLevelCount() != null) {
relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() + relCodeBatch.getThreeLevelCount());
}
relCodeBatchService.update(relCodeBatch, new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode()));
}
@ -747,7 +745,7 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
Integer id = relCodeBatchOne.getId();
// 进行查询
List<RelCodeDetail> list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id,relCodeBatch.getCurCode());
List<RelCodeDetail> list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id, relCodeBatch.getCurCode());
if (list != null && list.size() > 0) {
List curCodeList = new ArrayList();
for (RelCodeDetail relCodeDetail : list) {
@ -760,33 +758,8 @@ public class RelCodeBatchService extends ServiceImpl<RelCodeBatchMapper, RelCode
}
} else {
log.error("阿里调用码关联关系失败==="+baseResponse.getMessage());
log.error("阿里调用码关联关系失败===" + baseResponse.getMessage());
}
RelCodeBatch relCodeBatch = relCodeBatchService.getOne(
new QueryWrapper<RelCodeBatch>().eq("curCode",code)
);
if(Objects.isNull(relCodeBatch)){
redisDelayedQueue.addTaskToQueue(code+"&&&"+erpId,relCodeDelaySeconds,"rel_code_queue");
}else {
log.error("有关联关系了此码==="+code);
}
}
}catch (Exception E){
E.printStackTrace();
}
// 父级编码
// if(relCodeBatchList!=null && relCodeBatchList.size() >0){
// List<RelCodeDetail> list = relCodeDetailService.list(
// new QueryWrapper<RelCodeDetail>().in("curCode",relCodeBatchList)
// );
// if(list!=null && list.size() >0){
// RelCodeBatch relCodeBatch =new RelCodeBatch();
// relCodeBatchService.update(relCodeBatch, new QueryWrapper<RelCodeBatch>().eq("productCode", relCodeBatch.getProductCode()));
//
// }
// }
}

59
src/main/java/com/glxp/api/task/AliRelCodeDetailTask.java
Unescape Escape View File

@ -80,74 +80,19 @@ public class AliRelCodeDetailTask implements SchedulingConfigurer {
Iterator<Tuple> iterator = tasksToProcess.iterator();
while (iterator.hasNext()) {
Tuple task = iterator.next();
String taskId = task.getElement();
String[] codes = taskId.split("&&&");
if (codes!=null && codes.length>0) {
// List<String> relCodeBatchList =new ArrayList<>();
String code = codes[0];
String erpId = codes[1];
log.error("关联关系下载任务ID===" + code);
// 执行任务逻辑 (你可以在这里调用实际的业务逻辑)
AlihealthYljgSinglerelationReqeust alihealthYljgSinglerelationReqeust = new AlihealthYljgSinglerelationReqeust();
alihealthYljgSinglerelationReqeust.setCode(code);
BaseResponse<AlihealthYljgSinglerelationResponse> baseResponse = alihealthYljgUtils.relCodeInsert(alihealthYljgSinglerelationReqeust);
if (baseResponse.getCode() == 20000) {
AlihealthYljgSinglerelationResponse alihealthKytSinglerelationResponse = baseResponse.getData();
// 返回的码关联关系进行插入
List<RelCodeBatch> batchList = alihealthKytSinglerelationResponse.disposeRelCodeBatch(erpId,code);
for (RelCodeBatch relCodeBatch : batchList) {
RelCodeBatch relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode())
.last("limit 1")
);
if (Objects.isNull(relCodeBatchOne)) {
relCodeBatch.setCreateUser(erpId);
relCodeBatch.setCreateTime(new Date());
relCodeBatchService.save(relCodeBatch);
} else {
if(relCodeBatchOne.getOneLevelCount()!=null){
relCodeBatch.setOneLevelCount(relCodeBatchOne.getOneLevelCount() +relCodeBatch.getOneLevelCount() );
}
if(relCodeBatchOne.getTwoLevelCount()!=null){
relCodeBatch.setTwoLevelCount(relCodeBatchOne.getTwoLevelCount() +relCodeBatch.getTwoLevelCount() );
}
if(relCodeBatchOne.getThreeLevelCount()!=null){
relCodeBatch.setThreeLevelCount(relCodeBatchOne.getThreeLevelCount() +relCodeBatch.getThreeLevelCount() );
}
relCodeBatchService.update(relCodeBatch, new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode()));
}
relCodeBatchOne = relCodeBatchService.getOne(new QueryWrapper<RelCodeBatch>().eq("curCode", relCodeBatch.getCurCode()));
Integer id = relCodeBatchOne.getId();
// relCodeBatchList.add(relCodeBatchOne.getCurCode());
// 进行查询
List<RelCodeDetail> list = alihealthKytSinglerelationResponse.disposeRelRodeDetailList(id,relCodeBatch.getCurCode());
if (list != null && list.size() > 0) {
List curCodeList = new ArrayList();
for (RelCodeDetail relCodeDetail : list) {
curCodeList.add(relCodeDetail.getCurCode());
}
relCodeDetailService.remove(new QueryWrapper<RelCodeDetail>().in("curCode", curCodeList));
relCodeDetailService.saveBatch(list);
}
}
} else {
log.error("阿里调用码关联关系失败==="+baseResponse.getMessage());
}
// 处理阿里关联关系
relCodeBatchService.addRelCodeAli(code,erpId);
}
// 从队列中删除已执行的任务
redisDelayedQueue.getJedis().zrem("rel_code_queue", taskId);
log.error("关联关系下载删除任务ID " + taskId + " removed from queue.");
}
}

Write Preview
Loading…
Cancel
Save