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

src/Service/Interfaces/OutsideFactory/FactoryServiceInterface.php

@@ -14,4 +14,20 @@ interface FactoryServiceInterface
      * @return String
      */
     public function productCraftPrint($craftInfo) ;
+
+    /**
+     * 获取对应的工厂信息
+     * @param array $factoryIds
+     * @param array|string[] $columns
+     * @return mixed
+     */
+    public function getFactories(array $factoryIds = [], array $columns = ['*']);
+
+    /**
+     * 根据筛选条件获取对应的工厂信息
+     * @param array $filters 筛选条件
+     * @param array|string[] $columns 查询字段
+     * @return mixed
+     */
+    public function getFactoriesByFilters(array $filters = [], array $columns = ['*']);
 }
\ No newline at end of file

src/Service/Interfaces/Product/ProductServiceInterface.php

@@ -247,4 +247,25 @@ interface ProductServiceInterface
      */
 	 public function getCraftByProductIds(array $productIds);
 
+    /**
+     * 获取产品数据
+     * @param array $where
+     * @param array $select
+     * @param array|null $limitIds
+     * @return array
+     * @author chentianyu
+     */
+    public function getProductsByWhere(array $where, array $select = ['id'], array $limitIds = null): array;
+
+    /**
+     * 获取报关品名
+     * @param array $where
+     * @param array $select
+     * @param array|null $limitIds
+     * @return array
+     * @author chentianyu
+     */
+    public function getProductNamesByWhere(array $where, array $select = ['id'], array $limitIds = null): array;
+
+    
 }

src/Service/Interfaces/Production/ProductionOrderServiceInterface.php

+<?php
+
+namespace Meibuyu\Rpc\Service\Interfaces\Production;
+
+interface ProductionOrderServiceInterface
+{
+
+    /**
+     * 根据对应的筛选条件获取对应的生产单相关信息
+     * @param array $filters
+     * @return mixed
+     */
+    public function getProductionOrderByFilter(array $filters, $columns = ['*'], $with = []);
+
+}

src/Service/Interfaces/Wms/ChannelAndCompanyInterface.php

@@ -15,7 +15,7 @@ interface ChannelAndCompanyInterface
      * @param array $channelIds $channelIds：渠道id数组， 格式：[1,3,5]
      * @return array
      */
-    public function getChannelByIds(array $channelIds): array;
+    public function getChannelByIds(array $channelIds, $status = 1): array;
 
       /**
      * 通过公司id获取公司信息
@@ -27,5 +27,5 @@ interface ChannelAndCompanyInterface
      *
      * @return array
      */
-    public function getCompanyByIds(array $companyIds): array;
+    public function getCompanyByIds(array $companyIds, $status = 1): array;
 }