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

@@ -0,0 +1,50 @@
<?php
class erpapi_shop_matrix_alibaba_request_logistics extends erpapi_shop_request_logistics
{
/**
* 官方提货(提货物流)- 阿里巴巴/菜鸟 sendGoods 结构
* @param array $sdf 由 ome_event_trigger_shop_data_delivery_alibaba->get_sdf 得到
* @return mixed
*/
public function officialPickup($sdf = [])
{
if (empty($sdf['orderinfo']['order_bn']) || empty($sdf['delivery_items'])) {
return $this->succ('', '', []);
}
$sendGoodEntries = [];
foreach ($sdf['delivery_items'] as $item) {
if (empty($item['oid'])) {
continue;
}
$amount = !empty($item['nums']) ? (int)$item['nums'] : (isset($item['number']) ? (int)$item['number'] : 0);
$sendGoodEntries[] = [
'sourceEntryId' => $item['oid'],
'amount' => $amount,
'weight' => isset($item['weight']) ? (float)$item['weight'] : 0,
];
}
if (empty($sendGoodEntries)) {
return $this->succ('', '', []);
}
$sendGoods = [
[
'sourceId' => $sdf['orderinfo']['order_bn'],
'sendGoodEntries' => $sendGoodEntries,
],
];
$params = [
'sendGoods' => is_string($sendGoods) ? $sendGoods : json_encode($sendGoods),
'remarks' => isset($sdf['memo']) ? $sdf['memo'] : '',
'gmtSend' => !empty($sdf['delivery_time']) ? date('Y-m-d H:i:s', $sdf['delivery_time']) : date('Y-m-d H:i:s', time()),
];
// 运单号回写已迁至 wms_lib_logistics在 officialPickup 返回 succ 后统一处理
$title = '官方物流提货';
$result = $this->__caller->call(SHOP_LOGISTICS_OFFICIAL_PICKUP, $params, [], $title, 10, $sdf['delivery_bn']);
return $result;
}
}