From 8b614fd7dd68e90560ad1fb00604761b54d5a58d Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Mon, 30 Jun 2025 10:09:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=B4=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/bonus/material/ma/domain/Type.java   |  3 +++
 .../service/impl/PurchaseCheckInfoServiceImpl.java     | 10 ++++++----
 .../main/resources/mapper/material/ma/TypeMapper.xml   |  1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

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"
             <if test="intelligentCode != null">intelligent_code = #{intelligentCode},</if>
             <if test="isTest != null">is_test = #{isTest},</if>
             <if test="samplingRatio != null">sampling_ratio = #{samplingRatio},</if>
+            <if test="notTaxPrice != null">notax_price = #{notTaxPrice},</if>
         </trim>
         where type_id = #{typeId}
     </update>