1. 【新增】售后单售后原因类型支持搜索

2. 【新增】手工创建订单折扣可输入正数

3. 【优化】盘点申请单确认

4. 【修复】采购退货单模拟出库失败问题

5. 【新增】订单金额客户实付与结算金额

6. 【优化】仓库发货统计报表物料名称显示

7. 【优化】自有仓储虚拟发货逻辑

8. 【修复】基础物料分类管理问题

app/financebase/dbschema/account_chart.php

@@ -0,0 +1,144 @@
+<?php
+$db['account_chart'] = array(
+    'columns' => array(
+        'id' => array(
+            'type' => 'int',
+            'required' => true,
+            'pkey' => true,
+            'extra' => 'auto_increment',
+            'label' => 'ID',
+            'comment' => 'ID。自增',
+            'editable' => false,
+        ),
+        'account_code' => array(
+            'type' => 'varchar(8)',
+            'label' => '会计科目编码',
+            'in_list' => true,
+            'default_in_list' => true,
+            'editable' => false,
+        ),
+        'account' => array(
+            'type' => 'varchar(50)',
+            'label' => '会计科目',
+            'comment' => '会计科目。索引唯一',
+            'in_list' => true,
+            'default_in_list' => true,
+            'searchtype' => 'nequal',
+            'is_title' => true,
+            'order' => 30,
+            'editable' => false,
+        ),
+        'description' => array(
+            'type' => 'varchar(255)',
+            'label' => '科目描述',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 35,
+            'editable' => false,
+        ),
+        'postingkey' => array(
+            'type' => 'varchar(30)',
+            'label' => '记账码',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 40,
+            'editable' => false,
+        ),
+        'customer' => array(
+            'type' => 'varchar(30)',
+            'label' => '客户',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 50,
+            'editable' => false,
+        ),
+        'costcenter' => array(
+            'type' => 'varchar(30)',
+            'label' => '成本中心',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 60,
+            'editable' => false,
+        ),
+        'tax_rate' => array(
+            'type' => 'decimal(20,3)',
+            'label' => '税率',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 70,
+            'editable' => false,
+        ),
+        'tax_account' => array(
+            'type' => 'varchar(50)',
+            'label' => '税率会计科目',
+            'comment' => '税率会计科目。当有税率时此字段为必填',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 75,
+            'editable' => false,
+        ),
+        'account_category' => array(
+            'type' => 'varchar(30)',
+            'label' => '应用场景',
+            'comment' => 'platform_amount、actually_amount、refundplatform_amount、refundactually_amount每种只能有一条，其余不选的为空',
+            'default' => '',
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 80,
+            'editable' => false,
+        ),
+        'reason_code' => array(
+            'type' => 'varchar(64)',
+            'label' => '原因代码',
+            'default_in_list' => true,
+            'in_list' => true,
+            'order' => 65,
+            'editable' => false,
+        ),
+        'disabled' => array(
+            'type'     => 'bool',
+            'required' => true,
+            'default'  => 'false',
+            'editable' => false,
+            'comment'  => '删除状态,可选值:true(是),false(否)'
+        ),
+        'at_time' => array(
+            'type' => 'TIMESTAMP',
+            'label' => '创建时间',
+            'default' => 'CURRENT_TIMESTAMP',
+            'width' => 150,
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 90,
+            'editable' => false,
+        ),
+        'up_time' => array(
+            'type' => 'TIMESTAMP',
+            'label' => '更新时间',
+            'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+            'width' => 150,
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 100,
+            'editable' => false,
+        ),
+    ),
+    'index' => array(
+        'ind_postingkey' => array(
+            'columns' => array(0 => 'postingkey'),
+        ),
+        'ind_customer' => array(
+            'columns' => array(0 => 'customer'),
+        ),
+        'ind_costcenter' => array(
+            'columns' => array(0 => 'costcenter'),
+        ),
+        'ind_account_code' => array(
+            'columns' => array(0 => 'account_code'),
+            'prefix'  => 'unique',
+        ),
+    ),
+    'comment' => '科目表',
+    'engine' => 'innodb',
+    'version' => '$Rev:  $',
+);

