代码清理

hx-purchase/src/main/java/com/fjhx/purchase/service/purchase/impl/PurchaseServiceImpl.java

@@ -28,7 +28,6 @@ import com.fjhx.purchase.entity.purchase.vo.PurchaseVo;
 import com.fjhx.purchase.entity.subscribe.po.Subscribe;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.mapper.purchase.PurchaseMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.invoice.InvoiceDetailsService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
@@ -80,8 +79,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
     @Autowired
     private ProductInfoService productInfoService;
 
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
+//    @Autowired
+//    private ArrivalDetailService arrivalDetailService;
 
 
     @Autowired
@@ -299,8 +298,8 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
             if (MapUtils.isNotEmpty(productMap)) {
                 for (PurchaseDetail p : purchaseDetailList) {
                     //查询出到货总量
-                    BigDecimal sumArrivalCount = arrivalDetailService.getSumCount(p.getId(), p.getBussinessId());
-                    p.setSumArrivalCount(sumArrivalCount);
+//                    BigDecimal sumArrivalCount = arrivalDetailService.getSumCount(p.getId(), p.getBussinessId());
+//                    p.setSumArrivalCount(sumArrivalCount);
                     List<ProductInfoVo> productInfoVos = productMap.getOrDefault(p.getBussinessId(), null);
                     ProductInfoVo vo = productInfoVos.get(0);
                     p.setProductCode(vo.getCode());
@@ -359,7 +358,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
         if (StringUtils.isEmpty(supplyId)) {
             throw new ServiceException("供应商ID不能为空");
         }
-        List<Purchase> list = this.list(Wrappers.<Purchase>query().lambda().eq(Purchase::getSupplyId, supplyId).eq(Purchase::getPurchaseStatus, PurchaseStatusEnum.PASS.getKey()).ne(Purchase::getInvoiceType,"0"));
+        List<Purchase> list = this.list(Wrappers.<Purchase>query().lambda().eq(Purchase::getSupplyId, supplyId).eq(Purchase::getPurchaseStatus, PurchaseStatusEnum.PASS.getKey()).ne(Purchase::getInvoiceType, "0"));
         List<Long> ids = list.stream().distinct().map(Purchase::getId).collect(Collectors.toList());
         List<InvoiceDetailsVo> invoiceDetailsList = invoiceDetailsService.getSumMoneyByPurchaseIds(ids);
         Map<Long, BigDecimal> invoiceMap = invoiceDetailsList.stream().collect(Collectors.toMap(InvoiceDetailsVo::getPurchaseId, InvoiceDetailsVo::getSumMoney));
@@ -380,6 +379,7 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
         return list;
     }
+
     /**
      * 根据供应商查询无发票的采购合同
      *
@@ -523,12 +523,13 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase>
 
     /**
      * 批量查询
+     *
      * @param ids
      * @return
      */
     @Override
     public List<Purchase> getListInId(List<Long> ids) {
-        List<Purchase> list = this.list(Wrappers.<Purchase>query().lambda().in(Purchase::getId,ids));
+        List<Purchase> list = this.list(Wrappers.<Purchase>query().lambda().in(Purchase::getId, ids));
         return list;
     }
 

hx-purchase/src/main/java/com/fjhx/purchase/service/quality/impl/QualityServiceImpl.java

@@ -5,8 +5,6 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.common.service.coding.CodingRuleService;
-import com.fjhx.purchase.entity.arrival.enums.ArrivalDetailStatusEnum;
 import com.fjhx.purchase.entity.arrival.po.ArrivalDetail;
 import com.fjhx.purchase.entity.quality.dto.QualityDto;
 import com.fjhx.purchase.entity.quality.dto.QualitySelectDto;
@@ -14,7 +12,6 @@ import com.fjhx.purchase.entity.quality.po.Quality;
 import com.fjhx.purchase.entity.quality.po.QualityDetail;
 import com.fjhx.purchase.entity.quality.vo.QualityVo;
 import com.fjhx.purchase.mapper.quality.QualityMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.quality.QualityDetailService;
 import com.fjhx.purchase.service.quality.QualityService;
 import com.ruoyi.common.exception.ServiceException;
@@ -32,23 +29,15 @@ import java.util.List;
  * 质检 服务实现类
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-04-11
  */
-//@DS(SourceConstant.PURCHASE)
 @Service
 public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> implements QualityService {
 
     @Autowired
     private QualityDetailService qualityDetailService;
 
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
-
-
-    @Autowired
-    private CodingRuleService codingRuleService;
-
     @Override
     public Page<QualityVo> getPage(QualitySelectDto dto) {
         IWrapper<Quality> wrapper = getWrapper();
@@ -66,6 +55,7 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
 
     /**
      * 添加
+     *
      * @param quality
      */
     @Override
@@ -75,29 +65,29 @@ public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> impl
 //        quality.setCode(codingRuleService.createCode(CodingRuleEnum.QUALITY.getKey(),null));
         this.save(quality);
         List<QualityDetail> qualityDetailList = quality.getQualityDetailList();
-        if(CollectionUtils.isNotEmpty(qualityDetailList)){
+        if (CollectionUtils.isNotEmpty(qualityDetailList)) {
             List<ArrivalDetail> upAll = new ArrayList<>();
-            for(QualityDetail q:qualityDetailList){
-                if(q.getQualifiedCount().compareTo(BigDecimal.ZERO)==0
-                        &&q.getNoQualifiedCount().compareTo(BigDecimal.ZERO)==0){
+            for (QualityDetail q : qualityDetailList) {
+                if (q.getQualifiedCount().compareTo(BigDecimal.ZERO) == 0
+                        && q.getNoQualifiedCount().compareTo(BigDecimal.ZERO) == 0) {
                     throw new ServiceException("当前质检数量不能为0");
                 }
                 q.setQualityId(quality.getId());
                 //赋值质检状态
                 BigDecimal qualityCount = qualityDetailService.getSumQualityCount(q.getArrivalDetailId());
                 //查询到货数量
-                ArrivalDetail arrivalDetail = arrivalDetailService.getById(q.getArrivalDetailId());
+//                ArrivalDetail arrivalDetail = arrivalDetailService.getById(q.getArrivalDetailId());
                 BigDecimal sum = qualityCount.add(q.getQualifiedCount().add(q.getNoQualifiedCount()));
                 ArrivalDetail up = new ArrivalDetail();
                 up.setId(q.getArrivalDetailId());
-                if(sum.compareTo(arrivalDetail.getCount())>-1){//如果质检数量大于等于到货数量
-                    up.setStatus(ArrivalDetailStatusEnum.STATUS_20.getKey());
-                }else{
-                    up.setStatus(ArrivalDetailStatusEnum.STATUS_10.getKey());
-                }
+//                if(sum.compareTo(arrivalDetail.getCount())>-1){//如果质检数量大于等于到货数量
+//                    up.setStatus(ArrivalDetailStatusEnum.STATUS_20.getKey());
+//                }else{
+//                    up.setStatus(ArrivalDetailStatusEnum.STATUS_10.getKey());
+//                }
                 upAll.add(up);
             }
-            arrivalDetailService.updateBatchById(upAll);
+//            arrivalDetailService.updateBatchById(upAll);
             qualityDetailService.saveBatch(qualityDetailList);
         }
     }

hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractServiceImpl.java

@@ -54,7 +54,6 @@ import com.fjhx.purchase.entity.pay.po.Pay;
 import com.fjhx.purchase.entity.quality.po.QualityDetail;
 import com.fjhx.purchase.entity.subscribe.po.SubscribeDetail;
 import com.fjhx.purchase.mapper.subscribe.SubscribeDetailMapper;
-import com.fjhx.purchase.service.arrival.ArrivalDetailService;
 import com.fjhx.purchase.service.pay.PayDetailService;
 import com.fjhx.purchase.service.quality.QualityDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
@@ -179,8 +178,6 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     @Autowired
     private ContractDocumentaryService contractDocumentaryService;
 
-    @Autowired
-    private ArrivalDetailService arrivalDetailService;
 
     @Autowired
     private QualityDetailService qualityDetailService;
@@ -1856,11 +1853,11 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         // 赋值采购合同数据
         setPurchaseInfo(vo, purchaseList, purchaseDetailList);
 
-        // 赋值到货数据
-        List<ArrivalDetail> arrivalDetails = setInvoiceQuantity(vo);
-
-        // 赋值合格率
-        setPassRate(vo, arrivalDetails);
+//        // 赋值到货数据
+//        List<ArrivalDetail> arrivalDetails = setInvoiceQuantity(vo);
+//
+//        // 赋值合格率
+//        setPassRate(vo, arrivalDetails);
 
         // TODO 赋值退货数量 无法关联
 
@@ -1911,32 +1908,32 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
     /**
      * 赋值到货数据
      */
-    private List<ArrivalDetail> setInvoiceQuantity(PayDecisionAidVo vo) {
-        List<PayDecisionAidVo.PurchaseInfo> purchaseInfoList = vo.getPurchaseInfoList();
-
-        // 采购明细id列表
-        List<Long> purchaseDetailsIdList = purchaseInfoList.stream()
-                .map(PayDecisionAidVo.PurchaseInfo::getPurchaseDetailsId).collect(Collectors.toList());
-
-        if (purchaseDetailsIdList.size() == 0) {
-            return Collections.emptyList();
-        }
-
-        List<ArrivalDetail> list = arrivalDetailService.list(q -> q.eq(ArrivalDetail::getPurchaseDetailId, purchaseDetailsIdList));
+//    private List<ArrivalDetail> setInvoiceQuantity(PayDecisionAidVo vo) {
+//        List<PayDecisionAidVo.PurchaseInfo> purchaseInfoList = vo.getPurchaseInfoList();
+//
+//        // 采购明细id列表
+//        List<Long> purchaseDetailsIdList = purchaseInfoList.stream()
+//                .map(PayDecisionAidVo.PurchaseInfo::getPurchaseDetailsId).collect(Collectors.toList());
+//
+//        if (purchaseDetailsIdList.size() == 0) {
+//            return Collections.emptyList();
+//        }
 
-        Map<Long, BigDecimal> collect = list.stream().collect(Collectors.toMap(
-                ArrivalDetail::getPurchaseDetailId,
-                ArrivalDetail::getCount,
-                BigDecimal::add
-        ));
+//        List<ArrivalDetail> list = arrivalDetailService.list(q -> q.eq(ArrivalDetail::getPurchaseDetailId, purchaseDetailsIdList));
 
-        for (PayDecisionAidVo.PurchaseInfo purchaseInfo : purchaseInfoList) {
-            BigDecimal invoiceQuantity = collect.getOrDefault(purchaseInfo.getPurchaseDetailsId(), BigDecimal.ZERO);
-            purchaseInfo.setInvoiceQuantity(invoiceQuantity);
-        }
+//        Map<Long, BigDecimal> collect = list.stream().collect(Collectors.toMap(
+//                ArrivalDetail::getPurchaseDetailId,
+//                ArrivalDetail::getCount,
+//                BigDecimal::add
+//        ));
 
-        return list;
-    }
+//        for (PayDecisionAidVo.PurchaseInfo purchaseInfo : purchaseInfoList) {
+//            BigDecimal invoiceQuantity = collect.getOrDefault(purchaseInfo.getPurchaseDetailsId(), BigDecimal.ZERO);
+//            purchaseInfo.setInvoiceQuantity(invoiceQuantity);
+//        }
+//
+//        return list;
+//    }
 
     /**
      * 赋值采购合同数据