ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-18 11:25:31 +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

19
app/erpapi/lib/shop/response/process/exchange.php
View File

@@ -563,11 +563,6 @@ class erpapi_shop_response_process_exchange {
'return_logi_no'=>$logisticsNo,
'outer_lastmodify'=>$sdf['modified'],
);
//退换货自动审批(系统-->退换货自动审核设置-->是否启用退换货自动审批)
$is_auto_approve = app::get('ome')->getConf('return.auto_approve');
if($is_auto_approve == 'on'){
kernel::single('ome_reship')->batch_reship_queue($sdf['reship']['reship_id']);
}
//flag
$is_update_logi = true;
@@ -587,6 +582,10 @@ class erpapi_shop_response_process_exchange {
$rs = app::get('ome')->model('reship')->update($upData,array('reship_id'=>$reship['reship_id']));
$operateLog = app::get('ome')->model('operation_log');
$operateLog->write_log('reship@ome',$reship['reship_id'],$memo);
// 物流单号重复检测打标（flag_type 位）
if ($reship['reship_id']) {
kernel::single('ome_reship')->markDuplicateReturnLogiNo($reship['reship_id'], $logisticsNo);
}
if ($returnData){
app::get('ome')->model('return_product')->update($returnData,array('return_id'=>$sdf['return_product']['return_id']));
$operateLog->write_log('return@ome', $sdf['return_product']['return_id'],'版本变化更新成接受申请状态');
@@ -594,6 +593,16 @@ class erpapi_shop_response_process_exchange {
//请求WMS更新最新物流单号
if($is_update_logi){
//退换货自动审批(系统-->退换货自动审核设置-->是否启用退换货自动审批)
$is_auto_approve = app::get('ome')->getConf('return.auto_approve');
if($is_auto_approve == 'on'){
kernel::single('ome_reship')->batch_reship_queue($sdf['reship']['reship_id']);
}
foreach(kernel::servicelist('erpapi.service.aftersale.update.reship.logistics.after') as $object) {
if(method_exists($object, 'after_update_logistics')){
$object->after_update_logistics($reship['reship_id']);
}
}
$error_msg = '';
kernel::single('ome_reship')->request_wms_returnorder($reship['reship_id'], $error_msg);
}