From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-store/src/main/java/com/java110/store/api/CollectionApi.java | 146 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 146 insertions(+), 0 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 7d4a2c2..452882e 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
@@ -4,19 +4,27 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.dto.userStorehouse.UserStorehouseDto;
import com.java110.entity.audit.AuditUser;
+import com.java110.intf.store.IResourceStoreInnerServiceSMO;
+import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
+import com.java110.po.purchase.ResourceStorePo;
+import com.java110.po.userStorehouse.UserStorehousePo;
import com.java110.store.bmo.collection.IGetCollectionAuditOrderBMO;
import com.java110.store.bmo.collection.IGoodsCollectionBMO;
import com.java110.store.bmo.collection.IResourceOutBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -36,6 +44,13 @@
@Autowired
private IResourceOutBMO resourceOutBMOImpl;
+
+ @Autowired
+ private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
+
+ @Autowired
+ private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMOImpl;
+
/**
* 鐗╁搧棰嗙敤 鎺ュ彛绫�
@@ -66,10 +81,15 @@
purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);
purchaseApplyPo.setState(PurchaseApplyDto.STATE_WAIT_DEAL);
purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ purchaseApplyPo.setCreateUserId(userId);
+ purchaseApplyPo.setCreateUserName(userName);
+ purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_APPLY);
+ purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));
JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
+ resourceStore.put("originalStock", resourceStore.get("stock"));
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
@@ -90,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();
@@ -97,10 +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":""}]}
@@ -123,4 +146,127 @@
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
return resourceOutBMOImpl.out(purchaseApplyPo);
}
+
+ /**
+ * 鐗╁搧鐩存帴鍑哄簱
+ */
+ @RequestMapping(value = "/goodsDelivery", method = RequestMethod.POST)
+ public ResponseEntity<String> goodsDelivery(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "user-id") String userId,
+ @RequestHeader(value = "user-name") String userName,
+ @RequestHeader(value = "store-id") String storeId) {
+ Assert.hasKeyAndValue(reqJson, "resourceStores", "蹇呭～锛岃濉啓鐗╁搧棰嗙敤鐨勭墿璧�");
+ Assert.hasKeyAndValue(reqJson, "description", "蹇呭～锛岃濉啓閲囪喘鐢宠璇存槑");
+ PurchaseApplyPo purchaseApplyPo = new PurchaseApplyPo();
+ purchaseApplyPo.setApplyOrderId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
+ purchaseApplyPo.setDescription(reqJson.getString("description"));
+ purchaseApplyPo.setUserId(reqJson.getString("receiverUserId"));
+ purchaseApplyPo.setUserName(reqJson.getString("receiverUserName"));
+ purchaseApplyPo.setEndUserName(reqJson.getString("endUserName"));
+ purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
+ purchaseApplyPo.setStoreId(storeId);
+ purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);
+ purchaseApplyPo.setState(PurchaseApplyDto.STATE_END);
+ purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ purchaseApplyPo.setCreateUserId(userId);
+ purchaseApplyPo.setCreateUserName(userName);
+ purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT);
+ purchaseApplyPo.setDescription("鐩存帴鍑哄簱鎿嶄綔");
+ purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));
+ JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
+ List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
+ for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
+ JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
+ PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
+ purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
+ purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
+ purchaseApplyDetailPo.setRemark("鐩存帴鍑哄簱");
+ purchaseApplyDetailPo.setOriginalStock(resourceStore.getString("stock"));
+ purchaseApplyDetailPos.add(purchaseApplyDetailPo);
+ //璋冩暣鎬诲簱瀛�
+ ResourceStorePo resourceStorePo = new ResourceStorePo();
+ resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
+ resourceStorePo.setStock("-" + purchaseApplyDetailPo.getPurchaseQuantity());
+ resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_OUT);
+ //璁＄畻鍑哄簱鍚庣殑鏈�灏忚閲忔�绘暟
+ 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);
+ //鏌ヨ璧勬簮
+ ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
+ resourceStoreDto.setResId(purchaseApplyDetailPo.getResId());
+ List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
+ if (resourceStoreDtos == null || resourceStoreDtos.size() < 1) {
+ continue;
+ }
+ //鑾峰彇鐗╁搧鍗曚綅
+ String unitCode = resourceStoreDtos.get(0).getUnitCode();
+ //鑾峰彇鐗╁搧鏈�灏忚閲忓崟浣�
+ String miniUnitCode = resourceStoreDtos.get(0).getMiniUnitCode();
+ //鑾峰彇鐗╁搧鏈�灏忚閲忓崟浣嶆暟閲�
+ String miniUnitStock = resourceStoreDtos.get(0).getMiniUnitStock();
+ //鍏ュ簱鍒颁釜浜轰粨搴撲腑
+ UserStorehousePo userStorehousePo = new UserStorehousePo();
+ userStorehousePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
+ userStorehousePo.setResId(resourceStoreDtos.get(0).getResId());
+ 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.setUserId(purchaseApplyPo.getUserId());
+ userStorehouseDto.setStoreId(resourceStoreDtos.get(0).getStoreId());
+ List<UserStorehouseDto> userStorehouseDtos = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouseDto);
+ if (userStorehouseDtos == null || userStorehouseDtos.size() < 1) {
+ userStorehousePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
+ if (!StringUtil.isEmpty(unitCode) && !StringUtil.isEmpty(miniUnitCode) && !StringUtil.isEmpty(miniUnitStock) && !unitCode.equals(miniUnitCode)) {
+ //鑾峰彇棰嗗彇鏁伴噺
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
+ //璁＄畻涓汉鐗╁搧鏈�灏忚閲忔�绘暟
+ BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
+ BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
+ userStorehousePo.setMiniStock(String.valueOf(quantity));
+ } else {
+ userStorehousePo.setMiniStock(purchaseApplyDetailPo.getPurchaseQuantity());
+ }
+ userStorehouseInnerServiceSMOImpl.saveUserStorehouses(userStorehousePo);
+ } else {
+ //鑾峰彇涓汉鐗╁搧棰嗙敤鍚庣殑搴撳瓨
+ 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)) {
+ //鑾峰彇鏈棰嗗彇鏁伴噺
+ BigDecimal miniUnitStock1 = new BigDecimal(miniUnitStock);
+ //璁＄畻鏈棰嗗彇鐨勪釜浜虹墿鍝佹渶灏忚閲忔�绘暟
+ BigDecimal quantity = purchaseQuantity.multiply(miniUnitStock1);
+ BigDecimal miniStock = new BigDecimal(0);
+ //鑾峰彇涓汉鐗╁搧鍘熷厛鐨勬渶灏忚閲忔�绘暟
+ if (StringUtil.isEmpty(userStorehouseDtos.get(0).getMiniStock())) {
+ throw new IllegalArgumentException("淇℃伅閿欒锛屼釜浜虹墿鍝佹渶灏忚閲忔�绘暟涓嶈兘涓虹┖锛�");
+ } else {
+ miniStock = new BigDecimal(userStorehouseDtos.get(0).getMiniStock());
+ }
+ //璁＄畻棰嗙敤鍚庝釜浜虹墿鍝佹�荤殑鏈�灏忚閲忔�绘暟
+ BigDecimal miniQuantity = quantity.add(miniStock);
+ userStorehousePo.setMiniStock(String.valueOf(miniQuantity));
+ } else {
+ userStorehousePo.setMiniStock(String.valueOf(total));
+ }
+ userStorehouseInnerServiceSMOImpl.updateUserStorehouses(userStorehousePo);
+ }
+ }
+ purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
+ return goodsCollectionBMOImpl.collection(purchaseApplyPo);
+ }
}
--
Gitblit v1.8.0