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

@@ -54,6 +54,7 @@ class ome_export_whitelist
'finance_mdl_analysis_book_bills' => array('cansplit'=>1, 'splitnums'=>200, 'structure'=>'single'),
'finance_mdl_monthly_report_items'=> array('cansplit'=>1, 'splitnums'=>200, 'primary_key' => 'id', 'structure'=>'single'),
'financebase_mdl_base'=> array('cansplit'=>1, 'splitnums'=>200, 'primary_key' => 'id', 'structure'=>'single'),
'financebase_mdl_expenses_rule'=> array('cansplit'=>1, 'splitnums'=>200, 'primary_key' => 'rule_id', 'structure'=>'single'),
'console_mdl_branch_product' => array('cansplit'=>0, 'splitnums'=>200),
'wms_mdl_branch_product' => array('cansplit'=>0, 'splitnums'=>200),
'drm_mdl_distributor_product_sku' => array('cansplit'=>1, 'splitnums'=>200, 'structure'=>'single'),
@@ -108,7 +109,7 @@ class ome_export_whitelist
'console_mdl_vopbill_amount'=>array('cansplit'=>1, 'splitnums'=>500, 'primary_key' => 'id', 'structure'=>'single'),
'console_mdl_vopbill_discount'=>array('cansplit'=>1, 'splitnums'=>500, 'primary_key' => 'id', 'structure'=>'single'),
'console_mdl_difference_receiving_inventory'=>array('cansplit'=>1, 'splitnums'=>500, 'primary_key' => 'diff_id', 'structure'=>'single'),
'ome_mdl_return_product' => array('cansplit'=>1, 'splitnums'=>200, 'primary_key'=>'return_id', 'structure'=>'multi'),
'ome_mdl_return_product' => array('cansplit'=>1, 'splitnums'=>200, 'primary_key'=>'return_id', 'structure'=>'spec'),
'ome_mdl_order_fail' => array('cansplit'=>1, 'splitnums'=>200, 'primary_key' => 'order_id', 'structure'=>'single'),
'desktop_mdl_users' => array('cansplit'=>0, 'splitnums'=>200),
'invoice_mdl_order_golden3CancelExport' => array('cansplit' => 1, 'splitnums' => 200, 'primary_key' => 'id', 'structure' => 'single'),
@@ -131,8 +132,25 @@ class ome_export_whitelist
'primary_key' => 'id',
'structure' => 'multi'
),
'tongyioil_mdl_bill' => array(
'cansplit' => 1,
'splitnums' => 200,
'primary_key' => 'id',
'structure' => 'multi'
),
);
// 增加service调用允许通过service扩展导出白名单
$service_list = kernel::servicelist('ome.service.export.whitelist.allowed.after');
if ($service_list) {
foreach ($service_list as $service) {
if (method_exists($service, 'extend_whitelist')) {
$extend = $service->extend_whitelist();
if (is_array($extend)) {
$data_source = array_merge($data_source, $extend);
}
}
}
}
if(!empty($source)){
return isset($data_source[$source]) ? $data_source[$source] : '';
}else{