Browse Source

修复调度生成费用品类缺失

v1.0
Yen 2 years ago
parent
commit
9e71249c86
  1. 2
      src/main/java/com/qs/serve/modules/third/PortalOfCostController.java
  2. 7
      src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java
  3. 2
      src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

2
src/main/java/com/qs/serve/modules/third/PortalOfCostController.java

@ -128,8 +128,6 @@ public class PortalOfCostController {
return R.error("支付异常"); return R.error("支付异常");
} }
/** /**
* 一站式创建费用(费用申请根据东哥的数据关联政策生成) * 一站式创建费用(费用申请根据东哥的数据关联政策生成)
* @param createBo * @param createBo

7
src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java

@ -254,7 +254,7 @@ public class PortalOfCostApplication {
List<String> invCodes = new ArrayList<>(); List<String> invCodes = new ArrayList<>();
if(CollectionUtil.isNotEmpty(createBo.getGoodsList())){ if(CollectionUtil.isNotEmpty(createBo.getGoodsList())){
invCodes = createBo.getGoodsList().stream() invCodes = createBo.getGoodsList().stream()
.map(ProcessGoodsItem::getInventoryCode).distinct().collect(Collectors.toList());; .map(ProcessGoodsItem::getInventoryCode).distinct().collect(Collectors.toList());
} }
List<GoodsSku> skuList = this.initSkuListOfProcess(invCodes); List<GoodsSku> skuList = this.initSkuListOfProcess(invCodes);
//常用参数 //常用参数
@ -623,8 +623,8 @@ public class PortalOfCostApplication {
if(skuList.size()!=invCodeList.size()){ if(skuList.size()!=invCodeList.size()){
Set<String> missCodes = new HashSet<>(); Set<String> missCodes = new HashSet<>();
for (String code : invCodeList) { for (String code : invCodeList) {
boolean noneMatch = skuList.stream().noneMatch(a->a.getSkuCode().equals(code)); boolean anyMatch = skuList.stream().anyMatch(a->a.getSkuCode().equals(code));
if(noneMatch){ if(!anyMatch){
missCodes.add(code); missCodes.add(code);
} }
} }
@ -1116,6 +1116,7 @@ public class PortalOfCostApplication {
if(CollectionUtil.isNotEmpty(invCodes)){ if(CollectionUtil.isNotEmpty(invCodes)){
LambdaQueryWrapper<GoodsSku> skuLqw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GoodsSku> skuLqw = new LambdaQueryWrapper<>();
skuLqw.in(GoodsSku::getSkuCode,invCodes); skuLqw.in(GoodsSku::getSkuCode,invCodes);
skuLqw.eq(GoodsSku::getEnable,1);
goodsSkus = goodsSkuService.list(skuLqw); goodsSkus = goodsSkuService.list(skuLqw);
if(invCodes.size()!=goodsSkus.size()){ if(invCodes.size()!=goodsSkus.size()){
List<String> skuCodeNotExistList = new ArrayList<>(); List<String> skuCodeNotExistList = new ArrayList<>();

2
src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@ -114,7 +114,7 @@ public class VtbVerificationApplication {
tbsTask.task1(); tbsTask.task1();
} }
} catch (BeansException e) { } catch (BeansException e) {
e.printStackTrace(); //e.printStackTrace();
} }
return r; return r;
}else if (result.getStatus()==500){ }else if (result.getStatus()==500){

Loading…
Cancel
Save