diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
index ae6e97dbc..f32e0a868 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.zhgd.xmgl.util.BigDecimalSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -72,12 +74,14 @@ public class GtMaterialPointCheckIntoWarehouseDetail implements Serializable {
      */
     @Excel(name = "单价", width = 15)
     @ApiModelProperty(value = "单价")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal unitPrice;
     /**
      * 金额（元）
      */
     @Excel(name = "金额（元）", width = 15)
     @ApiModelProperty(value = "金额（元）")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal amount;
     /**
      * 备注
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialWarehouseDetail.java b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialWarehouseDetail.java
index 4e57ef5bc..56c461bc3 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialWarehouseDetail.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialWarehouseDetail.java
@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.zhgd.xmgl.util.BigDecimalSerializer;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -62,6 +64,7 @@ public class GtMaterialWarehouseDetail implements Serializable {
      */
     @Excel(name = "单价", width = 15)
     @ApiModelProperty(value = "单价")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private BigDecimal unitPrice;
     /**
      * 库存
diff --git a/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java
index 52a3efc70..247f6d127 100644
--- a/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zhgd.xmgl.modules.gt.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -128,7 +129,7 @@ public class GtMaterialInOutWarehouseServiceImpl extends ServiceImpl<GtMaterialI
                 } else {
                     //更新
                     GtMaterialWarehouseDetail d = existList.get(0);
-                    d.setStock(one.getQuantity() + d.getStock());
+                    d.setStock(NumberUtil.add(one.getQuantity(), d.getStock()));
                     gtMaterialWarehouseDetailMapper.update(d, queryWrapper);
                 }
             }