app/financebase/dbschema/bill.php

@@ -180,10 +180,14 @@ $db['bill']=array (
       'order'=>16,
     ),
     'disabled' => array(
+      'label' => '匹配状态',
+      'comment' => '匹配状态，true为失败，false为成功',
       'type' => 'bool',
       'required' => true,
       'default' => 'false',
       'editable' => false,
+      'in_list' => true,
+      'default_in_list' => true,
     ),
     'confirm_status' => array(
       'type' => array(
@@ -239,6 +243,34 @@ $db['bill']=array (
           'in_list' => true,
           'default_in_list' => true,
     ),
+    'ar_verify_status' => array(
+          'type' => 'tinyint(1)',
+          'default' => '2',
+          'label' => '核对状态',
+          'comment' => '核对状态：1-已核对AR，2-需核对AR，3-无需核对AR',
+          'editable' => false,
+          'in_list' => true,
+          'default_in_list' => true,
+          'order' => 80,
+    ),
+    'at_time' => array(
+          'type' => 'TIMESTAMP',
+          'label' => '创建时间',
+          'default' => 'CURRENT_TIMESTAMP',
+          'width' => 150,
+          'in_list' => true,
+          'default_in_list' => true,
+          'order' => 90,
+    ),
+    'up_time' => array(
+          'type' => 'TIMESTAMP',
+          'label' => '更新时间',
+          'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+          'width' => 150,
+          'in_list' => true,
+          'default_in_list' => true,
+          'order' => 100,
+    ),
   ),
   'index' => array(
     'ind_shop_id' => array('columns' => array(0 => 'shop_id')),
@@ -252,6 +284,9 @@ $db['bill']=array (
     'ind_bill_category' => array('columns' => array(0 => 'bill_category')),
     'ind_split_status' => array('columns' => array(0 => 'split_status')),
     'ind_split_time' => array('columns' => array(0 => 'split_time')),
+    'ind_ar_verify_status' => array('columns' => array(0 => 'ar_verify_status')),
+    'ind_at_time' => array('columns' => array(0 => 'at_time')),
+    'ind_up_time' => array('columns' => array(0 => 'up_time')),
    ),
   'comment' => '流水快速表',
   'engine' => 'innodb',

app/financebase/dbschema/bill_category_rules.php

@@ -105,11 +105,60 @@ $db['bill_category_rules']=array (
       'in_list' => true,
       'label' => '设置最后修改时间'
     ),
+    'account_id_plus' => 
+    array (
+      'type' => 'table:account_chart@financebase',
+      'label' => '贷会计科目ID',
+      'editable' => false,
+      'default_in_list' => false,
+      'in_list' => false,
+      'order' => 60,
+    ),
+    'account_id_minus' => 
+    array (
+      'type' => 'table:account_chart@financebase',
+      'label' => '借会计科目ID',
+      'editable' => false,
+      'default_in_list' => false,
+      'in_list' => false,
+      'order' => 65,
+    ),
+    'need_ar_verify' => array(
+          'type' => 'tinyint(1)',
+          'default' => '1',
+          'label' => '是否需要核对AR',
+          'comment' => '是否需要核对AR：0-无需核对AR，1-需核对AR',
+          'editable' => false,
+          'in_list' => true,
+          'default_in_list' => true,
+          'order' => 70,
+    ),
+    'at_time' => 
+    array (
+      'type' => 'TIMESTAMP',
+      'label' => '创建时间',
+      'default' => 'CURRENT_TIMESTAMP',
+      'width' => 150,
+      'in_list' => true,
+      'default_in_list' => true,
+      'order' => 80,
+    ),
+    'up_time' => 
+    array (
+      'type' => 'TIMESTAMP',
+      'label' => '更新时间',
+      'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+      'width' => 150,
+      'in_list' => true,
+      'default_in_list' => true,
+      'order' => 90,
+    ),
   ),
   'index' => array(
     'ind_bill_category' => array('columns' => array(0 => 'bill_category')),
     'ind_ordernum' => array('columns' => array(0 => 'ordernum')),
     'ind_disabled' => array('columns' => array(0 => 'disabled')),
+    'ind_need_ar_verify' => array('columns' => array(0 => 'need_ar_verify')),
    ),
   'comment' => '对账类目规则表',
   'engine' => 'innodb',

app/financebase/dbschema/expenses_split.php

@@ -26,6 +26,16 @@ $db['expenses_split']=array (
       'extra' => 'auto_increment',
       'editable' => false,
     ),
+    'split_bn' => array(
+        'type' => 'varchar(50)',
+        'label' => '拆分单号',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'filtertype' => 'normal',
+        'filterdefault' => true,
+        'order' => 2,
+    ),
     'bm_id' => array(
       'type' => 'table:basic_material@material',
       'label' => '基础物料名称',
@@ -145,24 +155,169 @@ $db['expenses_split']=array (
             'width' => 100,
             'order'=>55,
     ),
-    'confirm_status' => array(
-            'type' => array(
-                '0' => '否',
-                '1' => '是'
-            ),
-            'label' => '是否对账',
-            'default' => '0',
-            'width' => 80,
-            'editable' => false,
-            'in_list' => true,
-            'default_in_list' => true,
-            'order' => 60,
+    'is_accounted' => array(
+        'type' => array(
+            '0' => '未记账',
+            '1' => '已记账',
+        ),
+        'label' => '是否已记账',
+        'default' => '0',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => false,
+        'order' => 60,
+        'comment' => '标记该拆分项是否已记账',
+    ),
+    'accounted_time' => array(
+        'type' => 'time',
+        'label' => '记账时间',
+        'width' => 150,
+        'filtertype' => 'normal',
+        'filterdefault' => false,
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => false,
+        'order' => 61,
+        'comment' => '记账完成时间',
+    ),
+    'account_id_plus' => array(
+        'type' => 'table:account_chart@financebase',
+        'label' => '贷会计科目ID',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 65,
+    ),
+    'account_id_minus' => array(
+        'type' => 'table:account_chart@financebase',
+        'label' => '借会计科目ID',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 70,
+    ),
+    'tax_rate_plus' => array(
+        'type' => 'decimal(20,3)',
+        'label' => '贷方税率',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 75,
+    ),
+    'tax_amount_plus' => array(
+        'type' => 'decimal(20,5)',
+        'label' => '贷方税金',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 80,
+        'comment' => '根据分摊费用和贷方税率计算的税金',
+    ),
+    'tax_rate_minus' => array(
+        'type' => 'decimal(20,3)',
+        'label' => '借方税率',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 85,
+    ),
+    'tax_amount_minus' => array(
+        'type' => 'decimal(20,5)',
+        'label' => '借方税金',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 90,
+        'comment' => '根据分摊费用和借方税率计算的税金',
+    ),
+    'order_bn' => array(
+        'type' => 'varchar(32)',
+        'label' => '订单号',
+        'comment' => '订单号',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 95,
+        'filtertype' => 'normal',
+        'filterdefault' => true,
+    ),
+    'financial_no' => array(
+        'type' => 'varchar(32)',
+        'label' => '财务流水号',
+        'comment' => '财务流水号',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 96,
+        'filtertype' => 'normal',
+        'filterdefault' => true,
+    ),
+    'postingkey_plus' => array(
+        'type' => 'varchar(30)',
+        'label' => '贷方记账码',
+        'comment' => '贷方记账码',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 97,
+    ),
+    'postingkey_minus' => array(
+        'type' => 'varchar(30)',
+        'label' => '借方记账码',
+        'comment' => '借方记账码',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 98,
+    ),
+    'costcenter_plus' => array(
+        'type' => 'varchar(30)',
+        'label' => '贷方成本中心',
+        'comment' => '贷方成本中心',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 99,
+    ),
+    'costcenter_minus' => array(
+        'type' => 'varchar(30)',
+        'label' => '借方成本中心',
+        'comment' => '借方成本中心',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 100,
+    ),
+    'customer_plus' => array(
+        'type' => 'varchar(30)',
+        'label' => '贷方客户',
+        'comment' => '贷方客户',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 101,
+    ),
+    'customer_minus' => array(
+        'type' => 'varchar(30)',
+        'label' => '借方客户',
+        'comment' => '借方客户',
+        'editable' => false,
+        'in_list' => true,
+        'default_in_list' => true,
+        'order' => 102,
     ),
   ),
   'index' => array(
+    'ind_split_bn' => array('columns' => array(0 => 'split_bn'),'prefix' => 'UNIQUE'),
     'ind_trade_time' => array('columns' => array(0 => 'trade_time')),
     'ind_split_time' => array('columns' => array(0 => 'split_time')),
+    'ind_split_status' => array('columns' => array(0 => 'split_status')),
     'ind_bill_category' => array('columns' => array(0 => 'bill_category')),
+    'ind_is_accounted' => array('columns' => array(0 => 'is_accounted')),
+    'ind_order_bn' => array('columns' => array(0 => 'order_bn')),
+    'ind_financial_no' => array('columns' => array(0 => 'financial_no')),
+    'ind_shop_id' => array('columns' => array(0 => 'shop_id')),
+    'ind_accounted_time' => array('columns' => array(0 => 'accounted_time')),
    ),
   'comment' => '费用拆分表',
   'engine' => 'innodb',

app/financebase/dbschema/gap.php

@@ -0,0 +1,89 @@
+<?php
+$db['gap'] = array(
+    'columns' => array(
+        'id' => array(
+            'type' => 'int',
+            'required' => true,
+            'pkey' => true,
+            'extra' => 'auto_increment',
+            'label' => 'ID',
+            'comment' => 'ID。自增',
+            'editable' => false,
+        ),
+        'gap_name' => array(
+            'type' => 'varchar(50)',
+            'label' => '差异类型',
+            'comment' => '差异类型',
+            'in_list' => true,
+            'default_in_list' => true,
+            'searchtype' => 'nequal',
+            'is_title' => true,
+            'order' => 10,
+            'editable' => false,
+        ),
+        'account_id_plus' => array(
+            'type' => 'table:account_chart@financebase',
+            'label' => '贷会计科目ID',
+            'comment' => '贷会计科目ID',
+            'in_list' => false,
+            'default_in_list' => false,
+            'order' => 20,
+            'editable' => false,
+        ),
+        'account_id_minus' => array(
+            'type' => 'table:account_chart@financebase',
+            'label' => '借会计科目ID',
+            'comment' => '借会计科目ID',
+            'in_list' => false,
+            'default_in_list' => false,
+            'order' => 22,
+            'editable' => false,
+        ),
+        'status' => array(
+            'type'  => array(
+                "0" => '无效',
+                "1" => '有效',
+            ),
+            'label' => '状态',
+            'default' => '1',
+            'in_list' => false,
+            'default_in_list' => false,
+            'order' => 25,
+            'editable' => true,
+        ),
+        'at_time' => array(
+            'type' => 'TIMESTAMP',
+            'label' => '创建时间',
+            'default' => 'CURRENT_TIMESTAMP',
+            'width' => 150,
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 30,
+            'editable' => false,
+        ),
+        'up_time' => array(
+            'type' => 'TIMESTAMP',
+            'label' => '更新时间',
+            'default' => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+            'width' => 150,
+            'in_list' => true,
+            'default_in_list' => true,
+            'order' => 40,
+            'editable' => false,
+        ),
+    ),
+    'index' => array(
+        'ind_gap_name' => array(
+            'columns' => array(0 => 'gap_name'),
+        ),
+        'ind_account_id_plus' => array(
+            'columns' => array(0 => 'account_id_plus'),
+        ),
+        'ind_account_id_minus' => array(
+            'columns' => array(0 => 'account_id_minus'),
+        ),
+    ),
+    'comment' => '差异表',
+    'engine' => 'innodb',
+    'version' => '$Rev:  $',
+);