From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-store/src/main/java/com/java110/store/cmd/assetInventory/UpdateAssetInventoryCmd.java | 46 ++++++++++++++++++++++++++++++++++++++--------
1 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/assetInventory/UpdateAssetInventoryCmd.java b/service-store/src/main/java/com/java110/store/cmd/assetInventory/UpdateAssetInventoryCmd.java
index 2300f06..a6bc9a2 100644
--- a/service-store/src/main/java/com/java110/store/cmd/assetInventory/UpdateAssetInventoryCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/assetInventory/UpdateAssetInventoryCmd.java
@@ -23,17 +23,14 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.resource.ResourceStoreTimesDto;
import com.java110.dto.user.UserDto;
-import com.java110.intf.store.IAssetInventoryDetailV1InnerServiceSMO;
-import com.java110.intf.store.IAssetInventoryV1InnerServiceSMO;
-import com.java110.intf.store.IAllocationStorehouseInnerServiceSMO;
-import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
-import com.java110.intf.store.IResourceStoreV1InnerServiceSMO;
+import com.java110.intf.store.*;
import com.java110.intf.user.IUserV1InnerServiceSMO;
import com.java110.po.assetInventory.AssetInventoryPo;
-import com.java110.po.assetInventoryDetail.AssetInventoryDetailPo;
+import com.java110.po.assetInventory.AssetInventoryDetailPo;
import com.java110.po.purchase.ResourceStorePo;
-import com.java110.po.user.UserPo;
+import com.java110.po.resource.ResourceStoreTimesPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -43,6 +40,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import java.math.BigDecimal;
import java.util.List;
@@ -80,6 +78,9 @@
@Autowired
private IUserV1InnerServiceSMO userV1InnerServiceSMO;
+
+ @Autowired
+ private IResourceStoreTimesV1InnerServiceSMO resourceStoreTimesV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -166,12 +167,41 @@
assetInventoryDetailPo = BeanConvertUtil.covertBean(resourceStore, AssetInventoryDetailPo.class);
assetInventoryDetailPo.setId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
assetInventoryDetailPo.setApplyOrderId(assetInventoryPo.getAiId());
+
+ //鏇存柊鎵规搴撳瓨
+ ResourceStoreTimesDto resourceStoreTimesDto = new ResourceStoreTimesDto();
+ resourceStoreTimesDto.setTimesId(assetInventoryDetailPo.getTimesId());
+ List<ResourceStoreTimesDto> resourceStoreTimesDtos = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimess(resourceStoreTimesDto);
+ if(resourceStoreTimesDtos.size()>0){
+ ResourceStoreTimesPo resourceStoreTimesPo = new ResourceStoreTimesPo();
+ resourceStoreTimesPo.setTimesId(resourceStoreTimesDtos.get(0).getTimesId());
+ resourceStoreTimesPo.setStock(assetInventoryDetailPo.getQuantity());;
+ resourceStoreTimesV1InnerServiceSMOImpl.updateResourceStoreTimes(resourceStoreTimesPo);
+ }
+
+ //鏌ヨ鎵规搴撳瓨鎬诲拰
+ ResourceStoreTimesDto resourceStoreTimesDto1 = new ResourceStoreTimesDto();
+ resourceStoreTimesDto1.setShId(assetInventoryDetailPo.getShId());
+ resourceStoreTimesDto1.setResCode(assetInventoryDetailPo.getResCode());
+ Integer timessCountStock = resourceStoreTimesV1InnerServiceSMOImpl.queryResourceStoreTimessCountStock(resourceStoreTimesDto1);
+
+
//鏇存柊鏌愪釜浠撳簱鏌愪釜鍟嗗搧
ResourceStorePo resourceStorePo = new ResourceStorePo();
resourceStorePo.setResId(assetInventoryDetailPo.getResId());
- resourceStorePo.setStock(assetInventoryDetailPo.getQuantity());
+ resourceStorePo.setStock(Integer.toString(timessCountStock));
+
+ //鑾峰彇绱ф�ラ噰璐暟閲�
+ BigDecimal quantity = new BigDecimal(timessCountStock);
+ BigDecimal miniUnitStock = new BigDecimal(resourceStore.getString("miniUnitStock"));
+ //璁＄畻鏈�灏忚閲忔�绘暟
+ BigDecimal miniStock = quantity.multiply(miniUnitStock);
+ resourceStorePo.setMiniStock(String.valueOf(miniStock));
resourceStorePo.setStatusCd("0");
resourceStoreV1InnerServiceSMOImpl.updateResourceStore(resourceStorePo);
+
+
+
}
}
}
--
Gitblit v1.8.0