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

src/Service/Interfaces/OutsideFactory/FactoryServiceInterface.php

@@ -177,4 +177,21 @@ interface FactoryServiceInterface
      * @return int 主键id
      */
     public function pushSupplyDataToFactory($post);
+
+    /**
+     * Notes: 发货状态
+     * User: carlos
+     * DateTime: 2022/12/5 10:08
+     */
+    public function updateDeliveryStatus($params);
+
+
+    /***
+     * 账单标记结算
+     * 发货表与返修出库表标记已结算
+     * @param $params
+     * @author Liu lu
+     * date 2022-12-19
+     */
+    public function billMarkSettled($params);
 }
\ No newline at end of file

src/Service/Interfaces/Production/ProductionServiceInterface.php

@@ -175,9 +175,9 @@ interface ProductionServiceInterface
      * Notes: 取消发货订单
      * User: carlos
      * DateTime: 2022/11/22 9:20
-     * @param $delivery_no
+     * @param $params
      */
-    public function cancelDelivery($delivery_no);
+    public function cancelDelivery($params);
 
     /**
      * Notes: 创建生产异常单

src/Service/Interfaces/Supply/SupplyServiceInterface.php

+<?php
+
+/**
+ * 新供应商rpc
+ */
+
+namespace Meibuyu\Rpc\Service\Interfaces\Supply;
+
+
+interface SupplyServiceInterface
+{
+
+
+    /**
+     * 获取
+     * @param $id
+     * @param $column
+     * @param $sourceType 工厂系统 | 采购系统
+     * @return mixed
+     * @author Liu lu
+     * date 2022-12-03
+     */
+    public function getSupplyByOldId($id,$column=['*'],$sourceType='工厂系统');
+
+
+    /**
+     * 获取供应商
+     * @param array $ids
+     * @param array $column
+     * @param string $sourceType
+     * @return mixed
+     * @author Liu lu
+     * date 2022-12-19
+     */
+    public function getSupplyListByRelatedIds(array $ids, $column = ['*'],$sourceType='工厂系统');
+
+}
\ No newline at end of file

src/Service/Interfaces/User/BaseInfoServiceInterface.php

@@ -290,4 +290,13 @@ interface BaseInfoServiceInterface
      */
     public function getTeamUserByUserIds($userId);
 
+    /**
+     * 通过用户id获取团队id
+     * @param array $teamIds 默认去重
+     * @param array $columns 用户字段,默认['id', 'name']
+     * @return array
+     */
+    public function getTeamIdsByUserId($userId);
+
+
 }