admin/jjjerp-java
1
0
Fork 0
mirror of https://gitee.com/victor123/jjjerp-java.git synced 2025-12-07 06:58:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复

Browse Source
This commit is contained in:
huadengwu 2024-07-19 11:35:41 +08:00
parent 2a2ae2fe95
commit 73de77e2f1
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/service/bill/impl/BillHeadServiceImpl.java
View File

@ -1664,8 +1664,10 @@ public class BillHeadServiceImpl extends BaseServiceImpl<BillHeadMapper, BillHea
item.setBillType(oldHead.getBillType()); item.setBillType(oldHead.getBillType());
//检查商品属性 //检查商品属性
this.checkItem(item); this.checkItem(item);
if(item.getIsDelete() != null && item.getIsDelete() == 0 && item.getAllPrice() != null){ if(item.getAllPrice() != null){
totalPrice = totalPrice.add(item.getAllPrice()); if(item.getIsDelete() == null || item.getIsDelete() == 0){
totalPrice = totalPrice.add(item.getAllPrice());
}
} }
totalNum = totalNum + item.getBasicNumber(); totalNum = totalNum + item.getBasicNumber();
} }

3
jjj_erp/jjj-admin/src/main/java/net/jjjerp/admin/vo/shopUser/ShopUserVo.java
View File

@ -31,6 +31,9 @@ public class ShopUserVo implements Serializable {
@ApiModelProperty("是否为超级管理员0不是,1是") @ApiModelProperty("是否为超级管理员0不是,1是")
private Boolean isSuper; private Boolean isSuper;
@ApiModelProperty("是否为业务员0不是,1是")
private Integer isSales;
@ApiModelProperty("创建时间") @ApiModelProperty("创建时间")
private Date createTime; private Date createTime;