Showing
1 changed file
with
6 additions
and
36 deletions
| ... | ... | @@ -331,27 +331,10 @@ public class ContractDistributorStandardServiceImpl extends |
| 331 | 331 | return; |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | - Set<String> contractIds = inventoryContracts.stream() | |
| 335 | - .map(ContractDistributorStandard::getId) | |
| 336 | - .filter(StringUtils::isNotBlank) | |
| 337 | - .collect(Collectors.toSet()); | |
| 338 | - Set<String> approvedProductionOrderContractIds = Collections.emptySet(); | |
| 339 | - if (CollectionUtils.isNotEmpty(contractIds)) { | |
| 340 | - Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class) | |
| 341 | - .in(PurchaseOrderInfo::getContractId, contractIds) | |
| 342 | - .eq(PurchaseOrderInfo::getType, "PRODUCTION") | |
| 343 | - .eq(PurchaseOrderInfo::getExamineStatus, "PASS"); | |
| 344 | - approvedProductionOrderContractIds = CollectionUtils.emptyIfNull(purchaseOrderInfoService.list(orderInfoWrapper)).stream() | |
| 345 | - .map(PurchaseOrderInfo::getContractId) | |
| 346 | - .filter(StringUtils::isNotBlank) | |
| 347 | - .collect(Collectors.toSet()); | |
| 348 | - } | |
| 349 | - | |
| 350 | - Set<String> finalApprovedProductionOrderContractIds = approvedProductionOrderContractIds; | |
| 351 | 334 | CollectionUtils.emptyIfNull(datas).stream() |
| 352 | 335 | .filter(Objects::nonNull) |
| 353 | 336 | .forEach(data -> data.setCanPriceLock( |
| 354 | - isCanPriceLock(data, finalApprovedProductionOrderContractIds.contains(data.getId())))); | |
| 337 | + isCanPriceLock(data))); | |
| 355 | 338 | } |
| 356 | 339 | |
| 357 | 340 | /** |
| ... | ... | @@ -364,36 +347,23 @@ public class ContractDistributorStandardServiceImpl extends |
| 364 | 347 | return; |
| 365 | 348 | } |
| 366 | 349 | |
| 367 | - boolean hasApprovedProductionOrder = false; | |
| 368 | - if (isInventoryContract(data)) { | |
| 369 | - Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class) | |
| 370 | - .eq(PurchaseOrderInfo::getContractId, data.getId()) | |
| 371 | - .eq(PurchaseOrderInfo::getType, "PRODUCTION") | |
| 372 | - .eq(PurchaseOrderInfo::getExamineStatus, "PASS"); | |
| 373 | - hasApprovedProductionOrder = CollectionUtils.isNotEmpty(purchaseOrderInfoService.list(orderInfoWrapper)); | |
| 374 | - } | |
| 375 | - data.setCanPriceLock(isCanPriceLock(data, hasApprovedProductionOrder)); | |
| 350 | + data.setCanPriceLock(isCanPriceLock(data)); | |
| 376 | 351 | } |
| 377 | 352 | |
| 378 | 353 | /** |
| 379 | 354 | * 判断是否可锁价 |
| 380 | 355 | * |
| 381 | - * @param data 合同 | |
| 382 | - * @param hasApprovedProductionOrder 是否存在已审核通过的生产订货单 | |
| 356 | + * @param data 合同 | |
| 383 | 357 | * @return 是否可锁价 |
| 384 | 358 | */ |
| 385 | - private boolean isCanPriceLock(ContractDistributorStandard data, boolean hasApprovedProductionOrder) { | |
| 386 | - if (data == null || !isInventoryContract(data)) { | |
| 359 | + private boolean isCanPriceLock(ContractDistributorStandard data) { | |
| 360 | + if (!isInventoryContract(data)) { | |
| 387 | 361 | return false; |
| 388 | 362 | } |
| 389 | 363 | if (Boolean.TRUE.equals(data.getPriceSpecLocked())) { |
| 390 | 364 | return false; |
| 391 | 365 | } |
| 392 | - //锁价的时候不需要审核通过 | |
| 393 | -// if (!CustomerDevelopStatus.PASS.name().equals(data.getFormalApproved())) { | |
| 394 | -// return false; | |
| 395 | -// } | |
| 396 | - return hasApprovedProductionOrder; | |
| 366 | + return true; | |
| 397 | 367 | } |
| 398 | 368 | |
| 399 | 369 | /** | ... | ... |