Merge branch 'develop' of http://git.huaperfect.com/without_auth/meibuyu-rpc into develop

src/Service/Interfaces/PurchaseNew/AbnormalServiceInterface.php

+<?php
+
+
+namespace Meibuyu\Rpc\Service\Interfaces\PurchaseNew;
+
+
+interface AbnormalServiceInterface
+{
+
+
+
+    /**
+     * 到仓异常数据添加
+     * @param $scanNo
+     * @return mixed
+     */
+    public function createWarehoused($params): string;
+
+}
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/PurchaseInfoServiceInterface.php

@@ -36,6 +36,14 @@ interface PurchaseInfoServiceInterface
     public function getShippingList($page=1,$pageSize=10): array;
 
 
+    /**
+     * 根据批次号查询采购信息
+     * @param array $batchNo 批次号数组
+     * @return array
+     */
+    public function getPurchaseInfoArrByBatchNo(array $batchNo) :array;
+
+
     /**
      * 订单推送采购
      * @param $post
@@ -43,4 +51,13 @@ interface PurchaseInfoServiceInterface
      */
     public function orderPushPurchase($post);
 
+
+
+    /**
+     * 子订单号获取物流信息
+     * @param  array $subOrderNos
+     * @return array
+     */
+    public function getLogisticsInfo(array $subOrderNos);
+
 }
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/SupplierNewServiceInterface.php

+<?php
+
+
+namespace Meibuyu\Rpc\Service\Interfaces\PurchaseNew;
+
+
+interface SupplierNewServiceInterface
+{
+
+
+
+
+    /**
+     * 供应商列表数据
+     * @param  array 供应商id数组
+     * @param  $params['company_name'] 公司名称
+     * @return
+     */
+    public function list(array $params);
+
+//    /**
+//     * 供应商下拉框
+//     * @return array
+//     */
+//
+//    public function getCompanyOption(): string;
+
+    /**
+     * 根据supplier_id 获取供应商信息
+     * @param array $params [1,2,3]
+     * @return array
+     */
+    public function getSupplierInfo(array $params): array;
+}
\ No newline at end of file

src/Service/Interfaces/PurchaseNew/SupplierServiceInterface.php

+<?php
+
+
+namespace Meibuyu\Rpc\Service\Interfaces\PurchaseNew;
+
+
+interface SupplierServiceInterface
+{
+
+
+
+
+    /**
+     * 供应商列表数据
+     * @param  array 供应商id数组
+     * @param  $params['company_name'] 公司名称
+     * @return
+     */
+    public function list(array $params): string;
+
+//    /**
+//     * 供应商下拉框
+//     * @return array
+//     */
+//
+//    public function getCompanyOption(): string;
+
+}
\ No newline at end of file

src/Service/Interfaces/Store/StorePurchaseServiceInterface.php

@@ -10,24 +10,21 @@ namespace Meibuyu\Rpc\Service\Interfaces\Store;
 
 interface StorePurchaseServiceInterface
 {
+
     /**
-     * 创建对应的退货单, $params 数组结构如下：
-     *  [
-    'source_type'   => '',          //来源类型，默认为采购
-    'source_no'     => '',          //来源单号，比如来源是采购就是采购单号
-    'batch_no'      => '',          //对应的批次号
-    'sku'           => '',          //sku
-    'purchased_cnt' => 0,           //购买量
-    'returns_cnt'   => 0,           //退货数量
-    ];
+     * 继续入库
+     * [
+     *  'purchase_no' => '',       //采购单号（必填）
+     *  'batch_no'    => '',       //批次号（必填）
+     *  'extra'       => [],       //后续扩展使用可以，非必填
+     * ]
      * @param array $params
      * @return array
      * [
-    'msg' => '退货成功',
-    'code'=> 200,                       //响应码
-    'data' => ['id' => 退货 ID]          //返回的数据，id 为对应的退货 ID
-    ];
-     * @throws
+            'msg' => '退货成功',
+            'code'=> 200,                       //响应码
+            'data' => []                        //返回的数据
+        ];
      */
-    public function createReturns(array $params): array;
+    public function continueWarehousing(array $params): array;
 }