ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-04 06:26:52 +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

20
app/console/controller/admin/delivery/back.php
View File

@@ -33,11 +33,12 @@ class console_ctl_admin_delivery_back extends desktop_controller {
'target' => 'dialog::{width:600,height:300,title:\'导出\'}'
);
$base_filter = array(
'type' => 'normal',
'pause' => 'false',
'parent_id' => 0,
'disabled' => 'false',
'status' => array('return_back'),
'parent_id' => 0,
'status' => array('return_back'),
'type' => 'normal',
'disabled' => 'false',
'pause' => 'false',
'sync|bthan' => 0,
);
$base_filter = array_merge($base_filter,$_GET);
@@ -65,16 +66,15 @@ class console_ctl_admin_delivery_back extends desktop_controller {
function cancel_list()
{
$user = kernel::single('desktop_user');
$actions = array();
$base_filter = array(
'type' => 'normal',
'pause' => 'false',
'parent_id' => 0,
'disabled' => 'false',
'status' => array('cancel','back'),
'type' => 'normal',
'disabled' => 'false',
'pause' => 'false',
'sync|bthan' => 0,
);
$base_filter = array_merge($base_filter,$_GET);