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

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

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

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

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

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

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

8. 【修复】基础物料分类管理问题

app/erpapi/lib/dealer/response/process/aftersale.php

@@ -1257,6 +1257,14 @@ class erpapi_dealer_response_process_aftersale
         $reship_id = (int) $reship['reship_id'];
         $oReship = app::get('ome')->model('reship');
         $oOperation_log = app::get('ome')->model('operation_log');//写日志
+        
+        // 在删除 reship 数据之前，先释放库存冻结
+        list($rs, $rsData) = kernel::single('console_reship')->releaseChangeFreeze($reship_id);
+        if($rs == false){
+            // 释放失败记录日志，但不影响删除操作
+            $oOperation_log->write_log('reship@ome', $reship_id, '释放库存冻结失败:'.($rsData['msg'] ? $rsData['msg'] : ''));
+        }
+        
         $oReship->db->exec('DELETE FROM sdb_ome_reship WHERE reship_id='.$reship_id);
         $oReship->db->exec('DELETE FROM sdb_ome_reship_items WHERE reship_id='.$reship_id);
         $oReship->db->exec('DELETE FROM sdb_ome_return_process WHERE reship_id='.$reship_id);