admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改bug

Browse Source
This commit is contained in:
Administrator 2023-06-28 10:13:14 +08:00
parent ecd766b2f7
commit a2178a099e
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialPointCheckIntoWarehouseDetail.java
View File

@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
@ -72,12 +74,14 @@ public class GtMaterialPointCheckIntoWarehouseDetail implements Serializable {
*/ */
@Excel(name = "单价", width = 15) @Excel(name = "单价", width = 15)
@ApiModelProperty(value = "单价") @ApiModelProperty(value = "单价")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal unitPrice; private BigDecimal unitPrice;
/** /**
* 金额（元） * 金额（元）
*/ */
@Excel(name = "金额（元）", width = 15) @Excel(name = "金额（元）", width = 15)
@ApiModelProperty(value = "金额（元）") @ApiModelProperty(value = "金额（元）")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal amount; private BigDecimal amount;
/** /**
* 备注 * 备注

3
src/main/java/com/zhgd/xmgl/modules/gt/entity/GtMaterialWarehouseDetail.java
View File

@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.zhgd.xmgl.util.BigDecimalSerializer;
import lombok.Data; import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -62,6 +64,7 @@ public class GtMaterialWarehouseDetail implements Serializable {
*/ */
@Excel(name = "单价", width = 15) @Excel(name = "单价", width = 15)
@ApiModelProperty(value = "单价") @ApiModelProperty(value = "单价")
@JsonFormat(shape = JsonFormat.Shape.STRING)
private BigDecimal unitPrice; private BigDecimal unitPrice;
/** /**
* 库存 * 库存

3
src/main/java/com/zhgd/xmgl/modules/gt/service/impl/GtMaterialInOutWarehouseServiceImpl.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.gt.service.impl; package com.zhgd.xmgl.modules.gt.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -128,7 +129,7 @@ public class GtMaterialInOutWarehouseServiceImpl extends ServiceImpl<GtMaterialI
} else { } else {
//更新 //更新
GtMaterialWarehouseDetail d = existList.get(0); GtMaterialWarehouseDetail d = existList.get(0);
d.setStock(one.getQuantity() + d.getStock()); d.setStock(NumberUtil.add(one.getQuantity(), d.getStock()));
gtMaterialWarehouseDetailMapper.update(d, queryWrapper); gtMaterialWarehouseDetailMapper.update(d, queryWrapper);
} }
} }