From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能

---
 service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
index 5de4463..48ef96a 100755
--- a/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
@@ -1,5 +1,6 @@
 package com.java110.store.bmo.purchase.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.purchaseApply.PurchaseApplyDto;
 import com.java110.intf.common.IPurchaseApplyUserInnerServiceSMO;
@@ -12,32 +13,28 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-
 @Service("purchaseApplyBMOImpl")
 public class PurchaseApplyBMOImpl implements IPurchaseApplyBMO {
 
     @Autowired
     private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
 
-
     @Autowired
     private IPurchaseApplyUserInnerServiceSMO purchaseApplyUserInnerServiceSMOImpl;
 
-
     @Override
     @Java110Transactional
-    public ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo) {
-
+    public ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson) {
         int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
-
         if (saveFlag < 1) {
             return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "閲囪喘鐢宠澶辫触");
         }
-
         PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(purchaseApplyPo, PurchaseApplyDto.class);
         purchaseApplyDto.setCurrentUserId(purchaseApplyPo.getUserId());
-        purchaseApplyUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
-
+        if(!purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT) && !purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_URGENT)){
+            purchaseApplyDto.setNextStaffId(reqJson.getString("staffId"));
+            purchaseApplyUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
+        }
         return ResultVo.createResponseEntity(ResultVo.CODE_OK, "閲囪喘鐢宠鎴愬姛");
     }
 }

--
Gitblit v1.8.0