Merge branch 'feature/new_wms' into 'master'
2b发货使用ptck的orderType See merge request composer/php-wms-client!5
This commit is contained in:
commit
d065739775
|
@ -6,8 +6,8 @@ return [
|
||||||
'other_express_weight' => 50,
|
'other_express_weight' => 50,
|
||||||
'logistics' => [
|
'logistics' => [
|
||||||
'toB' => [
|
'toB' => [
|
||||||
'code' => 'YTO',
|
'code' => 'KYE',
|
||||||
'name' => '圆通',
|
'name' => '跨越',
|
||||||
],
|
],
|
||||||
'toC' => [
|
'toC' => [
|
||||||
'code' => 'STO',
|
'code' => 'STO',
|
||||||
|
|
|
@ -15,7 +15,6 @@ return [
|
||||||
],
|
],
|
||||||
'fineex' => [
|
'fineex' => [
|
||||||
'base_uri' => env('FINEEX_HOST', 'http://qimen.api.taobao.com/router/qmtest?'),
|
'base_uri' => env('FINEEX_HOST', 'http://qimen.api.taobao.com/router/qmtest?'),
|
||||||
// 'base_uri' => env('FINEEX_HOST', 'http://qimenapi.tbsandbox.com/router/qimen/service?'),
|
|
||||||
'app_key' => env('FINEEX_APP_KEY', '30469069'),
|
'app_key' => env('FINEEX_APP_KEY', '30469069'),
|
||||||
'app_secret' => env('FINEEX_APP_SECRET', 'fe74d42121d20db341d29229c1179fe3'),
|
'app_secret' => env('FINEEX_APP_SECRET', 'fe74d42121d20db341d29229c1179fe3'),
|
||||||
'customerId' => env('FINEEX_CUSTOMERID','mockCustomerId'),
|
'customerId' => env('FINEEX_CUSTOMERID','mockCustomerId'),
|
||||||
|
|
|
@ -317,7 +317,7 @@ class QimenWms extends BaseWms implements WmsInterface
|
||||||
$postData = [
|
$postData = [
|
||||||
'deliveryOrder' => [
|
'deliveryOrder' => [
|
||||||
'deliveryOrderCode' => $params['out_warehouse_number'], //出库单号
|
'deliveryOrderCode' => $params['out_warehouse_number'], //出库单号
|
||||||
'orderType' => 'DBCK', //出库单类型
|
'orderType' => $params['order_type'] ?? 'DBCK', //出库单类型
|
||||||
'warehouseCode' => $this->config['warehouse_code'], //仓库编码
|
'warehouseCode' => $this->config['warehouse_code'], //仓库编码
|
||||||
'logisticsCode' => $params['order_sender_info']['logistics_code'] ?? 'SF',
|
'logisticsCode' => $params['order_sender_info']['logistics_code'] ?? 'SF',
|
||||||
'logisticsName' => $params['order_sender_info']['logistics_name'] ?? '顺丰',
|
'logisticsName' => $params['order_sender_info']['logistics_name'] ?? '顺丰',
|
||||||
|
|
|
@ -39,6 +39,7 @@ class WmsStrategy
|
||||||
$params['address_city'] = $params['order_address']['receive_city'];
|
$params['address_city'] = $params['order_address']['receive_city'];
|
||||||
$params['address_area'] = $params['order_address']['receive_district'];
|
$params['address_area'] = $params['order_address']['receive_district'];
|
||||||
$params['address_detail'] = $params['order_address']['receive_address'];
|
$params['address_detail'] = $params['order_address']['receive_address'];
|
||||||
|
$params['order_type'] = 'PTCK';
|
||||||
foreach ($params['order_goods'] as &$item) {
|
foreach ($params['order_goods'] as &$item) {
|
||||||
$item['product_name'] = $item['goods_name'];
|
$item['product_name'] = $item['goods_name'];
|
||||||
$item['number'] = $item['sku_quantity'];
|
$item['number'] = $item['sku_quantity'];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user