From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-store/src/main/java/com/java110/store/api/CollectionApi.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/CollectionApi.java b/service-store/src/main/java/com/java110/store/api/CollectionApi.java
index 195b12a..eeb6379 100755
--- a/service-store/src/main/java/com/java110/store/api/CollectionApi.java
+++ b/service-store/src/main/java/com/java110/store/api/CollectionApi.java
@@ -24,6 +24,7 @@
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -94,7 +95,7 @@
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
- return goodsCollectionBMOImpl.collection(purchaseApplyPo);
+ return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
}
/**
@@ -109,6 +110,7 @@
@RequestMapping(value = "/getCollectionAuditOrder", method = RequestMethod.GET)
public ResponseEntity<String> getCollectionAuditOrder(@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
+ @RequestParam(value = "communityId") String communityId,
@RequestHeader(value = "user-id") String userId,
@RequestHeader(value = "store-id") String storeId) {
AuditUser auditUser = new AuditUser();
@@ -116,11 +118,12 @@
auditUser.setPage(page);
auditUser.setRow(row);
auditUser.setStoreId(storeId);
+ auditUser.setCommunityId(communityId);
return getCollectionAuditOrderBMOImpl.auditOrder(auditUser);
}
/**
- * 鐗╁搧鍙戞斁
+ * 鐗╁搧鍙戞斁(鐗╁搧鍙戞斁涔嬪悗鐩存帴鍒颁釜浜烘墜涓�)
* {"resourceOuts":[],"applyOrderId":"152020071665420001","taskId":"237506","resOrderType":"20000",
* "purchaseApplyDetailVo":[{"applyOrderId":"152020071665420001","id":"152020071690120002","price":"","quantity":"1",
* "resCode":"002","resId":"852020070239060001","resName":"姘存�х瑪","stock":"2","purchaseQuantity":"2","purchaseRemark":""}]}
@@ -186,11 +189,14 @@
resourceStorePo.setStock("-" + purchaseApplyDetailPo.getPurchaseQuantity());
resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);
//璁＄畻鍑哄簱鍚庣殑鏈�灏忚閲忔�绘暟
- String oldMiniStock = resourceStore.getString("miniStock"); //鑾峰彇鍘熷厛鐨勬渶灏忚閲忔�绘暟
- String oldMiniUnitStock = resourceStore.getString("miniUnitStock"); //鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
- String nowQuantity = purchaseApplyDetailPo.getPurchaseQuantity(); //鑾峰彇鍑哄簱鏁伴噺
- double nowMiniStock = Double.parseDouble(nowQuantity) * Double.parseDouble(oldMiniUnitStock); //璁＄畻褰撳墠鍑哄簱鐨勬渶灏忚閲忔�绘暟
- double surplusMiniStock = Double.parseDouble(oldMiniStock) - nowMiniStock;
+ BigDecimal oldMiniStock = new BigDecimal(resourceStore.getString("miniStock")); //鑾峰彇鍘熷厛鐨勬渶灏忚閲忔�绘暟
+ BigDecimal oldMiniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock")); //鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
+ BigDecimal nowQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity()); //鑾峰彇鍑哄簱鏁伴噺
+ BigDecimal nowMiniStock = nowQuantity.multiply(oldMiniUnitStock); //璁＄畻褰撳墠鍑哄簱鐨勬渶灏忚閲忔�绘暟
+ BigDecimal surplusMiniStock = oldMiniStock.subtract(nowMiniStock);
+ if (surplusMiniStock.compareTo(BigDecimal.ZERO) == -1) {
+ throw new IllegalArgumentException("鐗╁搧搴撳瓨宸茬粡涓嶈冻锛岃纭鐗╁搧搴撳瓨锛�");
+ }
resourceStorePo.setMiniStock(String.valueOf(surplusMiniStock));
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
//鏌ヨ璧勬簮
@@ -198,7 +204,7 @@
resourceStoreDto.setResId(purchaseApplyDetailPo.getResId());
List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
- continue;
+ throw new IllegalArgumentException("鏈煡璇㈠埌鐗╁搧璧勬簮淇℃伅锛�");
}
//鑾峰彇鐗╁搧鍗曚綅
String unitCode = resourceStoreDtos.get(0).getUnitCode();
@@ -213,19 +219,22 @@
userStorehousePo.setResName(resourceStoreDtos.get(0).getResName());
userStorehousePo.setStoreId(resourceStoreDtos.get(0).getStoreId());
userStorehousePo.setUserId(purchaseApplyPo.getUserId());
- //鏌ヨ鐗╁搧 鏄惁宸茬粡瀛樺湪
+
+ //鏌ヨ涓汉鐗╁搧浠撳簱涓� 鏄惁宸茬粡瀛樺湪鍟嗗搧
UserStorehouseDto userStorehouseDto = new UserStorehouseDto();
- userStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
+ userStorehouseDto.setResCode(resourceStoreDtos.get(0).getResCode());
userStorehouseDto.setUserId(purchaseApplyPo.getUserId());
userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
+ userStorehousePo.setResCode(resourceStoreDtos.get(0).getResCode());
if (userStorehouseDtos == null || userStorehouseDtos.size() < 1) {
userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
//鑾峰彇棰嗗彇鏁伴噺
- double purchaseQuantity = Double.parseDouble(purchaseApplyDetailPo.getPurchaseQuantity());
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
//璁＄畻涓汉鐗╁搧鏈�灏忚閲忔�绘暟
- double quantity = purchaseQuantity * Double.parseDouble(miniUnitStock);
+ BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
+ BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
userStorehousePo.setMiniStock(String.valueOf(quantity));
} else {
userStorehousePo.setMiniStock(purchaseApplyDetailPo.getPurchaseQuantity());
@@ -233,23 +242,25 @@
userStorehouseInnerServiceSMOImpl.saveUserStorehouses(userStorehousePo);
} else {
//鑾峰彇涓汉鐗╁搧棰嗙敤鍚庣殑搴撳瓨
- double total = Double.parseDouble(purchaseApplyDetailPo.getPurchaseQuantity()) + Double.parseDouble(userStorehouseDtos.get(0).getStock());
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
+ BigDecimal stock1 = new BigDecimal(userStorehouseDtos.get(0).getStock());
+ BigDecimal total = purchaseQuantity.add(stock1);
userStorehousePo.setStock(total + "");
userStorehousePo.setUsId(userStorehouseDtos.get(0).getUsId());
if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
//鑾峰彇鏈棰嗗彇鏁伴噺
- double purchaseQuantity = Double.parseDouble(purchaseApplyDetailPo.getPurchaseQuantity());
+ BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
//璁＄畻鏈棰嗗彇鐨勪釜浜虹墿鍝佹渶灏忚閲忔�绘暟
- double quantity = purchaseQuantity * Double.parseDouble(miniUnitStock);
- double miniStock = 0.0;
+ BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
+ BigDecimal miniStock = new BigDecimal(0);
//鑾峰彇涓汉鐗╁搧鍘熷厛鐨勬渶灏忚閲忔�绘暟
if (StringUtil.isEmpty(userStorehouseDtos.get(0).getMiniStock())) {
throw new IllegalArgumentException("淇℃伅閿欒锛屼釜浜虹墿鍝佹渶灏忚閲忔�绘暟涓嶈兘涓虹┖锛�");
} else {
- miniStock = Double.parseDouble(userStorehouseDtos.get(0).getMiniStock());
+ miniStock = new BigDecimal(userStorehouseDtos.get(0).getMiniStock());
}
//璁＄畻棰嗙敤鍚庝釜浜虹墿鍝佹�荤殑鏈�灏忚閲忔�绘暟
- double miniQuantity = quantity + miniStock;
+ BigDecimal miniQuantity = quantity.add(miniStock);
userStorehousePo.setMiniStock(String.valueOf(miniQuantity));
} else {
userStorehousePo.setMiniStock(String.valueOf(total));
@@ -258,6 +269,6 @@
}
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
- return goodsCollectionBMOImpl.collection(purchaseApplyPo);
+ return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
}
}
--
Gitblit v1.8.0