1、新增物品类型表可维护物品类型2、新增物品的出入库操作 无需进行走申请流程3、部分查询条件优化

xiaogang

2021-04-22 39e49bdfab3d77951f2a9b22f84a22d7980de8b7

 service-api/src/main/java/com/java110/api/listener/purchaseApply/ListPurchaseApplysListener.java

@@ -109,6 +109,7 @@
                if (applyDetailList.size() > 0) {
                    StringBuffer resNames = new StringBuffer();
                    BigDecimal totalPrice = new BigDecimal(0);
                    BigDecimal purchaseTotalPrice = new BigDecimal(0);
                    Integer cursor = 0;
                    for (PurchaseApplyDetailVo purchaseApplyDetailVo : applyDetailList) {
                        cursor++;
@@ -120,9 +121,15 @@
                        BigDecimal price = new BigDecimal(purchaseApplyDetailVo.getPrice());
                        BigDecimal quantity = new BigDecimal(purchaseApplyDetailVo.getQuantity());
                        totalPrice = totalPrice.add(price.multiply(quantity));
                        if(!StringUtil.isEmpty(purchaseApplyDetailVo.getPurchasePrice()) && !StringUtil.isEmpty(purchaseApplyDetailVo.getPurchaseQuantity())){
                            BigDecimal purchasePrice = new BigDecimal(purchaseApplyDetailVo.getPurchasePrice());
                            BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailVo.getPurchaseQuantity());
                            purchaseTotalPrice = purchaseTotalPrice.add(purchasePrice.multiply(purchaseQuantity));
                        }
                    }
                    apiPurchaseApplyDataVo.setResourceNames(resNames.toString());
                    apiPurchaseApplyDataVo.setTotalPrice(totalPrice.toString());
                    apiPurchaseApplyDataVo.setPurchaseTotalPrice(purchaseTotalPrice.toString());
                }
            }
        } else {