Merge branch 'feature-store-rpc-ex-order' into test

src/Service/Interfaces/StoreServiceInterface.php

@@ -10,7 +10,6 @@ namespace Meibuyu\Micro\Service\Interfaces;
 
 interface StoreServiceInterface
 {
-
     /**
      * 通过id列表获取仓库名称
      * @param array $idList 仓库id的列表, 默认去重
@@ -19,6 +18,50 @@ interface StoreServiceInterface
      */
     public function getByIdList(array $idList, array $columns = ['*']): array;
 
+    /**
+     * description:通过产品id数组获取库存列表 给订单系统查询的接口
+     * author: fuyunnan
+     * @param array $ids 产品ids 数组
+     * @param int $wareId 仓库id
+     * @param array $notWareId 仓库id
+     * @return array
+     * @throws
+     * Date: 2020/7/27
+     */
+    public function getListStock($ids, $wareId = 0, $notWareId = []): array;
+
+    /**
+     * description:根据筛选条件获取仓库的库存列表 对库存筛选实现大一统
+     * 参数格式 不需要可不传入对应的键
+     *  $args['inTeamIds'] =[];
+    $args['notInTeamIds'] = [];
+    $args['inWhIds'] = []; //仓库id
+    $args['notInWhIds'] = [];
+    $args['inProductIds'] = [];
+    $args['notInProductIds'] = [];
+    $args['where'] = [];
+    $args['group'] = ['product_id'];//默认['product_id']
+    $args['keyBy'] = 'product_id';//默认排序
+    $args['isKeyBy'] = $condition['isKeyBy'] ?? true;//是否加keyBy;
+    $args['isGroupBy'] = $condition['isGroupBy'] ?? true;//是否加分组;
+     *
+     * author: fuyunnan
+     * @param array $condition 筛选条件
+     * @return array
+     * @throws
+     * Date: 2020/7/27
+     */
+    public function getListStockWhere($condition): array;
+
+    /**
+     * description:检查是否有库存，有就返回库存数量（有记录） 给产品系统使用
+     * author: fuyunnan
+     * @param array $ids 仓库产品的id数组
+     * @return array
+     * @throws
+     * Date: 2020/7/31
+     */
+    public function checkStock($ids): array;
 
     /**
      * description:创建入库单
@@ -50,7 +93,6 @@ interface StoreServiceInterface
      */
     public function createWarehousing(array $data): array;
 
-
     /**
      * description:批量创建出库单
      * author: fuyunnan
@@ -81,6 +123,15 @@ interface StoreServiceInterface
      */
     public function createBatchWarehousing(array $attributes): bool;
 
+    /**
+     * description:批量创建出库单,出库单直接出库
+     * author: fuyunnan
+     * @param array $attributes 提交的数组  参考yapi http://api.huaperfect.com/project/38/interface/api/6968
+     * @return bool
+     * @throws
+     * Date: 2020/8/8
+     */
+    public function createBatchExComplete(array $attributes): bool;
 
     /**
      * description:批量创建入库单
@@ -92,7 +143,6 @@ interface StoreServiceInterface
      */
     public function createBatchInOrder(array $attributes): bool;
 
-
     /**
      * description:生产单结束获取统计单号值
      * author: fuyunnan
@@ -103,7 +153,6 @@ interface StoreServiceInterface
      */
     public function CntSourceNoOrder($sourceNo): array;
 
-
     /**
      * description:通过来源单号获取产品列表
      * author: fuyunnan
@@ -114,7 +163,6 @@ interface StoreServiceInterface
      */
     public function listSourceNoProduct($sourceNo): array;
 
-
     /**
      * description:根据来源单号，获取分组后的入库单
      * author: fuyunnan
@@ -150,7 +198,6 @@ interface StoreServiceInterface
      */
     public function listIdsProduct($ids): array;
 
-
     /**
      * description:修改二次质检状态
      * author: fuyunnan
@@ -162,7 +209,6 @@ interface StoreServiceInterface
      */
     public function updateQualityStatus($orderId, $update): int;
 
-
     /**
      * description:修改二次质检状态
      * author: fuyunnan
@@ -174,53 +220,6 @@ interface StoreServiceInterface
      */
     public function updateListQualityStatus($orderIds, $update): int;
 
-
-    /**
-     * description:通过产品id数组获取库存列表 给订单系统查询的接口
-     * author: fuyunnan
-     * @param array $ids 产品ids 数组
-     * @param int $wareId 仓库id
-     * @param array $notWareId 仓库id
-     * @return array
-     * @throws
-     * Date: 2020/7/27
-     */
-    public function getListStock($ids, $wareId = 0, $notWareId = []): array;
-
-    /**
-     * description:根据筛选条件获取仓库的库存列表 对库存筛选实现大一统
-     * 参数格式 不需要可不传入对应的键
-     *  $args['inTeamIds'] =[];
-        $args['notInTeamIds'] = [];
-        $args['inWhIds'] = []; //仓库id
-        $args['notInWhIds'] = [];
-        $args['inProductIds'] = [];
-        $args['notInProductIds'] = [];
-        $args['where'] = [];
-        $args['group'] = ['product_id'];//默认['product_id']
-        $args['keyBy'] = 'product_id';//默认排序
-        $args['isKeyBy'] = $condition['isKeyBy'] ?? true;//是否加keyBy;
-        $args['isGroupBy'] = $condition['isGroupBy'] ?? true;//是否加分组;
-     *
-     * author: fuyunnan
-     * @param array $condition 筛选条件
-     * @return array
-     * @throws
-     * Date: 2020/7/27
-     */
-    public function getListStockWhere($condition): array;
-
-    /**
-     * description:检查是否有库存，有就返回库存数量（有记录） 给产品系统使用
-     * author: fuyunnan
-     * @param array $ids 仓库产品的id数组
-     * @return array
-     * @throws
-     * Date: 2020/7/31
-     */
-    public function checkStock($ids): array;
-
-
     /**
      * description:出库单 恢复库存 出库单定为已取消
      * author: fuyunnan
@@ -265,7 +264,6 @@ interface StoreServiceInterface
      */
     public function autoSkuStock($data): array;
 
-
     /**
      * description:删除拣货中出库单
      * author: fuyunnan
@@ -276,6 +274,16 @@ interface StoreServiceInterface
      */
     public function delExOrderList($sourceNo): int;
 
+    /**
+     * description:删除已经出库的出库单
+     * author: fuyunnan
+     * @param array $sourceNo 来源单号
+     * @return int
+     * @throws
+     * Date: 2020/12/7
+     */
+    public function delExCompleteList($sourceNo): int;
+
     /**
      * description:订单通知取消更改字段 不在生成出库单
      * author: fuyunnan