From a6c962f1c6e14984f2bbc2f3e43fa85947d3cb0a Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 25 三月 2023 00:26:41 +0800
Subject: [PATCH] 支持厂拍门禁
---
service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
index 4934f32..34b87ce 100644
--- a/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/resourceStore/SaveAllocationUserStorehouseCmd.java
@@ -3,14 +3,17 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.DataFlowContext;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.resourceStore.ResourceStoreDto;
+import com.java110.dto.user.UserDto;
import com.java110.dto.userStorehouse.UserStorehouseDto;
import com.java110.intf.store.*;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.allocationUserStorehouse.AllocationUserStorehousePo;
import com.java110.po.resourceStoreUseRecord.ResourceStoreUseRecordPo;
import com.java110.po.userStorehouse.UserStorehousePo;
@@ -46,6 +49,9 @@
@Autowired
private IAllocationUserStorehouseV1InnerServiceSMO allocationUserStorehouseV1InnerServiceSMOImpl;
+ @Autowired
+ private IUserInnerServiceSMO userInnerServiceSMOImpl;
+
@Override
@@ -56,8 +62,22 @@
}
@Override
+ @Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
String userId = reqJson.getString("userId");
+ if(StringUtil.isEmpty(userId)){
+ userId = context.getReqHeaders().get("user-id");
+ }
+ UserDto userDto = new UserDto();
+ userDto.setUserId(userId);
+ userDto.setPage(1);
+ userDto.setRow(1);
+ List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+
+ Assert.listOnlyOne(userDtos,"鐢ㄦ埛涓嶅瓨鍦�");
+
+ reqJson.put("userName",userDtos.get(0).getName());
+
String acceptUserId = reqJson.getString("acceptUserId");
if(!StringUtil.isEmpty(userId) && !StringUtil.isEmpty(acceptUserId) && acceptUserId.equals(userId)){
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鐗╁搧鎺ュ彈浜轰笉鑳芥槸鏈汉锛屾墍浠ユ棤娉曡繘琛岃浆璧犳搷浣滐紒");
@@ -81,7 +101,7 @@
JSONObject paramIn = JSONObject.parseObject(String.valueOf(object));
ResourceStoreUseRecordPo resourceStoreUseRecordPo = new ResourceStoreUseRecordPo();
resourceStoreUseRecordPo.setRsurId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_rsurId));
- resourceStoreUseRecordPo.setRepairId("-1"); //鎶ヤ慨璁板綍
+ resourceStoreUseRecordPo.setRepairId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_repairId)); //鎶ヤ慨璁板綍
resourceStoreUseRecordPo.setResId(paramIn.getString("resId")); //鐗╁搧璧勬簮id
resourceStoreUseRecordPo.setCommunityId(paramInJson.getString("communityId")); //灏忓尯id
resourceStoreUseRecordPo.setStoreId(paramInJson.getString("storeId")); //鍟嗘埛id
@@ -176,10 +196,12 @@
String acceptUserId = paramInJson.getString("acceptUserId");
//鑾峰彇鎺ュ彈杞禒鐢ㄦ埛鍚嶇О
String acceptUserName = paramInJson.getString("acceptUserName");
+ //鎵规
+ String timesId = paramIn.getString("timesId");
//鑾峰彇鍟嗘埛id
String storeId = paramInJson.getString("storeId");
JSONObject allocationUserStorehouseJson = new JSONObject();
- allocationUserStorehouseJson.put("ausId", "-1");
+ allocationUserStorehouseJson.put("ausId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ausId));
allocationUserStorehouseJson.put("resId", resId);
allocationUserStorehouseJson.put("resCode", resCode);
allocationUserStorehouseJson.put("resName", resName);
@@ -275,6 +297,7 @@
userStorePo.setStock(String.valueOf(stockNumber));
}
userStorePo.setUsId(userStorehouses.get(0).getUsId());
+ userStorePo.setTimesId(timesId);
//鏇存柊褰撳墠鐢ㄦ埛鐨勫簱瀛樻暟閲�
flag1 = userStorehouseV1InnerServiceSMOImpl.updateUserStorehouse(userStorePo);
if(flag1 <1){
@@ -288,7 +311,7 @@
BigDecimal num8 = new BigDecimal(miniUnitStock);
BigDecimal unitStock = num7.divide(num8, 2, BigDecimal.ROUND_HALF_UP);
UserStorehousePo userStorePo = new UserStorehousePo();
- userStorePo.setUsId("-1");
+ userStorePo.setUsId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_usId));
userStorePo.setResId(resId);
userStorePo.setResName(resName);
userStorePo.setStoreId(storeId);
@@ -301,8 +324,9 @@
}
userStorePo.setMiniStock(giveQuantity);
userStorePo.setUserId(acceptUserId);
+ userStorePo.setTimesId(timesId);
//淇濆瓨鎺ュ彈杞禒鐢ㄦ埛涓汉鐗╁搧淇℃伅
- flag1 = userStorehouseV1InnerServiceSMOImpl.updateUserStorehouse(userStorePo);
+ flag1 = userStorehouseV1InnerServiceSMOImpl.saveUserStorehouse(userStorePo);
if(flag1 <1){
throw new CmdException("淇濆瓨澶辫触");
} }
--
Gitblit v1.8.0