到账认领

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -69,7 +69,7 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         }
         if(ObjectUtil.isNotEmpty(dto.getDataType())&&dto.getDataType()==1){//到账认领数据
             wrapper.eq("arw.received",10);
-            wrapper.orderByDesc("arw.is_claim","arw.create_time");
+            wrapper.orderByAsc("arw.is_claim","arw.create_time");
         }
         Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/Claim.java

@@ -79,5 +79,6 @@ public class Claim extends BasePo {
     /**
      * 总金额
      */
+    @TableField(exist = false)
     private BigDecimal sumAmount;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/dto/ContractSelectDto.java

@@ -39,4 +39,9 @@ public class ContractSelectDto extends BaseSelectDto {
      */
     private String userId;
 
+    /**
+     * 到款状态
+     */
+    private String refundStatusNew;
+
 }

hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractVo.java

@@ -109,5 +109,9 @@ public class ContractVo extends Contract {
      */
     private String customerName;
 
+    /**
+     * 新到款状态
+     */
+    private String refundStatusNew;
 }
 

hx-sale/src/main/java/com/fjhx/sale/entity/quality/po/EhsdQuality.java

@@ -210,7 +210,7 @@ public class EhsdQuality extends BasePo {
      * 样品采集记录文件列表
      */
     @TableField(exist = false)
-    private List<ObsFile> SampleCollectionRecordFileList;
+    private List<ObsFile> sampleCollectionRecordFileList;
 
     /**
      * 工序照片文件列表

hx-sale/src/main/java/com/fjhx/sale/service/claim/impl/ClaimServiceImpl.java

@@ -15,6 +15,7 @@ import com.fjhx.sale.service.claim.ClaimContractService;
 import com.fjhx.sale.service.claim.ClaimService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -27,6 +28,7 @@ import cn.hutool.core.bean.BeanUtil;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -80,6 +82,8 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
         if(water.getClaimAmount().add(claim.getAmount()).compareTo(water.getAmount())>0){//如果认领金额>流水金额---驳回
             throw new ServiceException("认领金额不能大于流水金额");
         }
+        claim.setClaimUserId(SecurityUtils.getUserId());
+        claim.setClaimUserName(SecurityUtils.getUsername());
         this.save(claim);
         List<ClaimContract> claimContractList = claim.getClaimContractList();
         if(CollectionUtils.isNotEmpty(claim.getClaimContractList())){
@@ -110,15 +114,16 @@ public class ClaimServiceImpl extends ServiceImpl<ClaimMapper, Claim> implements
     @DSTransactional
     public void delete(Long id) {
         //通过流水ID查找出到账认领的数据
-        Claim claim = this.getOne(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
-        if(ObjectUtils.isNotEmpty(claim.getBusinessId())){
+        List<Claim> claimList = this.list(Wrappers.<Claim>query().lambda().eq(Claim::getBusinessId,id));
+        if(CollectionUtils.isNotEmpty(claimList)){
+            List<Long> claimIds = claimList.stream().map(Claim::getId).collect(Collectors.toList());
             //更新流水数据为认领状态
             AccountRunningWater water = new AccountRunningWater();
-            water.setId(claim.getBusinessId());
+            water.setId(id);
             water.setIsClaim(0);//未认领状态
             accountRunningWaterService.updateById(water);
-            this.removeById(claim.getId());
-            claimContractService.remove(Wrappers.<ClaimContract>query().lambda().eq(ClaimContract::getClaimId,claim.getId()));
+            this.removeBatchByIds(claimIds);
+            claimContractService.remove(Wrappers.<ClaimContract>query().lambda().in(ClaimContract::getClaimId,claimIds));
         }
 
     }

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

@@ -196,10 +196,10 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
         }
         Page<ContractProductVo> page = this.baseMapper.getEHSDPage(dto.getPage(), wrapper);
         List<ContractProductVo> list = page.getRecords();
-        //查出所有质检状态
-        List<Long> contractProductIds = list.stream().map(ContractProductVo::getId).collect(Collectors.toList());
-        List<EhsdQuality> qualityList = ehsdQualityService.list(Wrappers.<EhsdQuality>query().lambda().in(EhsdQuality::getBusinessId,contractProductIds));
-        Map<Long,Integer> qualityMap = qualityList.stream().distinct().collect(Collectors.toMap(EhsdQuality::getBusinessId,EhsdQuality::getStatus));
+//        //查出所有质检状态
+//        List<Long> contractProductIds = list.stream().map(ContractProductVo::getId).collect(Collectors.toList());
+//        List<EhsdQuality> qualityList = ehsdQualityService.list(Wrappers.<EhsdQuality>query().lambda().in(EhsdQuality::getBusinessId,contractProductIds));
+//        Map<Long,Integer> qualityMap = qualityList.stream().distinct().collect(Collectors.toMap(EhsdQuality::getBusinessId,EhsdQuality::getStatus));
         if(CollectionUtils.isNotEmpty(list)){
             // 赋值产品属性
             productInfoService.attributeAssign(list, ContractProductVo::getProductId, (item, product) -> {
@@ -223,9 +223,9 @@ public class ContractProductServiceImpl extends ServiceImpl<ContractProductMappe
                 item.setSupplyName(supplier.getName());
                 item.setSupplyId(item.getId());
             });
-            if(CollectionUtils.isNotEmpty(qualityMap)){
-                list.forEach(i -> i.setQualityStatus(qualityMap.getOrDefault(i.getId(),null)));
-            }
+//            if(CollectionUtils.isNotEmpty(qualityMap)){
+//                list.forEach(i -> i.setQualityStatus(qualityMap.getOrDefault(i.getId(),null)));
+//            }
         }
         return page;
     }

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

@@ -147,6 +147,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
         if (StringUtils.isNotEmpty(dto.getSellCorporationId())) {
             wrapper.eq("t1", Contract::getSellCorporationId, dto.getSellCorporationId());
         }
+        if (StringUtils.isNotEmpty(dto.getRefundStatusNew())) {
+            wrapper.eq("t1.refundStatusNew", dto.getRefundStatusNew());
+        }
         if (StringUtils.isNotEmpty(dto.getKeyword())) {
             wrapper.keyword(dto.getKeyword(), new SqlField("t1", Contract::getCode));
         }

hx-sale/src/main/java/com/fjhx/sale/service/quality/impl/EhsdQualityServiceImpl.java

@@ -84,15 +84,15 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
         if(ObjectUtils.isEmpty(quality)){
             throw new ServiceException("质检单不存在");
         }
-        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda().eq(EhsdQualityAql::getQualityId,id)));
-        quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda().eq(EhsdQualityMarkingDetail::getQualityId,id)));
-        quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,id)));
-        quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,id)));
-        quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,id)));
-        quality.setEhsdQualityCartonsList(ehsdQualityCartonsService.list(Wrappers.<EhsdQualityCartons>query().lambda().eq(EhsdQualityCartons::getQualityId,id)));
-        quality.setEhsdQualityWorkshipList(ehsdQualityWorkshipService.list(Wrappers.<EhsdQualityWorkship>query().lambda().eq(EhsdQualityWorkship::getQualityId,id)));
-        quality.setEhsdQualityProductColorList(ehsdQualityProductColorService.list(Wrappers.<EhsdQualityProductColor>query().lambda().eq(EhsdQualityProductColor::getQualityId,id)));
-        quality.setEhsdQualityProductList(ehsdQualityProductService.list(Wrappers.<EhsdQualityProduct>query().lambda().eq(EhsdQualityProduct::getQualityId,id)));
+        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda().eq(EhsdQualityAql::getQualityId,quality.getId())));
+        quality.setEhsdQualityMarkingDetails(ehsdQualityMarkingDetailService.list(Wrappers.<EhsdQualityMarkingDetail>query().lambda().eq(EhsdQualityMarkingDetail::getQualityId,quality.getId())));
+        quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,quality.getId())));
+        quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,quality.getId())));
+        quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,quality.getId())));
+        quality.setEhsdQualityCartonsList(ehsdQualityCartonsService.list(Wrappers.<EhsdQualityCartons>query().lambda().eq(EhsdQualityCartons::getQualityId,quality.getId())));
+        quality.setEhsdQualityWorkshipList(ehsdQualityWorkshipService.list(Wrappers.<EhsdQualityWorkship>query().lambda().eq(EhsdQualityWorkship::getQualityId,quality.getId())));
+        quality.setEhsdQualityProductColorList(ehsdQualityProductColorService.list(Wrappers.<EhsdQualityProductColor>query().lambda().eq(EhsdQualityProductColor::getQualityId,quality.getId())));
+        quality.setEhsdQualityProductList(ehsdQualityProductService.list(Wrappers.<EhsdQualityProduct>query().lambda().eq(EhsdQualityProduct::getQualityId,quality.getId())));
         return quality;
     }
 
@@ -122,8 +122,8 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
             ehsdQualityProductColorService.remove(Wrappers.<EhsdQualityProductColor>query().lambda().eq(EhsdQualityProductColor::getQualityId,ehsdQualityDto.getId()));
             ehsdQualityProblemService.remove(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,ehsdQualityDto.getId()));
             ehsdQualitySiteTestService.remove(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,ehsdQualityDto.getId()));
-            //清空文件
-            ObsFileUtil.removeFile(ehsdQualityDto.getId());
+//            //清空文件
+//            ObsFileUtil.removeFile(ehsdQualityDto.getId());
         }
         if(CollectionUtils.isNotEmpty(ehsdQualityDto.getEhsdQualityAqlList())){
             ehsdQualityDto.getEhsdQualityAqlList().forEach(object -> object.setQualityId(ehsdQualityDto.getId()));

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -3,11 +3,27 @@
 <mapper namespace="com.fjhx.sale.mapper.contract.ContractMapper">
     <select id="getPage" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
         SELECT
+            *
+        FROM
+        (
+            SELECT
+                t1.*,
+                CASE
+                WHEN ( t1.amount - t1.sumClaimMoney ) &lt;= 0 THEN
+                20
+                WHEN t1.sumClaimMoney = 0 THEN
+                0 ELSE 10
+            END AS refundStatusNew
+        FROM
+        (
+            SELECT
             t1.*,
-            (select SUM(money) from claim_contract WHERE contract_id = t1.id) AS sumClaimMoney
+            ( SELECT IFNULL( SUM( money ), 0 ) FROM claim_contract WHERE contract_id = t1.id ) AS sumClaimMoney
         FROM
             contract t1
-            ${ew.customSqlSegment}
+            ) t1
+        ) t1
+        ${ew.customSqlSegment}
     </select>
 
     <select id="getProfitClearingPage" resultType="com.fjhx.sale.entity.contract.vo.ContractBudgetVo">

hx-sale/src/main/resources/mapper/contract/ContractProductMapper.xml

@@ -22,6 +22,7 @@
         FROM
             (
                 SELECT
+                    IFNULL(t3.`status`,0) AS quanlityStatus,
                     t1.create_time AS ct,
                     "外销合同" AS orderType,
                     t1.id,
@@ -39,11 +40,13 @@
                 FROM
                     contract_product t1
                 LEFT JOIN contract t2 ON t1.contract_id = t2.id
+                LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
                 WHERE
                     t2.`status` >= 30
                     AND t2.`status` < 88 AND t1.expend_quantity > 0
         UNION ALL
                 SELECT
+                    IFNULL(t3.`status`,0) AS quanlityStatus,
                     t1.create_time AS ct,
                     "样品单" AS orderType,
                     t1.id,
@@ -61,6 +64,7 @@
                 FROM
                     sample_product t1
                     LEFT JOIN sample t2 ON t1.sample_id = t2.id
+                    LEFT JOIN ehsd_quality t3 ON t1.id = t3.business_id
                     WHERE
                     t2.`status` >= 30
                     AND t2.`status` < 88 AND t1.expend_quantity > 0