diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
index 37b19af6..c7419bf3 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
@@ -231,4 +231,7 @@ public class Type extends BaseEntity {
@ApiModelProperty(value = "协议id")
private Long agreementId;
+ @ApiModelProperty(value = "不含税单价")
+ private BigDecimal notTaxPrice;
+
}
diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
index 10f46a71..1fe0e519 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/purchase/service/impl/PurchaseCheckInfoServiceImpl.java
@@ -467,14 +467,16 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService {
bmFileInfoMapper.insertBmFileInfos(bmFileInfos);
}
Type type = new Type();
+ type.setTypeId(details.getTypeId());
+ type.setUpdateTime(DateUtils.getNowDate());
+ type.setUpdateBy(SecurityUtils.getLoginUser().getUserid().toString());
+ type.setBuyPrice(details.getPurchaseTaxPrice());
+ type.setNotTaxPrice(details.getPurchasePrice());
Type maType = typeMapper.getMaType(details.getTypeId());
if (maType != null && (maType.getRentPrice() == null || maType.getRentPrice().compareTo(BigDecimal.ZERO) == 0)) {
- type.setTypeId(details.getTypeId());
type.setRentPrice(details.getRentPrice());
- type.setUpdateTime(DateUtils.getNowDate());
- type.setUpdateBy(SecurityUtils.getLoginUser().getUserid().toString());
- typeMapper.updateType(type);
}
+ typeMapper.updateType(type);
}
// 批量插入详情数据
final int count = purchaseCheckDetailsMapper.insertPurchaseCheckDetailsList(purchaseCheckDetailsList);
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index 0d231c68..a8a3e42d 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -325,6 +325,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
intelligent_code = #{intelligentCode},
is_test = #{isTest},
sampling_ratio = #{samplingRatio},
+ notax_price = #{notTaxPrice},
where type_id = #{typeId}