From 745d27feae34022ccb708aba034123e08e4e9e14 Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期二, 28 十二月 2021 22:21:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/allocationUserStorehouse/impl/AllocationUserStorehouseBMOImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/allocationUserStorehouse/impl/AllocationUserStorehouseBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/allocationUserStorehouse/impl/AllocationUserStorehouseBMOImpl.java
index 75bfa5c..ce0b991 100644
--- a/service-api/src/main/java/com/java110/api/bmo/allocationUserStorehouse/impl/AllocationUserStorehouseBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/allocationUserStorehouse/impl/AllocationUserStorehouseBMOImpl.java
@@ -50,6 +50,8 @@
String giveQuantity = paramIn.getString("giveQuantity");
//鑾峰彇鐗╁搧id
String resId = paramIn.getString("resId");
+ //鑾峰彇鐗╁搧id
+ String resCode = paramIn.getString("resCode");
//鑾峰彇鐗╁搧鍚嶇О
String resName = paramIn.getString("resName");
//鑾峰彇褰撳墠鐢ㄦ埛id
@@ -63,6 +65,7 @@
JSONObject allocationUserStorehouseJson = new JSONObject();
allocationUserStorehouseJson.put("ausId", "-1");
allocationUserStorehouseJson.put("resId", resId);
+ allocationUserStorehouseJson.put("resCode", resCode);
allocationUserStorehouseJson.put("resName", resName);
allocationUserStorehouseJson.put("storeId", storeId);
allocationUserStorehouseJson.put("stock", stock);
@@ -118,7 +121,7 @@
super.update(dataFlowContext, userStorehousePo, BusinessTypeConstant.BUSINESS_TYPE_UPDATE_USER_STOREHOUSE);
UserStorehouseDto userStorehouse = new UserStorehouseDto();
userStorehouse.setUserId(acceptUserId);
- userStorehouse.setResId(resId);
+ userStorehouse.setResCode(resCode);
//鏌ヨ鎺ュ彈杞禒浜虹殑涓汉鐗╁搧淇℃伅
List<UserStorehouseDto> userStorehouses = userStorehouseInnerServiceSMOImpl.queryUserStorehouses(userStorehouse);
if (userStorehouses != null && userStorehouses.size() == 1) {
@@ -164,6 +167,7 @@
userStorePo.setResId(resId);
userStorePo.setResName(resName);
userStorePo.setStoreId(storeId);
+ userStorePo.setResCode(resCode);
if (unitCode.equals(miniUnitCode)) { //濡傛灉鐗╁搧鍗曚綅涓庣墿鍝佹渶灏忚閲忓崟浣嶇浉鍚岋紝灏变笉鍚戜笂鍙栨暣
userStorePo.setStock(String.valueOf(num7));
} else { //濡傛灉鐗╁搧鍗曚綅涓庣墿鍝佹渶灏忚閲忓崟浣嶄笉鍚岋紝灏卞悜涓婂彇鏁�
--
Gitblit v1.8.0