1、优化细节性问题2、优化采购细节问题

xiaogang

2021-07-17 1024666b99a24bd7d5e4dc442d6b0c0319fa2f29

 service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java

@@ -3,6 +3,7 @@
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.file.FileRelDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.dto.resourceStore.ResourceStoreDto;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.intf.store.IResourceStoreInnerServiceSMO;
@@ -97,21 +98,29 @@
            if (totalStock < 0) {
                throw new IllegalArgumentException("库存不足，参数有误");
            }
            //获取原均价
            Object averageOldPrice = stores.get(0).get("averagePrice");
            Double price = 0.0;
            if (averageOldPrice != null) {
                price = Double.parseDouble(averageOldPrice.toString());
            //入库操作 对物品进行加权平均
            if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.RES_ORDER_TYPE_ENTER)
                    || (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE))) {
                //获取原均价
                Object averageOldPrice = stores.get(0).get("averagePrice");
                Double price = 0.0;
                if (averageOldPrice != null) {
                    price = Double.parseDouble(averageOldPrice.toString());
                }
                //获取现在采购的价格
                Double newPrice = Double.parseDouble(resourceStorePo.getPurchasePrice());
                //获取均价
                double averagePrice = ((newPrice * newStock) + (price * stock)) / totalStock;
                BigDecimal b0 = new BigDecimal(averagePrice);
                //四舍五入保留两位
                double f0 = b0.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                resourceStorePo.setAveragePrice(String.valueOf(f0));
            }
            //获取现在采购的价格
            Double newPrice = Double.parseDouble(resourceStorePo.getPurchasePrice());
            //获取均价
            double averagePrice = ((newPrice * newStock) + (price * stock)) / totalStock;
            BigDecimal b0 = new BigDecimal(averagePrice);
            //四舍五入保留两位
            double f0 = b0.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
            resourceStorePo.setAveragePrice(String.valueOf(f0));
            resourceStorePo.setStock(totalStock + "");
            if (resourceStorePo.getResOrderType().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT) && resourceStorePo.getOperationType().equals(PurchaseApplyDto.WEIGHTED_MEAN_TRUE)) {
                resourceStorePo.setStock(stock + "");
            } else {
                resourceStorePo.setStock(totalStock + "");
            }
            resourceStorePo.setStatusCd("0");
            return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
        } finally {
@@ -119,6 +128,16 @@
        }
    }

    /**
     * 新增物品
     *
     * @param resourceStoreDto
     */
    @Override
    public void saveResourceStore(@RequestBody ResourceStoreDto resourceStoreDto) {
        resourceResourceStoreServiceDaoImpl.saveResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceStoreDto));
    }

    public IResourceStoreServiceDao getResourceStoreServiceDaoImpl() {
        return resourceResourceStoreServiceDaoImpl;
    }