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

# Conflicts:
#	src/Service/Interfaces/Production/ExternalDeliveryServiceInterface.php

src/Service/Interfaces/Flow/FlowServiceInterface.php

@@ -27,8 +27,18 @@ interface FlowServiceInterface
      * [
      *      'code' => '', //来源单号
      *      'user_id' => '', //审批人
+     *      'line_code' => '',//审批节点编码
+     *      'approval' => '', // 审批结果 通过、拒绝 pass  reject
      *      'params' => '',//审批参数
      * ]
      */
     public function approval($params);
+
+    /**
+     * Notes: 获取审批详情
+     * User: carlos
+     * DateTime: 2022/11/14 14:10
+     * @param $params
+     */
+    public function getApprovalDetail($params);
 }
\ No newline at end of file

src/Service/Interfaces/Production/ExternalDeliveryServiceInterface.php

@@ -35,12 +35,30 @@ interface ExternalDeliveryServiceInterface
      */
     public function  deliveryPendingDisplay($productionId);
 
+    /**
+     * 小货-发货记录
+     * @param $params
+     * @author Linjixin
+     * date 2022-11-15
+     */
+    public function deliveryRecordsList($params);
+
+
+    /**
+     * 小货-发货记录导出
+     * @param $params
+     * @author Linjixin
+     * date 2022-11-15
+     */
+    public function deliveryRecordsListExport($params);
+
 
     /**
      * 通过发货单号获取发货信息
      * @param $deliveryNoArr 发货单号
      * @param $relation  关联模型 拿到发货产品信息 ['dispatch_products]
      * @param $columns
+     * @return array  ['发货单号'=>array()]
      * @author Liu lu
      * date 2022-11-15
      */