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

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

View File

@@ -53,7 +53,7 @@ class erpapi_shop_matrix_jd_response_order extends erpapi_shop_response_order
{
parent::_analysis();
//买家实付字段名
$this->_ordersdf['coupon_actuallypay_field'] = 'extend_item_list/cost';
$this->_ordersdf['coupon_actuallypay_field'] = $field = 'extend_item_list/cost';
// 预约发货 hold 时间
if ($this->_ordersdf['cn_info']['appointment_ship_time']) {
$opPickDate = kernel::single('ome_func')->date2time($this->_ordersdf['cn_info']['appointment_ship_time']);
@@ -69,7 +69,8 @@ class erpapi_shop_matrix_jd_response_order extends erpapi_shop_response_order
if ($this->_ordersdf['timing_confirm']) {
$object['estimate_con_time'] = (int)$this->_ordersdf['timing_confirm'];
}
$arrField = explode('/', $field);
$object['actually_amount'] = current($object['order_items'])[$arrField[0]][$arrField[1]];
foreach ($object['order_items'] as &$item) {
if ($this->_ordersdf['timing_confirm']) {
$item['estimate_con_time'] = (int)$this->_ordersdf['timing_confirm'];