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

@@ -166,7 +166,8 @@ class ome_ctl_admin_reship extends desktop_controller{
$data = array(
'reship_bn' => $reship_detail['reship_bn'],
'branch_bn' => $branch['branch_bn'],
'reship_id' => $reship_detail['reship_id'],
'owner_code' => $branch['owner_code'],
'reship_id' => $reship_detail['reship_id'],
);
$result = kernel::single('console_event_trigger_reship')->cancel($wms_id, $data, true);
@@ -182,7 +183,12 @@ class ome_ctl_admin_reship extends desktop_controller{
//判断是否是已确认拒绝如果是需要释放冻结库存
kernel::single('console_reship')->releaseChangeFreeze($reship_id);
// 退货单取消后的service扩展点
foreach(kernel::servicelist('console.service.reship.cancel.after') as $object) {
if(method_exists($object, 'cancel_reship_after')) {
$object->cancel_reship_after($reship_id);
}
}
$memo = '拒绝确认收货';
if($return_id){
$oOperation_log->write_log('return@ome',$return_id,$memo);