From 4e134e61ede1f8574189af45c810ca365c7c7f9a Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 18:33:14 +0800
Subject: [PATCH] 优化代码

---
 service-store/src/main/java/com/java110/store/bmo/collection/impl/GoodsCollectionBMOImpl.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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 484b472..ee8c550 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,5 +1,6 @@
 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.intf.common.IGoodCollectionUserInnerServiceSMO;
@@ -26,17 +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());
-        goodCollectionUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
+        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