Commit 056e344f authored by  林继鑫's avatar 林继鑫

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

parents bf437c00 d55adb5b
...@@ -45,13 +45,6 @@ interface FactoryNoticeServiceInterface ...@@ -45,13 +45,6 @@ interface FactoryNoticeServiceInterface
*/ */
public function markRead($userInfo,$params); public function markRead($userInfo,$params);
/**
* 获取用户已读工厂公告
* @param $userInfo
* @author chentianyu
*/
public static function getReadNotices($userInfo);
/** /**
* 打包下载 * 打包下载
* @param $noticeId * @param $noticeId
......
...@@ -78,9 +78,10 @@ interface FactoryServiceInterface ...@@ -78,9 +78,10 @@ interface FactoryServiceInterface
/** /**
* Notes: 分派订单取消 * Notes: 分派订单取消
* User: carlos * User: carlos
* @param string $type cancel|delete
* DateTime: 2022/9/21 14:24 * DateTime: 2022/9/21 14:24
*/ */
public function cancelOrder($orderNo); public function cancelOrder($orderNo, $type = 'cancel');
/** /**
* Notes: 获取订单信息 * Notes: 获取订单信息
...@@ -88,7 +89,7 @@ interface FactoryServiceInterface ...@@ -88,7 +89,7 @@ interface FactoryServiceInterface
* DateTime: 2022/9/22 16:21 * DateTime: 2022/9/22 16:21
* @param $orderNo * @param $orderNo
*/ */
public function getProductionOrder($orderNo, $columns =['*']); public function getProductionOrder($orderNo, $columns =['*'],$with=[]);
...@@ -101,4 +102,12 @@ interface FactoryServiceInterface ...@@ -101,4 +102,12 @@ interface FactoryServiceInterface
* date 2022-09-27 * date 2022-09-27
*/ */
public function getProductionAccountStatement($searchConditions,$isExport=false); public function getProductionAccountStatement($searchConditions,$isExport=false);
/**
* Notes: 生产订单完结
* User: carlos
* DateTime: 2022/9/29 9:52
*/
public function finishProductionOrder($orderSn);
} }
\ No newline at end of file
<?php
/**
* Created by PhpStorm.
* User: Zero
* Date: 2020/10/12
* Time: 9:39
*/
namespace Meibuyu\Rpc\Service\Interfaces\Product;
interface ApproveProductChildServiceInterface
{
/**
* 根据子产品获取对应的主产品的创建人 id 信息
* @param $childProductIds
* @return array
*/
public function getProductCreatorsByChildProductIds($childProductIds): array;
}
...@@ -109,4 +109,10 @@ interface ProductChildServiceInterface ...@@ -109,4 +109,10 @@ interface ProductChildServiceInterface
*/ */
public function getIdsByCategoryId(int $categoryId, int $limit = null); public function getIdsByCategoryId(int $categoryId, int $limit = null);
/**
* 创建对应的子产品
* @param array $childDetails
* @return array
*/
public function createChildrenProducts(array $childDetails): array;
} }
...@@ -206,6 +206,51 @@ interface ProductServiceInterface ...@@ -206,6 +206,51 @@ interface ProductServiceInterface
*/ */
public function specimenTransformToProduct(array $params); public function specimenTransformToProduct(array $params);
/**
* 更新样品转换的产品
* @param string $sku_id 主键
* @param array $status_id 允许转换的状态
* @param array $params 传入的参数
* $params = [
* 'product' => [ // 产品信息
* 'sku' => 'ABC123', // SKU,必填
* 'name' => '裙子', // 产品中文名,选填
* 'en_name' => 'dress', // 产品英文名,选填
* 'brand_id' => 123, // 品牌id,选填
* 'team_ids' => [1,2,3], // 团队id数组,选填
* 'hs_code' => '6109909060', // 海关编号,选填
* 'origin_country_id' => 123, // 原产国,选填
* 'production_address' => '苏州', // 境内货源地,选填
* 'unit' => '件', // 单位,必填
* 'category_id' => 123, // 品类id,必填
* 'ingredient_id' => 123, // 成分id,选填
* 'product_name_id' => 123, // 品名id,必填
* 'style' => '复古', // 风格/款式,选填
* 'creator_id' => 123, // 创建人id,必填
* 'images' => [], // 图片地址数组
* 'cost' => 12,5, // 生产成本
* 'package_cost' => 12,5, // 包装成本
* 'customs_unit_price' => 12,5, // 报关单价
* 'customs_cost' => 12,5, // 报关成本
* 'product_weight' => 15.2, // 产品重量(g)
* 'product_length' => 15.2, // 产品长度(cm)
* 'product_width' => 15.2, // 产品宽度(cm)
* 'product_height' => 15.2, // 产品高度(cm)
* 'product_volume' => 15.2, // 产品体积(cm3)
* 'package_weight' => 15.2, // 包装重量(g)
* 'package_length' => 15.2, // 包装长度(cm)
* 'package_width' => 15.2, // 包装宽度(cm)
* 'package_height' => 15.2, // 包装高度(cm)
* 'package_volume' => 15.2, // 包装体积(cm3)
* ],
* 'material' => [] // 原料信息,暂无
* ];
* @return array
* @throws \Meibuyu\Rpc\Exceptions\RpcException
* @author Zero
*/
public function updateSpecimenTransformToProduct(array $params,$sku_id,$status_id);
/** /**
* 检查产品是否上架 * 检查产品是否上架
* @param array $params * @param array $params
...@@ -278,4 +323,20 @@ interface ProductServiceInterface ...@@ -278,4 +323,20 @@ interface ProductServiceInterface
*/ */
public function getProductChildByWhere(array $where, array $whereIn = [], array $columns = ['*'], array $relations = []): array; public function getProductChildByWhere(array $where, array $whereIn = [], array $columns = ['*'], array $relations = []): array;
/**
* 根据主 SKU 获取子 SKU 相关信息
* @param $filters
* @param string[] $childProductFields
* @return array
*/
public function getChildProductsByProductFilter($filters, $childProductFields = ['*']): array;
/**
* 创建属于草稿状态(不展示出来)的主 SKU
* @return array
* @throws \Meibuyu\Rpc\Exceptions\RpcException
* @author QJK
*/
public function createDraftProduct(array $params);
} }
<?php
namespace Meibuyu\Rpc\Service\Interfaces\ProductDevelop;
/**
* @author chentianyu
*/
interface SpecimenServiceInterface
{
/**
* 创建物流信息
* @param $data
* @return int|string
* @author chentianyu
*/
public function creatLogistics($data);
}
\ No newline at end of file
<?php
namespace Meibuyu\Rpc\Service\Interfaces\PurchaseNew;
interface PurchaseDemandServiceInterface
{
/**
* 同步请款状态
* 审核通过
* {
"purchase_id":"采购单id",
* "reject_reason":"驳回缘由", 审核驳回需要填充
* "flag":true|false //true审核通过 false审核驳回
* }
* @return mixed
*/
public function createPurchaseDemand(array $data);
/**
* 扫描物流号或批次号查询
* @param array $demandIds
* @return bool
*/
public function deleteDemandByIds(array $demandIds): bool;
}
\ No newline at end of file
...@@ -48,22 +48,6 @@ interface PurchaseStockServiceInterface ...@@ -48,22 +48,6 @@ interface PurchaseStockServiceInterface
public function warehousingOperation($post):array; public function warehousingOperation($post):array;
/**
* 已完成记录rpc 已弃用
*
{
"batch_no": "batch_no",
"purchase_no": "1634197133",
"product": [{
"id": 24,
"completed_num":22 //已完成数量
}]
}
* @param $post
* @return array
*/
public function completeOperation($post):array;
/** /**
* 退款记录rpc * 退款记录rpc
...@@ -88,4 +72,25 @@ interface PurchaseStockServiceInterface ...@@ -88,4 +72,25 @@ interface PurchaseStockServiceInterface
*/ */
public function getShippingCount(); public function getShippingCount();
/**
* 发货产品处理
* @param $post
{
"logistics_no": "物流单号",
"source_type":"product-dev",
"operate_user":"操作人名",
"type": "Return(退货)| Exchange (换货) | Receipt(签收)",
"detail": [{
"source_no": "来源单号",
"child_sku": "仓库子产品sku",
"num": "退换货数量"
}]
}
* @return true | string (error_msg)
*/
public function deliveryProductsDeal($post);
} }
\ No newline at end of file
...@@ -71,4 +71,20 @@ interface AuthenticationInterface ...@@ -71,4 +71,20 @@ interface AuthenticationInterface
* @return array * @return array
*/ */
public function leadTeamIdsByUsers($userIds); public function leadTeamIdsByUsers($userIds);
/**
* 判断是否是管理员
* @param $userId
* @return bool
*/
public function isAdmin($userId): bool;
/**
* 获取用户对应权限角色名称列表
* @param $userId
* @return array
*/
public function getUserRoleNames($userId): array;
} }
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