ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-17 11:05:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

1. 【新增】售后单售后原因类型支持搜索

Browse Source 
2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题
This commit is contained in:
chenping
2026-04-01 11:59:17 +08:00
parent 9341122827
commit 61783b7d01
754 changed files with 46179 additions and 5700 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/erpapi/lib/logistics/matrix/pdd/request/template.php
View File

@@ -111,7 +111,7 @@ class erpapi_logistics_matrix_pdd_request_template extends erpapi_logistics_requ
if($val['keys']) {
foreach ($val['keys'] as $kVal) {
if($kVal['key_name']) {
$tplSelect[] = str_replace(array('data.'), '', $kVal['key_name']);
$tplSelect[] = str_replace(array('data.'), '', trim($kVal['key_name']));
}
}
$rs['data'] = array(

1
app/erpapi/lib/logistics/matrix/wxshipin/request/electron.php
View File

@@ -238,6 +238,7 @@ class erpapi_logistics_matrix_wxshipin_request_electron extends erpapi_logistics
$deliveryInfo = app::get('wms')->model('delivery')->db_dump(['delivery_bn' => $sdf['delivery_bn']]);
$dlyCorpInfo = app::get('ome')->model('dly_corp')->db_dump(['corp_id' => $deliveryInfo['logi_id']]);
app::get('ome')->model('dly_corp_channel')->getChannel($dlyCorpInfo, array($deliveryInfo));
$prt_tmpl_id = $dlyCorpInfo['prt_tmpl_id'];
$templateMdl = app::get('logisticsmanager')->model('express_template');
$templateInfo = $templateMdl->db_dump(['template_id' => $prt_tmpl_id]);

2
app/erpapi/lib/logistics/matrix/xhs/request/electron.php
View File

@@ -405,6 +405,8 @@ class erpapi_logistics_matrix_xhs_request_electron extends erpapi_logistics_requ
'district_name' => $v['senderAddressList'][0]['address']['district'],
'street_name' => $v['senderAddressList'][0]['address']['town'],
'detail_address' => $v['senderAddressList'][0]['address']['detail'],
// 一个物流品牌多个签约地的时候，只有一个accountId，控制层拿到数据是以acct_id为key组数据，需要加一个唯一key
'_unique_acct_id'=> $result['data']['data']['accountId'].'-'.$v['branchCode'],
];
}
$result['data']['account_list'] = $_tmp;