mirror of
https://gitee.com/ShopeX/OMS
synced 2026-04-27 03:05:45 +08:00
1. 【新增】售后单售后原因类型支持搜索
2. 【新增】手工创建订单折扣可输入正数 3. 【优化】盘点申请单确认 4. 【修复】采购退货单模拟出库失败问题 5. 【新增】订单金额客户实付与结算金额 6. 【优化】仓库发货统计报表物料名称显示 7. 【优化】自有仓储虚拟发货逻辑 8. 【修复】基础物料分类管理问题
This commit is contained in:
@@ -29,7 +29,7 @@ class logisticsmanager_waybill_douyin
|
||||
'template_name' => '抖音',
|
||||
'shop_name' => '抖音',
|
||||
'print_url' => 'https://logistics.douyinec.com/davinci/CloudPrintClient',
|
||||
'template_url' => '',
|
||||
'template_url' => 'https://cloudprint.douyinec.com/login',
|
||||
'shop_type' => 'luban',
|
||||
'control_type' => 'douyin',
|
||||
'request_again' => true
|
||||
|
||||
@@ -21,7 +21,7 @@ class logisticsmanager_waybill_jdalpha {
|
||||
'template_name' => '京东',
|
||||
'shop_name' => '京东',
|
||||
'print_url' => 'http://prod-oms-app-cprt.jdwl.com/OpenCloudPrint/setup.exe',
|
||||
'template_url' => 'https://open.jd.com/home/home#/index',
|
||||
'template_url' => 'https://template-design.jd.com/?o=1#/home/templates',
|
||||
'shop_type' => ['360buy','jd'],
|
||||
'control_type' => 'jd',
|
||||
'request_again' => true
|
||||
|
||||
@@ -119,7 +119,7 @@ class logisticsmanager_waybill_taobao {
|
||||
'SF' => array('code' => 'SF', 'name' => '顺丰'),
|
||||
'ZJS' => array('code' => 'ZJS', 'name' => '宅急送'),
|
||||
'ZTO' => array('code' => 'ZTO', 'name' => '中通'),
|
||||
'HTKY' => array('code' => 'HTKY', 'name' => '百世快递'),
|
||||
'HTKY' => array('code' => 'HTKY', 'name' => '极兔速递'),
|
||||
'UC' => array('code' => 'UC', 'name' => '优速'),
|
||||
'YTO' => array('code' => 'YTO', 'name' => '圆通'),
|
||||
'STO' => array('code' => 'STO', 'name' => '申通'),
|
||||
@@ -198,11 +198,6 @@ class logisticsmanager_waybill_taobao {
|
||||
return self::$businessType[$type];
|
||||
}
|
||||
|
||||
/**
|
||||
* service_code
|
||||
* @param mixed $param param
|
||||
* @return mixed 返回值
|
||||
*/
|
||||
public function service_code($param) {
|
||||
$sdf = array('cp_code'=>$param['logistics']);
|
||||
$rs = kernel::single('erpapi_router_request')->set('shop', $param['shop_id'])->logistics_getCorpServiceCode($sdf);
|
||||
@@ -228,12 +223,6 @@ class logisticsmanager_waybill_taobao {
|
||||
return $service;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取ServiceCodeValue
|
||||
* @param mixed $cpCode cpCode
|
||||
* @param mixed $serviceCode serviceCode
|
||||
* @return mixed 返回结果
|
||||
*/
|
||||
public function getServiceCodeValue($cpCode, $serviceCode) {
|
||||
if(empty($serviceCode)) {
|
||||
return array();
|
||||
@@ -256,10 +245,6 @@ class logisticsmanager_waybill_taobao {
|
||||
// return $obj;
|
||||
// }
|
||||
//
|
||||
/**
|
||||
* template_cfg
|
||||
* @return mixed 返回值
|
||||
*/
|
||||
public function template_cfg() {
|
||||
$arr = array(
|
||||
'template_name' => '菜鸟',
|
||||
@@ -457,4 +442,4 @@ class logisticsmanager_waybill_taobao {
|
||||
return '';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -175,6 +175,17 @@ class logisticsmanager_waybill_wxshipin
|
||||
'EMS' => ['code' => 'EMS', 'name' => '中国邮政'],
|
||||
'CNSD' => ['code' => 'CNSD', 'name' => '菜鸟速递(丹鸟)'],
|
||||
'DBKD' => ['code' => 'DBKD', 'name' => '德邦快递'],
|
||||
'SXJD' => ['code' => 'SXJD', 'name' => '顺心捷达'],
|
||||
'ZTOKY' => ['code' => 'ZTOKY', 'name' => '中通快运'],
|
||||
'YDKY' => ['code' => 'YDKY', 'name' => '韵达快运'],
|
||||
'ANEKY' => ['code' => 'ANEKY', 'name' => '安能物流'],
|
||||
'BTWYL' => ['code' => 'BTWYL', 'name' => '百世快运'],
|
||||
'KYSY' => ['code' => 'KYSY', 'name' => '跨越速运'],
|
||||
'YMDD' => ['code' => 'YMDD', 'name' => '壹米滴答'],
|
||||
'RJTCSD' => ['code' => 'RJTCSD', 'name' => '锐界同城速递'],
|
||||
'ZJS' => ['code' => 'ZJS', 'name' => '宅急送'],
|
||||
'XFEX' => ['code' => 'XFEX', 'name' => '信丰物流'],
|
||||
'JGSD' => ['code' => 'JGSD', 'name' => '京广速递'],
|
||||
];
|
||||
|
||||
if (!empty($logistics_code)) {
|
||||
|
||||
Reference in New Issue
Block a user