purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品库存统计接口增加重量字段展示

Browse Source
This commit is contained in:
季圣华
2023-03-24 23:39:50 +08:00
parent a543e4437a
commit 74c2f40d44
4 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jshERP-boot/src/main/java/com/jsh/erp/controller/MaterialController.java
View File

@@ -627,6 +627,7 @@ public class MaterialController {
map.put("total", total); map.put("total", total);
map.put("currentStock", materialVo4Unit.getCurrentStock()); map.put("currentStock", materialVo4Unit.getCurrentStock());
map.put("currentStockPrice", materialVo4Unit.getCurrentStockPrice()); map.put("currentStockPrice", materialVo4Unit.getCurrentStockPrice());
map.put("currentWeight", materialVo4Unit.getCurrentWeight());
map.put("rows", dataList); map.put("rows", dataList);
res.code = 200; res.code = 200;
res.data = map; res.data = map;

10
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/MaterialVo4Unit.java
View File

@@ -34,6 +34,8 @@ public class MaterialVo4Unit extends Material{
private BigDecimal currentStockPrice; private BigDecimal currentStockPrice;
private BigDecimal currentWeight;
private String sku; private String sku;
private Long depotId; private Long depotId;
@@ -163,6 +165,14 @@ public class MaterialVo4Unit extends Material{
this.currentStockPrice = currentStockPrice; this.currentStockPrice = currentStockPrice;
} }
public BigDecimal getCurrentWeight() {
return currentWeight;
}
public void setCurrentWeight(BigDecimal currentWeight) {
this.currentWeight = currentWeight;
}
public String getSku() { public String getSku() {
return sku; return sku;
} }

11
jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
View File

@@ -765,10 +765,13 @@ public class UserService {
int selectUserSize = list.size(); int selectUserSize = list.size();
//查询启用状态的用户的数量 //查询启用状态的用户的数量
int enableUserSize = getUser().size(); int enableUserSize = getUser().size();
long userNumLimit = Long.parseLong(redisService.getObjectFromSessionByKey(request,"userNumLimit").toString()); User userInfo = userService.getCurrentUser();
if(selectUserSize + enableUserSize > userNumLimit && status == 0) { Tenant tenant = tenantService.getTenantByTenantId(userInfo.getTenantId());
throw new BusinessParamCheckingException(ExceptionConstants.USER_ENABLE_OVER_LIMIT_FAILED_CODE, if(tenant!=null) {
ExceptionConstants.USER_ENABLE_OVER_LIMIT_FAILED_MSG); if (selectUserSize + enableUserSize > tenant.getUserNumLimit() && status == 0) {
throw new BusinessParamCheckingException(ExceptionConstants.USER_ENABLE_OVER_LIMIT_FAILED_CODE,
ExceptionConstants.USER_ENABLE_OVER_LIMIT_FAILED_MSG);
}
} }
StringBuilder userStr = new StringBuilder(); StringBuilder userStr = new StringBuilder();
List<Long> idList = new ArrayList<>(); List<Long> idList = new ArrayList<>();

7
jshERP-boot/src/main/resources/mapper_xml/MaterialMapperEx.xml
View File

@@ -22,6 +22,7 @@
<result column="initialStock" jdbcType="DECIMAL" property="initialStock" /> <result column="initialStock" jdbcType="DECIMAL" property="initialStock" />
<result column="currentStock" jdbcType="DECIMAL" property="currentStock" /> <result column="currentStock" jdbcType="DECIMAL" property="currentStock" />
<result column="currentStockPrice" jdbcType="DECIMAL" property="currentStockPrice" /> <result column="currentStockPrice" jdbcType="DECIMAL" property="currentStockPrice" />
<result column="currentWeight" jdbcType="DECIMAL" property="currentWeight" />
</resultMap> </resultMap>
<resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultAndUnitMap" type="com.jsh.erp.datasource.entities.MaterialVo4Unit"> <resultMap extends="com.jsh.erp.datasource.mappers.MaterialMapper.BaseResultMap" id="ResultAndUnitMap" type="com.jsh.erp.datasource.entities.MaterialVo4Unit">
@@ -577,7 +578,8 @@
select m.*, me.commodity_unit unitName, mc.name categoryName, me.bar_code, select m.*, me.commodity_unit unitName, mc.name categoryName, me.bar_code,
ifnull(me.purchase_decimal,0) purchase_decimal, ifnull(me.purchase_decimal,0) purchase_decimal,
ifnull(sum(mcs.current_number),0) currentStock, ifnull(sum(mcs.current_number),0) currentStock,
sum(ifnull(me.purchase_decimal, 0) * ifnull(mcs.current_number, 0)) currentStockPrice sum(ifnull(me.purchase_decimal, 0) * ifnull(mcs.current_number, 0)) currentStockPrice,
sum(ifnull(m.weight, 0) * ifnull(mcs.current_number, 0)) currentWeight
FROM jsh_material m FROM jsh_material m
left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_material_current_stock mcs on m.id = mcs.material_id and ifnull(mcs.delete_flag,'0') !='1' left join jsh_material_current_stock mcs on m.id = mcs.material_id and ifnull(mcs.delete_flag,'0') !='1'
@@ -653,7 +655,8 @@
<select id="getTotalStockAndPrice" resultType="com.jsh.erp.datasource.entities.MaterialVo4Unit"> <select id="getTotalStockAndPrice" resultType="com.jsh.erp.datasource.entities.MaterialVo4Unit">
select select
ifnull(sum(mcs.current_number),0) currentStock, ifnull(sum(mcs.current_number),0) currentStock,
sum(ifnull(me.purchase_decimal,0)*ifnull(mcs.current_number,0)) currentStockPrice sum(ifnull(me.purchase_decimal,0)*ifnull(mcs.current_number,0)) currentStockPrice,
sum(ifnull(m.weight,0)*ifnull(mcs.current_number,0)) currentWeight
from jsh_material m from jsh_material m
left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1' left JOIN jsh_material_extend me on m.id = me.material_id and ifnull(me.delete_Flag,'0') !='1'
left join jsh_material_current_stock mcs on m.id = mcs.material_id and ifnull(mcs.delete_flag,'0') !='1' left join jsh_material_current_stock mcs on m.id = mcs.material_id and ifnull(mcs.delete_flag,'0') !='1'