单据查询问题修复(带校验)

dev
郑明梁 2 years ago
parent 3d0dacb11c
commit 50edb4e747

@ -130,7 +130,12 @@ public class IoOrderController extends BaseController {
orderService.setFilterStatus(filterOrderRequest);
}
if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
orderService.setActions(filterOrderRequest);
//要是不存在要查询的单据类型就直接放回空
if(orderService.setActions(filterOrderRequest) == null){
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(new ArrayList<>());
return ResultVOUtils.page(pageInfo);
}
}
if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {

@ -3,6 +3,7 @@ package com.glxp.api.service.basic;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.glxp.api.constant.ConstantStatus;
import com.glxp.api.dao.basic.UdiRelevanceDao;
import com.glxp.api.entity.basic.UdiProductEntity;
@ -207,13 +208,27 @@ public class UdiContrastService {
}
public void insertUdiInfos(List<UdiProductEntity> udiInfoEntities) {
Boolean falg=false;
String uuid="";
if (CollUtil.isNotEmpty(udiInfoEntities)) {
UdiProductEntity udiProductEntity = udiProductService.findByUuid(udiInfoEntities.get(0).getUuid());
if (udiProductEntity == null) {
for (UdiProductEntity udiInfoEntity : udiInfoEntities) {
udiInfoEntity.setId(IdUtil.getSnowflakeNextId());
if(udiInfoEntity.getZxxsbzbhsydysl()>0){
uuid=udiInfoEntity.getUuid();
falg=true;
}
}
udiProductService.insertUdiInfos(UdiInfoUtil.initUdiInfoEntitys(udiInfoEntities));
//判断产品zxxsbzbhsydysl大于0就启动使用单元
if(falg){
QueryWrapper<UdiRelevanceEntity> ew=new QueryWrapper<>();
ew.eq("uuid",uuid);
UdiRelevanceEntity udiRelevanceEntity=new UdiRelevanceEntity();
udiRelevanceEntity.setIsUseDy(true);
udiRelevanceService.update(udiRelevanceEntity,ew);
}
}
}
}

@ -49,6 +49,7 @@ import com.glxp.api.util.MsDateUtil;
import com.glxp.api.util.IntUtil;
import com.glxp.api.util.udi.UdiCalCountUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@ -709,6 +710,9 @@ public class IoOrderServiceImpl implements IoOrderService {
if (filterOrderRequest.getVueType() == null)
return null;
bussinessTypeEntities = basicBussinessTypeService.findByVueType(filterOrderRequest.getVueType());
if(CollectionUtils.isEmpty(bussinessTypeEntities)){
return null;
}
actions = bussinessTypeEntities.stream().map(BasicBussinessTypeEntity::getAction).collect(Collectors.toList());
filterOrderRequest.setActions(actions);
return actions;

Loading…
Cancel
Save