From 8e3827a655cb13c67210bae939448ddd42ec8084 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 29 四月 2021 16:27:30 +0800
Subject: [PATCH] 优化采购管理 1、新增个人物品转增2、物品使用记录3、新增商品供应商4、部分优化
---
service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
index d1afdd8..8bdab41 100644
--- a/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/ownerRepair/RepairFinishListener.java
@@ -23,6 +23,7 @@
import com.java110.intf.community.IRepairUserInnerServiceSMO;
import com.java110.intf.community.IResourceStoreServiceSMO;
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.store.IResourceStoreUseRecordInnerServiceSMO;
import com.java110.intf.store.IUserStorehouseInnerServiceSMO;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
@@ -32,6 +33,7 @@
import com.java110.po.owner.RepairPoolPo;
import com.java110.po.owner.RepairUserPo;
import com.java110.po.purchase.ResourceStorePo;
+import com.java110.po.resourceStoreUseRecord.ResourceStoreUseRecordPo;
import com.java110.po.userStorehouse.UserStorehousePo;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.FeeTypeConstant;
@@ -88,6 +90,9 @@
@Autowired
private IUserStorehouseInnerServiceSMO userStorehouseInnerServiceSMO;
+ @Autowired
+ private IResourceStoreUseRecordInnerServiceSMO resourceStoreUseRecordInnerServiceSMOImpl;
+
@Override
protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "repairId", "鏈寘鍚姤淇崟淇℃伅");
@@ -111,6 +116,18 @@
String resId = reqJson.getString("resId");
//鑾峰彇鍟嗗搧鏁伴噺
String useNumber = reqJson.getString("useNumber");
+ //鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁鏈夐渶瑕佸鐞嗙殑璁㈠崟
+ RepairUserDto repairUserDto = new RepairUserDto();
+ repairUserDto.setRepairId(reqJson.getString("repairId"));
+ repairUserDto.setCommunityId(reqJson.getString("communityId"));
+ repairUserDto.setState(RepairUserDto.STATE_DOING);
+ repairUserDto.setStaffId(userId);
+ List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
+ if (repairUserDtos.size() != 1) {
+ ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗曪紒");
+ context.setResponseEntity(responseEntity);
+ return;
+ }
String outLowPrice = "0";
String outHighPrice = "0";
List<ResourceStorePo> resourceStorePoList = new ArrayList<>();
@@ -140,7 +157,6 @@
outLowPrice = resourceStorePoList.get(0).getOutLowPrice();
outHighPrice = resourceStorePoList.get(0).getOutHighPrice();
}
-
if (!StringUtil.isEmpty(useNumber)
&& !"0".equals(useNumber)
&& (!StringUtil.isEmpty(isCustom) && isCustom.equals("false"))) {
@@ -150,13 +166,11 @@
userStorehouseDto.setResId(resId);
userStorehouseDto.setUserId(userId);
userStorehouseDtoList = userStorehouseInnerServiceSMO.queryUserStorehouses(userStorehouseDto);
-
if (userStorehouseDtoList == null || userStorehouseDtoList.size() < 1) {
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "缁翠慨鐗╂枡搴撳瓨涓嶈冻锛岃鎮ㄥ厛鐢抽鐗╁搧锛�");
context.setResponseEntity(responseEntity);
return;
}
-
if (userStorehouseDtoList.size() == 1) {
nowStock = userStorehouseDtoList.get(0).getStock();
}
@@ -186,16 +200,23 @@
return;
}
}
- RepairUserDto repairUserDto = new RepairUserDto();
- repairUserDto.setRepairId(reqJson.getString("repairId"));
- repairUserDto.setCommunityId(reqJson.getString("communityId"));
- repairUserDto.setState(RepairUserDto.STATE_DOING);
- repairUserDto.setStaffId(userId);
- List<RepairUserDto> repairUserDtos = repairUserInnerServiceSMOImpl.queryRepairUsers(repairUserDto);
- if (repairUserDtos.size() != 1) {
- ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_BUSINESS_VERIFICATION, "褰撳墠鐢ㄦ埛娌℃湁闇�瑕佸鐞嗚鍗曪紒");
- context.setResponseEntity(responseEntity);
- return;
+ //寰�鐗╁搧浣跨敤璁板綍琛ㄦ彃鍏ユ暟鎹�
+ ResourceStoreUseRecordPo resourceStoreUseRecordPo = new ResourceStoreUseRecordPo();
+ resourceStoreUseRecordPo.setRsurId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rsurId));
+ resourceStoreUseRecordPo.setRepairId(reqJson.getString("repairId"));
+ resourceStoreUseRecordPo.setResId(resId);
+ resourceStoreUseRecordPo.setCommunityId(reqJson.getString("communityId"));
+ resourceStoreUseRecordPo.setStoreId(reqJson.getString("storeId"));
+ resourceStoreUseRecordPo.setCreateUserId(reqJson.getString("userId"));
+ resourceStoreUseRecordPo.setCreateUserName(reqJson.getString("userName"));
+ resourceStoreUseRecordPo.setRemark(reqJson.getString("context"));
+ resourceStoreUseRecordPo.setQuantity(useNumber);
+ //鏈夊伩鏈嶅姟
+ if (maintenanceType.equals("1001")) {
+ resourceStoreUseRecordPo.setUnitPrice(reqJson.getString("price"));
+ super.insert(context, resourceStoreUseRecordPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_RESOURCE_STORE_USE_RECORD);
+ } else if (maintenanceType.equals("1003")) { //闇�瑕佺敤鏂�
+ super.insert(context, resourceStoreUseRecordPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_RESOURCE_STORE_USE_RECORD);
}
// 1.0 鍏抽棴鑷繁璁㈠崟
RepairUserPo repairUserPo = new RepairUserPo();
--
Gitblit v1.8.0