锁价功能回退（生成订货单审核通过后才能锁价-回退）

@@ -331,27 +331,10 @@ public class ContractDistributorStandardServiceImpl extends
             return;
             return;
         }
         }
 
 
-        Set<String> contractIds = inventoryContracts.stream()
-                .map(ContractDistributorStandard::getId)
-                .filter(StringUtils::isNotBlank)
-                .collect(Collectors.toSet());
-        Set<String> approvedProductionOrderContractIds = Collections.emptySet();
-        if (CollectionUtils.isNotEmpty(contractIds)) {
-            Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
-                    .in(PurchaseOrderInfo::getContractId, contractIds)
-                    .eq(PurchaseOrderInfo::getType, "PRODUCTION")
-                    .eq(PurchaseOrderInfo::getExamineStatus, "PASS");
-            approvedProductionOrderContractIds = CollectionUtils.emptyIfNull(purchaseOrderInfoService.list(orderInfoWrapper)).stream()
-                    .map(PurchaseOrderInfo::getContractId)
-                    .filter(StringUtils::isNotBlank)
-                    .collect(Collectors.toSet());
-        }
-
-        Set<String> finalApprovedProductionOrderContractIds = approvedProductionOrderContractIds;
         CollectionUtils.emptyIfNull(datas).stream()
         CollectionUtils.emptyIfNull(datas).stream()
                 .filter(Objects::nonNull)
                 .filter(Objects::nonNull)
                 .forEach(data -> data.setCanPriceLock(
                 .forEach(data -> data.setCanPriceLock(
-                        isCanPriceLock(data, finalApprovedProductionOrderContractIds.contains(data.getId()))));
+                        isCanPriceLock(data)));
     }
     }
 
 
     /**
     /**
@@ -364,36 +347,23 @@ public class ContractDistributorStandardServiceImpl extends
             return;
             return;
         }
         }
 
 
-        boolean hasApprovedProductionOrder = false;
-        if (isInventoryContract(data)) {
-            Wrapper<PurchaseOrderInfo> orderInfoWrapper = Wrappers.lambdaQuery(PurchaseOrderInfo.class)
-                    .eq(PurchaseOrderInfo::getContractId, data.getId())
-                    .eq(PurchaseOrderInfo::getType, "PRODUCTION")
-                    .eq(PurchaseOrderInfo::getExamineStatus, "PASS");
-            hasApprovedProductionOrder = CollectionUtils.isNotEmpty(purchaseOrderInfoService.list(orderInfoWrapper));
-        }
-        data.setCanPriceLock(isCanPriceLock(data, hasApprovedProductionOrder));
+        data.setCanPriceLock(isCanPriceLock(data));
     }
     }
 
 
     /**
     /**
      * 判断是否可锁价
      * 判断是否可锁价
      *
      *
-     * @param data                      合同
-     * @param hasApprovedProductionOrder 是否存在已审核通过的生产订货单
+     * @param data 合同
      * @return 是否可锁价
      * @return 是否可锁价
      */
      */
-    private boolean isCanPriceLock(ContractDistributorStandard data, boolean hasApprovedProductionOrder) {
-        if (data == null || !isInventoryContract(data)) {
+    private boolean isCanPriceLock(ContractDistributorStandard data) {
+        if (!isInventoryContract(data)) {
             return false;
             return false;
         }
         }
         if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
         if (Boolean.TRUE.equals(data.getPriceSpecLocked())) {
             return false;
             return false;
         }
         }
-        //锁价的时候不需要审核通过
-//        if (!CustomerDevelopStatus.PASS.name().equals(data.getFormalApproved())) {
-//            return false;
-//        }
-        return hasApprovedProductionOrder;
+        return true;
     }
     }
 
 
     /**
     /**