Merge branch 'fuyunnan-dev-code' (bd5e54d8) · Commits · without_auth / meibuyu-rpc

src/Service/Interfaces/DingTalk/DingUserServiceInterface.php

+2 −7

Original line number	Diff line number	Diff line
		@@ -17,15 +17,10 @@ interface DingUserServiceInterface
		public function getByDingUserId($ding_user_id): array;

		/**
		* 通过部门id获取部门分页用户列表
		* @param string $departmentId 部门id
		* @param int $offset
		* @param int $size
		* @param string\|null $order
		* @param string\|null $lang
		* 获取部门用户列表
		* @return array
		*/
		public function getDepartmentUsers(string $departmentId, int $offset, int $size, string $order = null, string $lang = null): array;
		public function getDingUserLists(): array;

		/**
		* 通过临时授权码获取用户信息

src/Service/Interfaces/MessageServiceInterface.php

+3 −4

Original line number	Diff line number	Diff line
		@@ -52,11 +52,10 @@ interface MessageServiceInterface

		/**
		* 发送短信
		* @param array $phone 电话号码示例['175523181','18621137*']
		* @param array $sign 签名示例['花无缺OA系统',"花无缺OA系统"]
		* @param string $phone 电话号码示例'175523181**'
		* @param string $templateCode 模板code 1.取消订单通知 'SMS_205395200' 2.派单提醒 'SMS_205390191' 3.返工提醒 'SMS_205390196' 4.通知类型 'SMS_205134732'
		* @param array $params 模板中替换的变量示例传入格式：[['product'=>'AE1222'],['product'=>'Ab23232']]
		* @param array $params 模板中替换的变量示例传入格式：['product'=>'AE1222']
		* @return bool
		*/
		public function sendSms(array $phone, array $sign, string $templateCode, array $params): bool;
		public function sendSms(string $phone, string $templateCode, array $params): bool;
		}

src/Service/Interfaces/Store/StoreMaterialServiceInterface.php

+98 −2

Original line number	Diff line number	Diff line
		@@ -36,4 +36,100 @@ interface StoreMaterialServiceInterface
		* Date: 2020/7/6
		*/
		public function createMaterialWarehousing(array $attributes): array;


		/**
		* description:批量创建入库单
		* author: fuyunnan
		* @param
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function createBatchMaterialWarehousing($attributes): array;

		/**
		* description:批量创建出库单
		* author: fuyunnan
		* @param
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function createBatchExMaterialWarehouse($attributes): array;

		/**
		* description:批量修改入库单
		* author: fuyunnan
		* @param
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function updateBatchMaterialWarehousing($attributes): array;

		/**
		* description:批量修改出库单
		* author: fuyunnan
		* @param
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function updateBatchExMaterialWarehouse($attributes): array;

		/**
		* description:通过原料id数组获取库存列表给订单系统查询的接口返回当前原料分组后的库存
		* author: fuyunnan
		* @param array $ids 原料ids 数组
		* @param array $wareIds 仓库数组id
		* @return array
		* @throws
		* Date: 2020/7/27
		*/
		public function getGroupMaterialStock($ids, $wareIds = []): array;

		/**
		* description:批量查看入库单信息
		* author: fuyunnan
		* @param array $ids 入库单ids数组
		* @param array $relations 关联关系 ['material_warehousing_order_materials']
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function showBatchWarehousing($ids, $relations = []): array;

		/**
		* description:批量查看出库单信息
		* author: fuyunnan
		* @param array $ids 出库单ids数组
		* @param array $relations 关联关系 ['material_ex_warehouse_order_materials']
		* @return array
		* @throws
		* Date: 2020/10/31
		*/
		public function showBatchExeWarehouse($ids, $relations = []): array;


		/**
		* description:批量调拨库存方法
		* author: fuyunnan
		* @param array $data 表单
		* @return array
		* @throws
		* Date: 2020/11/3
		*/
		public function transferToStock($data): array;

		/**
		* description:整合先出库然后再入库数量失败回滚
		* author: fuyunnan
		* @param array $outData 出库数组
		* @param array $inData 出库数组
		* @return array
		* @throws
		* Date: 2020/11/5
		*/
		public function transferUpdateOutAfterIn($outData, $inData): array;
		}

src/functions.php

+12 −0

Original line number	Diff line number	Diff line
		@@ -787,3 +787,15 @@ if (!function_exists('str_replace_first')) {
		return $subject;
		}
		}
		if (!function_exists('create_file_dir')) {
		/**
		* 检查当前目录是否存在不存在就创建一个目录
		* @param mixed $dir 文件目录
		* @return bool
		* @author zero
		*/
		function create_file_dir($dir)
		{
		return !is_dir($dir) && mkdir($dir, 0777, true);
		}
		}
		No newline at end of file