Commit a9634e91 authored by fuyunnan's avatar fuyunnan

Merge branch 'dev'

parents 1a574201 beb1252a
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* Date: 2020/9/1 * Date: 2020/9/1
* Time: 10:09 * Time: 10:09
*/ */
namespace Meibuyu\Micro\Service\Interfaces\Order; namespace Meibuyu\Micro\Service\Interfaces\Order;
interface SubOrderServiceInterface interface SubOrderServiceInterface
...@@ -16,7 +17,7 @@ interface SubOrderServiceInterface ...@@ -16,7 +17,7 @@ interface SubOrderServiceInterface
* @param array $relation 需要的子订单关联关系可传入['order','order_product'] * @param array $relation 需要的子订单关联关系可传入['order','order_product']
* @return array | null * @return array | null
*/ */
public function getById(int $id, array $column=['*'],array $relation = []):array; public function getById(int $id, array $column = ['*'], array $relation = []): array;
/** /**
* *
...@@ -25,20 +26,39 @@ interface SubOrderServiceInterface ...@@ -25,20 +26,39 @@ interface SubOrderServiceInterface
* @param array $relation 需要的关联关系可传入['order','order_product'] * @param array $relation 需要的关联关系可传入['order','order_product']
* @return array | null * @return array | null
*/ */
public function getByIdList(array $idList,array $column=['*'],array $relation = []):array ; public function getByIdList(array $idList, array $column = ['*'], array $relation = []): array;
/** /**
* @param array $idList 需要改变发货状态的子订单ID数组 * @param array $idList 需要改变发货状态的子订单ID数组
* @param int $status 需要改变的发货状态ID 1 待发货 2 已发货 3 已签收 4 已取消 * @param int $status 需要改变的发货状态ID 1 待发货 2 已发货 3 已签收 4 已取消
* @return bool * @return bool
*/ */
public function updateSubOrderShipStatus(array $idList, int $status):bool; public function updateSubOrderShipStatus(array $idList, int $status): bool;
/** /**
* 需要改变的子订单id * 需要改变的子订单id
* @param int $id * @param int $id
* @return bool * @return bool
*/ */
public function StockIntoUpdateSubOrderStatus(int $id):bool; public function StockIntoUpdateSubOrderStatus(int $id): bool;
/**
* description:通过来源单号获取生产工厂
* author: fuyunnan
* @param
* @return array
* @throws
* Date: 2020/10/29
*/
public function getBySourcesFactory($sources): array;
/**
*
* @param array $source 来源单号数组
* @return array
*/
public function getBySourceSite($source): array;
} }
\ No newline at end of file
...@@ -8,10 +8,19 @@ interface ProductionServiceInterface ...@@ -8,10 +8,19 @@ interface ProductionServiceInterface
/** /**
* 结束备货计划 * 结束备货计划
* @param $production_no * @param $production_no
* @return mixed * @return mixed|void
* @deprecated
* @author Zero
*/ */
public function stockUpTask($production_no); public function stockUpTask($production_no);
/**
* 生产单批次发货入库回调
* @param string $production_no 生产单号
* @author Zero
*/
public function warehousingCallback(string $production_no);
/** /**
* 通过入库单id获取相关数据 * 通过入库单id获取相关数据
* @param array $warehousingOrderIds 默认去重 * @param array $warehousingOrderIds 默认去重
...@@ -19,6 +28,14 @@ interface ProductionServiceInterface ...@@ -19,6 +28,14 @@ interface ProductionServiceInterface
*/ */
public function getInfoForWarehousingOrder(array $warehousingOrderIds); public function getInfoForWarehousingOrder(array $warehousingOrderIds);
/**
* 通过生产单号获取生产单工厂信息
* @param array $productionNoList 生产单号数组,默认去重
* @return array 'production_no' => ['factory_id' => 1, 'factory_name' => 'AL']
* @author Zero
*/
public function getFactoryByProductionNoList(array $productionNoList): array;
/** /**
* 查询备货计划中是否用过仓库子产品 * 查询备货计划中是否用过仓库子产品
* @param array $ids 仓库子产品id数组,默认去重 * @param array $ids 仓库子产品id数组,默认去重
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment