优化 物品领用

service-store/src/main/java/com/java110/store/api/CollectionApi.java

@@ -95,7 +95,7 @@ public class CollectionApi {
             purchaseApplyDetailPos.add(purchaseApplyDetailPo);
         }
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-        return goodsCollectionBMOImpl.collection(purchaseApplyPo);
+        return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
     }
 
     /**
@@ -269,6 +269,6 @@ public class CollectionApi {
             }
         }
         purchaseApplyPo.setPurchaseApplyDetailPos(purchaseApplyDetailPos);
-        return goodsCollectionBMOImpl.collection(purchaseApplyPo);
+        return goodsCollectionBMOImpl.collection(purchaseApplyPo,reqJson);
     }
 }

service-store/src/main/java/com/java110/store/bmo/collection/IGoodsCollectionBMO.java

@@ -1,5 +1,6 @@
 package com.java110.store.bmo.collection;
 
+import com.alibaba.fastjson.JSONObject;
 import com.java110.po.purchase.PurchaseApplyPo;
 import org.springframework.http.ResponseEntity;
 
@@ -10,5 +11,5 @@ public interface IGoodsCollectionBMO {
      * @param purchaseApplyPo
      * @return
      */
-    ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo);
+    ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson);
 }

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,7 +27,7 @@ public class GoodsCollectionBMOImpl implements IGoodsCollectionBMO {
 
     @Override
     @Java110Transactional
-    public ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo) {
+    public ResponseEntity<String> collection(PurchaseApplyPo purchaseApplyPo, JSONObject reqJson) {
 
         int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
 
@@ -36,11 +37,11 @@ public class GoodsCollectionBMOImpl implements IGoodsCollectionBMO {
 
         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, "物品领用成功");
     }
 }