From 8e3827a655cb13c67210bae939448ddd42ec8084 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 29 四月 2021 16:27:30 +0800
Subject: [PATCH] 优化采购管理 1、新增个人物品转增2、物品使用记录3、新增商品供应商4、部分优化
---
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
index ce4f6ea..08cc993 100644
--- a/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -43,15 +44,11 @@
@Override
public List<ResourceStoreDto> queryResourceStores(@RequestBody ResourceStoreDto resourceResourceStoreDto) {
-
//鏍￠獙鏄惁浼犱簡 鍒嗛〉淇℃伅
-
int page = resourceResourceStoreDto.getPage();
-
if (page != PageDto.DEFAULT_PAGE) {
resourceResourceStoreDto.setPage((page - 1) * resourceResourceStoreDto.getRow());
}
-
List<ResourceStoreDto> resourceResourceStores = BeanConvertUtil.covertBeanList(resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(BeanConvertUtil.beanCovertMap(resourceResourceStoreDto)), ResourceStoreDto.class);
//鑾峰彇鍥剧墖鍦板潃
List<ResourceStoreDto> resourceStoreDtos = new ArrayList<>();
@@ -93,15 +90,27 @@
info.put("resId", resourceStorePo.getResId());
info.put("storeId", resourceStorePo.getStoreId());
List<Map> stores = resourceResourceStoreServiceDaoImpl.getResourceStoreInfo(info);
-
Assert.listOnlyOne(stores, "涓嶅瓨鍦ㄨ鐗╁搧");
- int stock = Integer.parseInt(stores.get(0).get("stock").toString());
- int newStock = Integer.parseInt(resourceStorePo.getStock());
- int totalStock = stock + newStock;
-
+ Double stock = Double.parseDouble(stores.get(0).get("stock").toString());
+ Double newStock = Double.parseDouble(resourceStorePo.getStock());
+ Double totalStock = stock + newStock;
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());
+ }
+ //鑾峰彇鐜板湪閲囪喘鐨勪环鏍�
+ 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 + "");
resourceStorePo.setStatusCd("0");
return resourceResourceStoreServiceDaoImpl.updateResourceStoreInfoInstance(BeanConvertUtil.beanCovertMap(resourceStorePo));
--
Gitblit v1.8.0