到货检验

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

@@ -106,7 +106,7 @@ public class ContractBudgetVo extends Contract {
     /**
      * 其他租户应付货款
      */
-    private BigDecimal otherumAmount;
+    private BigDecimal otherSumAmount;
 
     /**
      * 毛利

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

@@ -8,7 +8,7 @@ import lombok.Setter;
 
 /**
  * <p>
- * 质检问题表
+ * 质检工序表
  * </p>
  *
  * @author 

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

@@ -233,9 +233,9 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                         BigDecimal amount = new BigDecimal(concatAmountCurrency.split("-")[0]);
                         String currency = concatAmountCurrency.split("-")[1];
                         BigDecimal rate = currencyRateMap.getOrDefault(currency,BigDecimal.ONE);
-                        v.setOtherumAmount(amount.multiply(rate));
+                        v.setOtherSumAmount(amount.multiply(rate));
                     }else{
-                        v.setOtherumAmount(BigDecimal.ZERO);
+                        v.setOtherSumAmount(BigDecimal.ZERO);
                     }
                 }
                 if(StringUtils.isNotEmpty(v.getCurrencyRateJson())){//如果此条合同有汇率了
@@ -251,7 +251,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                             (v.getCommission()==null?BigDecimal.ZERO:v.getCommission().multiply(new BigDecimal(map.getOrDefault(v.getCommissionCurrency(),BigDecimal.ONE).toString()))).add
                             (v.getOther()==null?BigDecimal.ZERO:v.getOther().multiply(new BigDecimal(map.getOrDefault(v.getOtherCurrency(),BigDecimal.ONE).toString()))).add
                             (v.getEhsdSumAmount()==null?BigDecimal.ZERO:v.getEhsdSumAmount()).add
-                            (v.getOtherumAmount()==null?BigDecimal.ZERO:v.getOtherumAmount()));
+                            (v.getOtherSumAmount()==null?BigDecimal.ZERO:v.getOtherSumAmount()));
                 }else{//没有汇率取默认汇率
                     //计算收入总计=合同金额(转人民币)+应退税金额(转人民币)
                     v.setIncomeAmount(v.getAmount().multiply(currencyRateMap.getOrDefault(v.getContractId(),new BigDecimal("1"))).add(v.getRefundableAmount()));
@@ -264,7 +264,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract>
                             (v.getCommission()==null?BigDecimal.ZERO:v.getCommission().multiply(new BigDecimal(currencyRateMap.getOrDefault(v.getCommissionCurrency(),BigDecimal.ONE).toString()))).add
                             (v.getOther()==null?BigDecimal.ZERO:v.getOther().multiply(new BigDecimal(currencyRateMap.getOrDefault(v.getOtherCurrency(),BigDecimal.ONE).toString()))).add
                             (v.getEhsdSumAmount()==null?BigDecimal.ZERO:v.getEhsdSumAmount()).add
-                            (v.getOtherumAmount()==null?BigDecimal.ZERO:v.getOtherumAmount()));
+                            (v.getOtherSumAmount()==null?BigDecimal.ZERO:v.getOtherSumAmount()));
                 }
                 //计算毛利 收入-支出
                 v.setGross(v.getIncomeAmount().subtract(v.getExpenditureAmount()));

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

@@ -1,6 +1,7 @@
 package com.fjhx.sale.service.quality;
 
 import com.fjhx.sale.entity.quality.po.EhsdQuality;
+import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.quality.vo.EhsdQualityVo;

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

@@ -13,7 +13,7 @@ import com.fjhx.sale.mapper.quality.EhsdQualityMapper;
 import com.fjhx.sale.service.quality.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.obs.services.internal.ServiceException;
-import org.apache.http.entity.FileEntity;
+import com.ruoyi.common.annotation.LogicIgnore;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,7 +21,6 @@ import com.fjhx.sale.entity.quality.vo.EhsdQualityVo;
 import com.fjhx.sale.entity.quality.dto.EhsdQualitySelectDto;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.sale.entity.quality.dto.EhsdQualityDto;
-import cn.hutool.core.bean.BeanUtil;
 
 
 /**
@@ -82,22 +81,23 @@ public class EhsdQualityServiceImpl extends ServiceImpl<EhsdQualityMapper, EhsdQ
         if(ObjectUtils.isEmpty(quality)){
             throw new ServiceException("质检单不存在");
         }
-        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda().select(EhsdQualityAql.class, i -> !"id".equals(i.getColumn())).eq(EhsdQualityAql::getQualityId,id)));
-        quality.setEhsdQualityProblemList(ehsdQualityProblemService.list(Wrappers.<EhsdQualityProblem>query().lambda().eq(EhsdQualityProblem::getQualityId,id).select(EhsdQualityProblem.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualitySiteTestList(ehsdQualitySiteTestService.list(Wrappers.<EhsdQualitySiteTest>query().lambda().eq(EhsdQualitySiteTest::getQualityId,id).select(EhsdQualitySiteTest.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualityPackList(ehsdQualityPackService.list(Wrappers.<EhsdQualityPack>query().lambda().eq(EhsdQualityPack::getQualityId,id).select(EhsdQualityPack.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualityCartonsList(ehsdQualityCartonsService.list(Wrappers.<EhsdQualityCartons>query().lambda().eq(EhsdQualityCartons::getQualityId,id).select(EhsdQualityCartons.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualityWorkshipList(ehsdQualityWorkshipService.list(Wrappers.<EhsdQualityWorkship>query().lambda().eq(EhsdQualityWorkship::getQualityId,id).select(EhsdQualityWorkship.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualityProductColorList(ehsdQualityProductColorService.list(Wrappers.<EhsdQualityProductColor>query().lambda().eq(EhsdQualityProductColor::getQualityId,id).select(EhsdQualityProductColor.class, i -> !"id".equals(i.getColumn()))));
-        quality.setEhsdQualityProductList(ehsdQualityProductService.list(Wrappers.<EhsdQualityProduct>query().lambda().eq(EhsdQualityProduct::getQualityId,id).select(EhsdQualityProduct.class, i -> !"id".equals(i.getColumn()))));
+        quality.setEhsdQualityAqlList(ehsdQualityAqlService.list(Wrappers.<EhsdQualityAql>query().lambda()));
+        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)));
         return quality;
     }
 
     /**
-     * 添加
+     * 提交
      * @param ehsdQualityDto
      */
     @Override
+    @LogicIgnore(tableName = {""},alias = {""})
     public void submit(EhsdQualityDto ehsdQualityDto) {
         if(ObjectUtils.isEmpty(ehsdQualityDto.getId())){//添加
             ehsdQualityDto.setCode(codingRuleService.createCode(CodingRuleEnum.CONTRACT.getKey(),null));