From 89eeb1655ab3a342fe9b19986e4aa5e58cf39575 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 28 二月 2022 19:15:19 +0800
Subject: [PATCH] 完成物业公司添加功能
---
service-store/src/main/java/com/java110/store/api/PurchaseApi.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 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 a027737..252f7a1 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
@@ -255,13 +255,6 @@
//鑾峰彇閲囪喘鐗╁搧淇℃伅
JSONArray resourceStores = reqJson.getJSONArray("resourceStores");
List<PurchaseApplyDetailPo> purchaseApplyDetailPos = new ArrayList<>();
- //鏌ヨ褰撳墠灏忓尯鐨勫皬鍖轰粨搴�
- StorehouseDto storehouseDto = new StorehouseDto();
- storehouseDto.setShObjId(reqJson.getString("communityId"));
- storehouseDto.setShType(StorehouseDto.SH_TYPE_COMMUNITY);//灏忓尯浠撳簱
- //鑾峰彇褰撳墠灏忓尯鐨勫皬鍖轰粨搴�
- List<StorehouseDto> storehouseDtos = storehouseInnerServiceSMOImpl.queryStorehouses(storehouseDto);
- //Assert.listOnlyOne(storehouseDtos, "娌℃湁鏌ヨ鍒板綋鍓嶅皬鍖轰粨搴撴垨鏌ヨ鍑哄涓皬鍖轰粨搴擄紒");
for (int resourceStoreIndex = 0; resourceStoreIndex < resourceStores.size(); resourceStoreIndex++) {
JSONObject resourceStore = resourceStores.getJSONObject(resourceStoreIndex);
PurchaseApplyDetailPo purchaseApplyDetailPo = BeanConvertUtil.covertBean(resourceStore, PurchaseApplyDetailPo.class);
@@ -274,7 +267,7 @@
//鏌ヨ褰撳墠灏忓尯浠撳簱涓嬭鐗╁搧淇℃伅
ResourceStoreDto resourceStoreDto = new ResourceStoreDto();
resourceStoreDto.setResCode(resourceStore.getString("resCode"));
- resourceStoreDto.setShId(storehouseDtos.get(0).getShId());
+ resourceStoreDto.setShId(resourceStore.getString("shzId"));//灏忓尯鐩爣浠撳簱
List<ResourceStoreDto> resourceStoreDtos = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto);
//璋冩暣闆嗗洟浠撳簱鐗╁搧淇℃伅
ResourceStorePo resourceStorePo = new ResourceStorePo();
@@ -290,7 +283,7 @@
allocationStorehouseDto.setAsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_allocationStorehouseId));
allocationStorehouseDto.setbId("-1");
allocationStorehouseDto.setShIda(resourceStore.getString("shId"));
- allocationStorehouseDto.setShIdz(storehouseDtos.get(0).getShId());
+ allocationStorehouseDto.setShIdz(resourceStore.getString("shzId"));//灏忓尯浠撳簱
allocationStorehouseDto.setResId(resourceStoreDtos.get(0).getResId());
allocationStorehouseDto.setResName(resourceStoreDtos.get(0).getResName());
allocationStorehouseDto.setStoreId(storeId);
@@ -358,7 +351,7 @@
allocationStorehouseDto.setAsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_allocationStorehouseId));
allocationStorehouseDto.setbId("-1");
allocationStorehouseDto.setShIda(resourceStore.getString("shId"));
- allocationStorehouseDto.setShIdz(storehouseDtos.get(0).getShId());
+ allocationStorehouseDto.setShIdz(resourceStore.getString("shzId"));//灏忓尯鐩爣浠撳簱
allocationStorehouseDto.setResId(resourceStore.getString("resId"));
allocationStorehouseDto.setResName(resourceStore.getString("resName"));
allocationStorehouseDto.setStoreId(storeId);
@@ -393,7 +386,7 @@
List<ResourceStoreDto> resourceStoreDtoList = resourceStoreInnerServiceSMOImpl.queryResourceStores(resourceStoreDto2);
ResourceStoreDto resourceStoreDto1 = BeanConvertUtil.covertBean(resourceStoreDtoList.get(0), ResourceStoreDto.class);
resourceStoreDto1.setResId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_resId));
- resourceStoreDto1.setShId(storehouseDtos.get(0).getShId());
+ resourceStoreDto1.setShId(resourceStore.getString("shzId"));
resourceStoreDto1.setbId("-1");
resourceStoreDto1.setStock(purchaseApplyDetailPo.getQuantity());
resourceStoreDto1.setCreateTime(new Date());
--
Gitblit v1.8.0