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

10
app/finance/dbschema/ar.php
View File

@@ -258,6 +258,16 @@ $db['ar'] = array(
'default_in_list' => true,
'order' => 13,
),
'platform_amount' => array(
'type' => 'money',
'default' => '0',
'label' => '平台承担金额',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'comment' => '平台承担金额（不包含支付优惠）',
),
'addon' => array(
'type' => 'serialize',
'comment' => '附加字段Serialize(array(‘sale_money’=>’商品成交金额’,’fee_money’=>’运费收入’))',

14
app/finance/dbschema/ar_items.php
View File

@@ -33,12 +33,12 @@ $db['ar_items'] = array(
'type' => 'varchar(255)',
'editable' => false,
'is_title' => true,
'comment' => '货品编码',
'comment' => '销售物料编码',
),
'name' => array(
'type' => 'varchar(200)',
'editable' => false,
'comment' => '货品名称',
'comment' => '销售物料名称',
),
'num' => array(
'type' => 'number',
@@ -65,6 +65,16 @@ $db['ar_items'] = array(
'default_in_list' => true,
'order' => 13,
),
'platform_amount' => array(
'type' => 'money',
'default' => '0',
'label' => '平台承担金额',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'comment' => '平台承担金额（不包含支付优惠）',
),
),
'index' => array (
'ind_bn' => array ('columns' => array ('bn')),

121
app/finance/dbschema/gaptype.php Normal file
View File

@@ -0,0 +1,121 @@
<?php
$db['gaptype'] = array(
'columns' =>
array(
'id' =>
array(
'type' => 'int unsigned',
'required' => true,
'pkey' => true,
'extra' => 'auto_increment',
'editable' => false,
),
'gap_name' =>
array(
'type' => 'varchar(20)',
'required' => true,
'label' => '类型名称',
'width' => 120,
'in_list' => true,
'default_in_list' => true,
'filtertype' => 'normal',
'filterdefault' => true,
'order' => 1,
),
'status' =>
array(
'type' => [
'0' => '无效',
'1' => '有效',
],
'required' => true,
'default' => '1',
'label' => '状态',
'comment' => '状态。可选状态：1（有效），0（无效）',
'width' => 65,
'in_list' => true,
'default_in_list' => true,
'filtertype' => 'normal',
'filterdefault' => true,
'order' => 2,
),
'disabled' =>
array(
'type' => [
'true' => '是',
'false' => '否',
],
'required' => true,
'default' => 'false',
'label' => '删除状态',
'comment' => '删除状态',
'width' => 65,
'in_list' => false,
'default_in_list' => false,
'order' => 3,
),
'at_time' =>
array(
'type' => 'TIMESTAMP',
'label' => '创建时间',
'default' => 'CURRENT_TIMESTAMP',
'width' => 120,
'editable' => false,
'in_list' => true,
'default_in_list' => false,
'order' => 4,
),
'up_time' =>
array(
'type' => 'TIMESTAMP',
'label' => '更新时间',
'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
'width' => 120,
'editable' => false,
'in_list' => true,
'default_in_list' => false,
'order' => 5,
),
),
'index' => array(
'ind_gap_name' =>
array(
'columns' =>
array(
0 => 'gap_name',
),
),
'ind_status' =>
array(
'columns' =>
array(
0 => 'status',
),
),
'ind_disabled' =>
array(
'columns' =>
array(
0 => 'disabled',
),
),
'ind_at_time' =>
array(
'columns' =>
array(
0 => 'at_time',
),
),
'ind_up_time' =>
array(
'columns' =>
array(
0 => 'up_time',
),
),
),
'comment' => '差异类型表',
'engine' => 'innodb',
'version' => '$Rev: $',
);

38
app/finance/dbschema/monthly_report.php
View File

@@ -79,6 +79,44 @@ $db['monthly_report']=array (
'in_list' => true,
'order' => 30,
),
'actually_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '客户实付',
),
'platform_amount' => array(
'type' => 'money',
'default' => '0',
'label' => '平台承担金额',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'comment' => '平台承担金额（不包含支付优惠）',
),
'refund_actually_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '客户应退',
),
'refund_platform_amount' => array(
'type' => 'money',
'default' => '0',
'label' => '平台补贴退',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'comment' => '平台补贴退（不包含支付优惠）',
),
'begin_time' =>
array (
'type' => 'time',

92
app/finance/dbschema/monthly_report_items.php
View File

@@ -135,6 +135,24 @@ $db['monthly_report_items'] = array(
'filtertype' => 'normal',
'filterdefault' => true,
],
'gov_yingshou_total' => [
'type' => 'money',
'label' => '国补应收合计',
'in_list' => true,
'default_in_list' => true,
'order' => 105,
'filtertype' => 'normal',
'filterdefault' => true,
],
'gov_shishou_total' => [
'type' => 'money',
'label' => '国补实收合计',
'in_list' => true,
'default_in_list' => true,
'order' => 106,
'filtertype' => 'normal',
'filterdefault' => true,
],
'gap' => [
'type' => 'decimal(20,3)',
'label' => 'GAP',
@@ -151,6 +169,22 @@ $db['monthly_report_items'] = array(
'default_in_list' => true,
'order' => 120,
],
'sales_gap' => [
'type' => 'decimal(20,3)',
'label' => '销售GAP',
'default' => '0',
'comment' => '销售应收-平台收入',
'in_list' => false,
'default_in_list' => false,
],
'refund_gap' => [
'type' => 'decimal(20,3)',
'label' => '退款GAP',
'default' => '0',
'comment' => '销售应退-平台支出',
'in_list' => false,
'default_in_list' => false,
],
'verification_status' => array(
'type' => [
'1' => '未核销',
@@ -169,6 +203,44 @@ $db['monthly_report_items'] = array(
'default_in_list' => true,
'order' => 140,
],
'actually_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '客户实付',
),
'platform_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '平台承担金额',
'comment' => '平台承担金额（不包含支付优惠）',
),
'refund_actually_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '客户应退',
),
'refund_platform_amount' => array(
'type' => 'money',
'default' => '0',
'width' => 65,
'editable' => false,
'in_list' => true,
'default_in_list' => true,
'label' => '平台补贴退',
'comment' => '平台补贴退（不包含支付优惠）',
),
'at_time' => array(
'type' => 'TIMESTAMP',
'label' => '创建时间',
@@ -200,6 +272,26 @@ $db['monthly_report_items'] = array(
'verification_status'
]
],
'ind_gov_yingshou_total' => [
'columns' => [
'gov_yingshou_total'
]
],
'ind_gov_shishou_total' => [
'columns' => [
'gov_shishou_total'
]
],
'ind_gap' => [
'columns' => [
'gap'
]
],
'ind_gap_type' => [
'columns' => [
'gap_type'
]
],
'ind_at_time' => ['columns' => ['at_time']],
'ind_up_time' => ['columns' => ['up_time']],
),