From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-api/src/main/java/com/java110/api/bmo/allocationStorehouse/impl/AllocationStorehouseBMOImpl.java | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/allocationStorehouse/impl/AllocationStorehouseBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/allocationStorehouse/impl/AllocationStorehouseBMOImpl.java
index a6bd51f..3c14bd3 100644
--- a/service-api/src/main/java/com/java110/api/bmo/allocationStorehouse/impl/AllocationStorehouseBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/allocationStorehouse/impl/AllocationStorehouseBMOImpl.java
@@ -5,8 +5,10 @@
import com.java110.api.bmo.allocationStorehouse.IAllocationStorehouseBMO;
import com.java110.core.context.DataFlowContext;
import com.java110.dto.allocationStorehouse.AllocationStorehouseDto;
+import com.java110.dto.purchaseApply.PurchaseApplyDto;
import com.java110.intf.community.IResourceStoreServiceSMO;
import com.java110.intf.store.IAllocationStorehouseInnerServiceSMO;
+import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.po.allocationStorehouse.AllocationStorehousePo;
import com.java110.po.allocationStorehouseApply.AllocationStorehouseApplyPo;
import com.java110.po.purchase.ResourceStorePo;
@@ -17,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
import java.util.List;
@Service("allocationStorehouseBMOImpl")
@@ -27,6 +30,9 @@
@Autowired
private IResourceStoreServiceSMO resourceStoreServiceSMOImpl;
+
+ @Autowired
+ private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
/**
* 娣诲姞灏忓尯淇℃伅
@@ -77,25 +83,38 @@
List<ResourceStorePo> resourceStores = resourceStoreServiceSMOImpl.getResourceStores(resourceStorePo);
Assert.listOnlyOne(resourceStores, "璧勬簮鐗╁搧淇℃伅閿欒");
//鑾峰彇搴撳瓨鏁伴噺
- double resourceStoreStock = Double.parseDouble(resourceStores.get(0).getStock());
+ BigDecimal resourceStoreStock = new BigDecimal(resourceStores.get(0).getStock());
//鑾峰彇璋冩嫧鐨勬暟閲�
- double storehouseStock = Double.parseDouble(allocationStorehousePo.getStock());
+ BigDecimal storehouseStock = new BigDecimal(allocationStorehousePo.getStock());
//搴撳瓨鏁伴噺
- double stock = resourceStoreStock + storehouseStock;
+ BigDecimal stock = resourceStoreStock.add(storehouseStock);
resourceStorePo.setStock(String.valueOf(stock));
//璁＄畻鏈�灏忚閲忔�绘暟
if (StringUtil.isEmpty(resourceStores.get(0).getMiniStock())) {
throw new IllegalArgumentException("鏈�灏忚閲忔�绘暟涓嶈兘涓虹┖锛�");
}
- String miniStock = resourceStores.get(0).getMiniStock(); //鑾峰彇鐗╁搧琛ㄧ殑鏈�灏忚閲忔�绘暟
+ BigDecimal miniStock = new BigDecimal(resourceStores.get(0).getMiniStock()); //鑾峰彇鐗╁搧琛ㄧ殑鏈�灏忚閲忔�绘暟
if (StringUtil.isEmpty(resourceStores.get(0).getMiniUnitStock())) {
throw new IllegalArgumentException("鏈�灏忚閲忓崟浣嶆暟閲忎笉鑳戒负绌猴紒");
}
- String miniUnitStock = resourceStores.get(0).getMiniUnitStock(); //鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
- double nowMiniStock = Double.parseDouble(allocationStorehousePo.getStock()) * Double.parseDouble(miniUnitStock); //璁＄畻褰撳墠鐨勬渶灏忚閲忔�绘暟
- double newMiniStock = Double.parseDouble(miniStock) + Double.parseDouble(String.valueOf(nowMiniStock));
+ BigDecimal miniUnitStock = new BigDecimal(resourceStores.get(0).getMiniUnitStock()); //鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
+ BigDecimal stock2 = new BigDecimal(allocationStorehousePo.getStock()); //鑾峰彇鏈�灏忚閲忓崟浣嶆暟閲�
+ BigDecimal nowMiniStock = stock2.multiply(miniUnitStock); //璁＄畻褰撳墠鐨勬渶灏忚閲忔�绘暟
+ BigDecimal newMiniStock = miniStock.add(nowMiniStock);
resourceStorePo.setMiniStock(String.valueOf(newMiniStock));
super.update(dataFlowContext, resourceStorePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_RESOURCE_STORE);
+
+ //鍙栨秷娴佺▼瀹℃壒
+ //鏌ヨ浠诲姟
+ PurchaseApplyDto purchaseDto = new PurchaseApplyDto();
+ purchaseDto.setBusinessKey(tmpAllocationStorehouseDto.getApplyId());
+ List<PurchaseApplyDto> purchaseApplyDtoList=purchaseApplyInnerServiceSMOImpl.getActRuTaskId(purchaseDto);
+ if(purchaseApplyDtoList!=null && purchaseApplyDtoList.size()>0){
+ PurchaseApplyDto purchaseDto1 = new PurchaseApplyDto();
+ purchaseDto1.setActRuTaskId(purchaseApplyDtoList.get(0).getActRuTaskId());
+ purchaseDto1.setAssigneeUser("999999");
+ purchaseApplyInnerServiceSMOImpl.updateActRuTaskById(purchaseDto1);
+ }
}
AllocationStorehouseApplyPo allocationStorehouseApplyPo = new AllocationStorehouseApplyPo();
--
Gitblit v1.8.0