ecshop/OMS
1
0
Fork 0
mirror of https://gitee.com/ShopeX/OMS synced 2026-04-20 12:05:43 +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

8
app/finance/model/ar.php
View File

@@ -633,8 +633,8 @@ class finance_mdl_ar extends dbeav_model{
);
$new_titles['items'] = array(
'serial_number' => '*:业务流水号',
'bn' => '*:商品货号',
'name' => '*:商品名称',
'bn' => '*:销售物料编码',
'name' => '*:销售物料名称',
'nums' => '*:数量',
'money' => '*:金额'
);
@@ -706,8 +706,8 @@ class finance_mdl_ar extends dbeav_model{
foreach($_items as $_k=>$_v){
$items = array();
$items['*:业务流水号'] = "\t".$data_ar['serial_number'];
$items['*:商品货号'] = "\t".$_v['bn'];
$items['*:商品名称'] = $_v['name'];
$items['*:销售物料编码'] = "\t".$_v['bn'];
$items['*:销售物料名称'] = $_v['name'];
$items['*:数量'] = $_v['num'];
$items['*:金额'] = $_v['money'];
$data['content']['items'][] = $this->charset->utf2local('"'.implode( '","', $items ).'"');

8
app/finance/model/gaptype.php Normal file
View File

@@ -0,0 +1,8 @@
<?php
/**
* 财务差异类型模型
*/
class finance_mdl_gaptype extends dbeav_model
{
}

19
app/finance/model/monthly/report/items.php
View File

@@ -27,10 +27,17 @@ class finance_mdl_monthly_report_items extends dbeav_model {
* @return mixed 返回值
*/
public function modifier_gap($col,$list,$row){
if($this->is_export_data) {
return $col;
}
return sprintf('<a href="index.php?app=finance&ctl=monthend_verification&act=base_list&p[0]=%s" target="_blank">%s</a>',$row['id'], $col);
// 构建title内容
$title = sprintf('sales:%s refund:%s',
isset($row['_0_sales_gap']) ? $row['_0_sales_gap'] : '0',
isset($row['_0_refund_gap']) ? $row['_0_refund_gap'] : '0'
);
return sprintf('<a href="index.php?app=finance&ctl=monthend_verification&act=base_list&p[0]=%s&finder_id=%s" target="_blank" title="%s">%s</a>',
$row['id'], $_GET['_finder']['finder_id'],
htmlspecialchars($title),
$col
);
}
/**
@@ -44,6 +51,6 @@ class finance_mdl_monthly_report_items extends dbeav_model {
if($this->is_export_data) {
return $col;
}
return sprintf('<a href="index.php?app=finance&ctl=monthend_verification&act=sale_list&p[0]=%s" target="_blank">%s</a>',$row['id'], $col);
return sprintf('<a href="index.php?app=finance&ctl=monthend_verification&act=sale_list&p[0]=%s&finder_id=%s" target="_blank">%s</a>',$row['id'],$_GET['_finder']['finder_id'], $col);
}
}
}