czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

默认单位

This commit is contained in:
wangw 2024-11-04 10:27:23 +08:00
parent 00e7b35926
commit 6f6085343f
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfo.java
View File

@ -61,6 +61,10 @@ public class TbConsInfo implements Serializable {
@ApiModelProperty(value = "单位换算") @ApiModelProperty(value = "单位换算")
private BigDecimal conUnitTwoConvert; private BigDecimal conUnitTwoConvert;
@Column(name = "`default_unit`")
@ApiModelProperty(value = "默认入库单位")
private String defaultUnit;
@Column(name = "`laster_in_stock`") @Column(name = "`laster_in_stock`")
@ApiModelProperty(value = "最近一次入库量") @ApiModelProperty(value = "最近一次入库量")
private BigDecimal lasterInStock; private BigDecimal lasterInStock;

4
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsInfoV2.java
View File

@ -63,6 +63,10 @@ public class TbConsInfoV2 implements Serializable {
@ApiModelProperty(value = "单位换算") @ApiModelProperty(value = "单位换算")
private BigDecimal conUnitTwoConvert; private BigDecimal conUnitTwoConvert;
@Column(name = "`default_unit`")
@ApiModelProperty(value = "默认入库单位")
private String defaultUnit;
@Column(name = "`laster_in_stock`") @Column(name = "`laster_in_stock`")
@ApiModelProperty(value = "最近一次入库量") @ApiModelProperty(value = "最近一次入库量")

10
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoServiceImpl.java
View File

@ -231,10 +231,18 @@ public class TbConsInfoServiceImpl implements TbConsInfoService {
} }
BigDecimal changeStock = conInfos.getStockNumber(); BigDecimal changeStock = conInfos.getStockNumber();
//副单位的实际修改值 //副单位的实际修改值
if (StringUtils.isNotBlank(conInfos.getUnit()) && conInfos.getUnit().equals(info.getConUnitTwo())) { if(StringUtils.isNotBlank(conInfos.getUnit())){
info.setDefaultUnit(conInfos.getUnit());
if(conInfos.getUnit().equals(info.getConUnitTwo())){
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
}
}else if(info.getConUnitTwo().equals(info.getDefaultUnit())) {
info.setDefaultUnit(info.getConUnitTwo());
changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP); changeStock = conInfos.getStockNumber().multiply(info.getConUnitTwoConvert()).setScale(2, BigDecimal.ROUND_HALF_UP);
} }
TbConsSuppFlow suppFlow = new TbConsSuppFlow(); TbConsSuppFlow suppFlow = new TbConsSuppFlow();
TbConsInfoFlow flow = new TbConsInfoFlow(); TbConsInfoFlow flow = new TbConsInfoFlow();