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/PurchaseApi.java | 74 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 10 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
index bccf08d..9fee1fd 100755
--- a/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
+++ b/service-store/src/main/java/com/java110/store/api/PurchaseApi.java
@@ -3,23 +3,28 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.allocationStorehouse.AllocationStorehouseDto;
+import com.java110.dto.allocationStorehouseApply.AllocationStorehouseApplyDto;
import com.java110.dto.purchaseApply.PurchaseApplyDto;
-import com.java110.intf.store.IResourceStoreInnerServiceSMO;
+import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.dto.storehouse.StorehouseDto;
+import com.java110.intf.store.*;
import com.java110.po.purchase.PurchaseApplyDetailPo;
import com.java110.po.purchase.PurchaseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
import com.java110.store.bmo.purchase.IPurchaseApplyBMO;
import com.java110.store.bmo.purchase.IResourceEnterBMO;
+import com.java110.utils.cache.MappingCache;
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.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
@RestController
@RequestMapping(value = "/purchase")
@@ -33,6 +38,24 @@
@Autowired
private IResourceStoreInnerServiceSMO resourceStoreInnerServiceSMOImpl;
+
+ @Autowired
+ private IStorehouseInnerServiceSMO storehouseInnerServiceSMOImpl;
+
+ @Autowired
+ private IAllocationStorehouseInnerServiceSMO allocationStorehouseInnerServiceSMOImpl;
+
+ @Autowired
+ private IAllocationStorehouseApplyInnerServiceSMO allocationStorehouseApplyInnerServiceSMOImpl;
+
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
+
+ //鍩�
+ public static final String DOMAIN_COMMON = "DOMAIN.COMMON";
+
+ //閿�
+ public static final String URGRNT_NUMBER = "URGRNT_NUMBER";
/**
* 閲囪喘鐢宠
@@ -66,22 +89,31 @@
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.remove("price");//閲囪喘浠锋牸榛樿绌�
+ resourceStore.put("originalStock", resourceStore.getString("stock"));
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
- return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+ return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
}
@RequestMapping(value = "/resourceEnter", method = RequestMethod.POST)
public ResponseEntity<String> resourceEnter(@RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "applyOrderId", "璁㈠崟ID涓虹┖");
+ PurchaseApplyDto purchaseApplyDto = new PurchaseApplyDto();
+ purchaseApplyDto.setApplyOrderId(reqJson.getString("applyOrderId"));
+ purchaseApplyDto.setStatusCd("0");
+ List<PurchaseApplyDto> purchaseApplyDtoList = purchaseApplyInnerServiceSMOImpl.queryPurchaseApplys(purchaseApplyDto);
+ if(purchaseApplyDtoList!=null && PurchaseApplyDto.STATE_AUDITED.equals(purchaseApplyDtoList.get(0).getState())){
+ throw new IllegalArgumentException("璇ヨ鍗曞凡缁忓鐞嗭紝璇峰埛鏂扮‘璁よ鍗曠姸鎬侊紒");
+ }
JSONArray purchaseApplyDetails = reqJson.getJSONArray("purchaseApplyDetailVo");
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
for (int detailIndex = 0; detailIndex < purchaseApplyDetails.size(); detailIndex++) {
@@ -97,6 +129,7 @@
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
return resourceEnterBMOImpl.enter(purchaseApplyPo);
}
+
/**
* 鐩存帴鍏ュ簱鎿嶄綔
* <p>
@@ -109,9 +142,9 @@
*/
@RequestMapping(value = "/purchaseStorage", method = RequestMethod.POST)
public ResponseEntity<String> purchaseStorage(@RequestBody JSONObject reqJson,
- @RequestHeader(value = "user-id") String userId,
- @RequestHeader(value = "user-name") String userName,
- @RequestHeader(value = "store-id") String storeId) {
+ @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", "蹇呭～锛岃濉啓閲囪喘鐢宠璇存槑");
Assert.hasKeyAndValue(reqJson, "resOrderType", "蹇呭～锛岃濉啓鐢宠绫诲瀷");
@@ -124,12 +157,13 @@
purchaseApplyPo.setEndUserTel(reqJson.getString("endUserTel"));
purchaseApplyPo.setStoreId(storeId);
purchaseApplyPo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
- purchaseApplyPo.setState(PurchaseApplyDto.STATE_AUDITED);
+ purchaseApplyPo.setState(PurchaseApplyDto.STATE_END);
purchaseApplyPo.setCreateTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
purchaseApplyPo.setDescription("鐩存帴閲囪喘鍏ュ簱");
purchaseApplyPo.setCreateUserId(userId);
purchaseApplyPo.setCreateUserName(userName);
purchaseApplyPo.setWarehousingWay(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT);
+ purchaseApplyPo.setCommunityId(reqJson.getString("communityId"));
JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
@@ -137,15 +171,35 @@
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
purchaseApplyDetailPo.setId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_applyOrderId));
purchaseApplyDetailPo.setRemark("鐩存帴閲囪喘鍏ュ簱");
+ purchaseApplyDetailPo.setOriginalStock(resourceStore.getString("stock"));
purchaseApplyDetailPo.setQuantity(purchaseApplyDetailPo.getPurchaseQuantity());
purchaseApplyDetailPos.add(purchaseApplyDetailPo);
//澧炲姞搴撳瓨
ResourceStorePo resourceStorePo = new ResourceStorePo();
+ resourceStorePo.setPurchasePrice(purchaseApplyDetailPo.getPrice());
resourceStorePo.setResId(purchaseApplyDetailPo.getResId());
resourceStorePo.setStock(purchaseApplyDetailPo.getPurchaseQuantity());
+ resourceStorePo.setResOrderType(PurchaseApplyDto.RES_ORDER_TYPE_ENTER);
+ //鑾峰彇閲囪喘鏁伴噺
+ BigDecimal purchaseQuantity = new BigDecimal(purchaseApplyDetailPo.getPurchaseQuantity());
+ //鑾峰彇鍘熸湁鏈�灏忚閲忔�绘暟
+ BigDecimal miniStock = new BigDecimal(resourceStore.getString("miniStock"));
+ //鑾峰彇鏈�灏忓崟浣嶆暟閲�
+ BigDecimal newMiniStock = new BigDecimal(0);
+ if (StringUtil.isEmpty(resourceStore.getString("miniUnitStock"))) {
+ throw new IllegalArgumentException("鏈�灏忚閲忓崟浣嶆暟閲忎笉鑳戒负绌猴紒");
+ }
+ BigDecimal miniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock"));
+ //璁＄畻鏈�灏忚閲忔�绘暟
+ if (StringUtil.isEmpty(resourceStore.getString("miniStock"))) {
+ newMiniStock = purchaseQuantity.multiply(miniUnitStock);
+ } else {
+ newMiniStock = (purchaseQuantity.multiply(miniUnitStock)).add(miniStock);
+ }
+ resourceStorePo.setMiniStock(String.valueOf(newMiniStock));
resourceStoreInnerServiceSMOImpl.updateResourceStore(resourceStorePo);
}
purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
- return purchaseApplyBMOImpl.apply(purchaseApplyPo);
+ return purchaseApplyBMOImpl.apply(purchaseApplyPo,reqJson);
}
}
--
Gitblit v1.8.0