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

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

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

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

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

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

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

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

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',