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

@@ -79,7 +79,13 @@ class ome_event_trigger_shop_delivery
$deliveryModel = app::get('ome')->model('delivery');
$delivery = $this->_getDelivery($delivery_id);
if (empty($delivery['logi_no'])) return ['rsp'=>'fail', 'msg'=>'运单号为空'];
if (empty($delivery['logi_no'])) {
// 提货物流允许 logi_no 为空,运单号由平台接口返回
$corpInfo = app::get('ome')->model('dly_corp')->dump($delivery['logi_id'], 'corp_model');
if ($corpInfo['corp_model'] != 'pickup') {
return ['rsp'=>'fail', 'msg'=>'运单号为空'];
}
}
if ($delivery['is_bind'] == 'true') { // 合单
$children_delivery_id = array();