ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-29 20:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
app/ome/lib/reship/const.php
View File

@@ -52,6 +52,10 @@ class ome_reship_const
const __EDIT_RETURN_CODE = 0x00000200;
const __EDIT_CHANGE_CODE = 0x00000400;
const __YUANDANTUI = 0x00000800;
const __QZ_REFUND_CODE = 0x80000;
// 退回物流单号重复
const __RETURN_LOGI_DUP = 0x00001000;
//是否是新退换货单
/**
@@ -101,6 +105,10 @@ class ome_reship_const
$style = array('color'=>'red', 'msg'=>'拦截入库', 'flag'=>'拦截入库');
$ret .= $this->getViewPanel($style['color'], $style['msg'], $style['flag']);
}
if($flag_type & ome_reship_const::__QZ_REFUND_CODE){
$style = array('color'=>'#3E3E3E', 'msg'=>'强制退款', 'flag'=>'强制退款');
$ret .= $this->getViewPanel($style['color'], $style['msg'], $style['flag']);
}
if($flag_type & ome_reship_const::__RESHIP_DIFF){
$style = array('color'=>'#BDB76B', 'msg'=>'退货差异入库', 'flag'=>'差异入库');
$ret .= $this->getViewPanel($style['color'], $style['msg'], $style['flag']);
@@ -118,6 +126,10 @@ class ome_reship_const
$style = array('color'=>'#D2B48C', 'msg'=>'原单退', 'flag'=>'原单退');
$ret .= $this->getViewPanel($style['color'], $style['msg'], $style['flag']);
}
if($flag_type & ome_reship_const::__RETURN_LOGI_DUP){
$style = array('color'=>'#9370DB', 'msg'=>'退回物流单号重复', 'flag'=>'物流重复');
$ret .= $this->getViewPanel($style['color'], $style['msg'], $style['flag']);
}
$ret = '<div style="overflow: auto;word-break: break-word;white-space: normal;width: 100%;flex-wrap: wrap;display: flex;">'.$ret.'</div>';
}
return $ret;

7
app/ome/lib/reship/kepler.php
View File

@@ -436,7 +436,12 @@ class ome_reship_kepler
$this->__reshipObj->update($updateSdf, array('reship_id'=>$this->_reship_id));
kernel::single('console_reship')->releaseChangeFreeze($this->_reship_id);
// 退货单取消后的service扩展点
foreach(kernel::servicelist('console.service.reship.cancel.after') as $object) {
if(method_exists($object, 'cancel_reship_after')) {
$object->cancel_reship_after($this->_reship_id);
}
}
//logs
$memo = '自动拒绝退货单('. $this->__inputParams['afsResultType'] .')';
$this->__operLogObj->write_log('reship@ome', $this->_reship_id, $memo);

7
app/ome/lib/reship/luban.php
View File

@@ -112,7 +112,12 @@ class ome_reship_luban
//释放冻结库存
kernel::single('console_reship')->releaseChangeFreeze($reshipInfo['reship_id']);
}
// 退货单取消后的service扩展点
foreach(kernel::servicelist('console.service.reship.cancel.after') as $object) {
if(method_exists($object, 'cancel_reship_after')) {
$object->cancel_reship_after($reshipInfo['reship_id']);
}
}
//log
$operateLog->write_log('reship@ome', $reshipInfo['reship_id'], '[平台更换售后类型]并再次申请,自动拒绝退换货单：'.$reshipInfo['reship_bn']);