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

36
app/financebase/model/expenses/rule.php
View File

@@ -17,7 +17,7 @@
/**
* ============================
* @Author: yaokangming
* @Version: 1.0
* @Version: 1.0
* @DateTime: 2020/11/23 17:21:05
* @describe: model层
* ============================
@@ -27,13 +27,9 @@ class financebase_mdl_expenses_rule extends dbeav_model {
private $cainiaoBillCategory;
private $splitType = array("sku"=>"sku");
private $splitRule = array(""=>"","unsplit"=>"不拆仅呈现","price"=>"按价值权重","weight"=>"按重量权重","num"=>"按件数权重","volume"=>"按体积权重");
/**
* table_name
* @param mixed $real real
* @return mixed 返回值
*/
// 导出配置
var $has_export_cnf = true;
var $export_name = '费用拆分规则';
public function table_name($real=false)
{
$table_name = 'bill_category_rules';
@@ -44,10 +40,6 @@ class financebase_mdl_expenses_rule extends dbeav_model {
}
}
/**
* 获取BillCategory
* @return mixed 返回结果
*/
public function getBillCategory() {
if(!$this->billCategory) {
$rows = $this->getList('bill_category,split_type,split_rule');
@@ -58,10 +50,6 @@ class financebase_mdl_expenses_rule extends dbeav_model {
return $this->billCategory;
}
/**
* 获取CainiaoBillCategory
* @return mixed 返回结果
*/
public function getCainiaoBillCategory() {
if(!$this->cainiaoBillCategory) {
$this->cainiaoBillCategory = $this->getList('bill_category,split_type,split_rule', array('business_type'=>'cainiao'));
@@ -69,10 +57,6 @@ class financebase_mdl_expenses_rule extends dbeav_model {
return $this->cainiaoBillCategory;
}
/**
* 获取SplitInfo
* @return mixed 返回结果
*/
public function getSplitInfo() {
return array(
'split_type' => $this->splitType,
@@ -97,21 +81,11 @@ class financebase_mdl_expenses_rule extends dbeav_model {
return $rows;
}
/**
* modifier_split_type
* @param mixed $col col
* @return mixed 返回值
*/
public function modifier_split_type($col) {
return $col ? $this->splitType[$col] : '';
}
/**
* modifier_split_rule
* @param mixed $col col
* @return mixed 返回值
*/
public function modifier_split_rule($col) {
return $col ? $this->splitRule[$col] : '';
}
}
}