Commit bf437c00 authored by Lin jixin's avatar Lin jixin
Browse files

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

# Conflicts:
#	src/Service/Interfaces/OutsideFactory/FactoryServiceInterface.php
parents 6666a2e9 f942fa64
Loading
Loading
Loading
Loading
+63 −0
Original line number Diff line number Diff line
<?php

namespace Meibuyu\Rpc\Service\Interfaces\Notice;

interface FactoryNoticeServiceInterface
{

    /**
     * 分页
     * @param $userInfo
     * @param $params
     * @author chentianyu
     */
    public function page($userInfo,$params);

    /**
     * 未读列表
     * @param $userInfo
     * @param $params
     * @author chentianyu
     */
    public function unReadList($userInfo,$params);

    /**
     * 查看
     * @param $userInfo
     * @param $params
     * @author chentianyu
     */
    public function show($userInfo,$params);

    /**
     * 下一条未读的记录
     * @param $userInfo
     * @param $params
     * @author chentianyu
     */
    public function nextUnRead($userInfo,$params);

    /**
     * 标记为已读
     * @param $userInfo
     * @param $params
     * @author chentianyu
     */
    public function markRead($userInfo,$params);

    /**
     * 获取用户已读工厂公告
     * @param $userInfo
     * @author chentianyu
     */
    public static function getReadNotices($userInfo);

    /**
     * 打包下载
     * @param $noticeId
     * @author chentianyu
     */
    public function pack($noticeId);


}
+50 −4
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@
namespace Meibuyu\Rpc\Service\Interfaces\OutsideFactory;


use App\Model\Factory;

interface FactoryServiceInterface
{

@@ -46,13 +44,61 @@ interface FactoryServiceInterface
     */
    public function toProductOrderMessage(array $post);


    /**
     *  工厂列表
     * @param string  $id 工厂id
     * @return array  $list
     */
    public function factoryList();

    /**
     *  子工厂列表
     * @param string  $id 工厂id
     * @return array  $list
     */
    public function  childFactoryList($id);


    /**
     *  工厂树状列表
     * @return array  $list
     */
    public function treeFactoryList();


    /**
     * 获取分派详情通过来源订单号
     * @param $originalProductionNos
     * @return array|mixed
     * @author Liu lu
     * date 2022-09-19
     */
    public function getApportionInfoListByNos($originalProductionNos);


    /**
     * Notes: 分派订单取消
     * User: carlos
     * DateTime: 2022/9/21 14:24
     */
    public function cancelOrder($orderNo);

    /**
     * Notes: 获取订单信息
     * User: carlos
     * DateTime: 2022/9/22 16:21
     * @param $orderNo
     */
    public function getProductionOrder($orderNo, $columns =['*']);



    /**
     * 获取供应链获取工厂端生产对账单
     * @param $searchConditions 搜索条件
     * @param bool $isExport 是否导出
     * @return array|\Hyperf\Contract\LengthAwarePaginatorInterface|mixed
     * @author Liu lu
     * date 2022-09-27
     */
    public function getProductionAccountStatement($searchConditions,$isExport=false);
}
 No newline at end of file
+21 −0
Original line number Diff line number Diff line
@@ -126,4 +126,25 @@ interface ProductionServiceInterface
     */
    public function getMessageProductionOrderIds();


    /**
     * 发送留言
     * @return mixed
     */
    public function pushProductionMessage(array $params);


    /**
     * 获取留言
     * @return mixed
     */
    public function getProductionMessage(array $params);


    /**
     * 已读标记
     * @return mixed
     */
    public function isReadProductionMessage(array $params);

}