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/bmo/collection/impl/GoodsCollectionBMOImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/collection/impl/GoodsCollectionBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/collection/impl/GoodsCollectionBMOImpl.java
index 8ab2e1b..2be0ac3 100755
--- a/service-store/src/main/java/com/java110/store/bmo/collection/impl/GoodsCollectionBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/collection/impl/GoodsCollectionBMOImpl.java
@@ -1,7 +1,8 @@
package com.java110.store.bmo.collection.impl;
+import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Transactional;
-import com.java110.dto.purchaseApply.PurchaseApplyDto;
+import com.java110.dto.purchase.PurchaseApplyDto;
import com.java110.intf.common.IGoodCollectionUserInnerServiceSMO;
import com.java110.intf.store.IPurchaseApplyInnerServiceSMO;
import com.java110.po.purchase.PurchaseApplyPo;
@@ -26,20 +27,20 @@
@Override
@Java110Transactional
- public ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo) {
+ public ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson) {
int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
if (saveFlag < 1) {
- return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "閲囪喘鐢宠澶辫触");
+ return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "鐗╁搧棰嗙敤鐢宠澶辫触");
}
PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(purchaseApplyPo, PurchaseApplyDto.class);
purchaseApplyDto.setCurrentUserId(purchaseApplyPo.getUserId());
- if(!purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT)){
+ purchaseApplyDto.setNextStaffId(reqJson.getString("staffId"));
+ if (!PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT.equals(purchaseApplyPo.getWarehousingWay())) {
goodCollectionUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
}
-
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "鐗╁搧棰嗙敤鎴愬姛");
}
--
Gitblit v1.8.0