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

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

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

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

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

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

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

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

app/material/dbschema/basic_material.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * 基础物料数据结构
  *
@@ -40,7 +39,7 @@ $db['basic_material']=array(
     'material_bn' => array(
         'type' => 'varchar(200)',
         'label' => '基础物料编码',
-        'width' => 120,
+        'width' => 230,
         'editable' => false,
         'in_list' => true,
         'default_in_list' => true,
@@ -100,7 +99,7 @@ $db['basic_material']=array(
       'required' => false,
       'default' => 0,
       'label' => '分类',
-      'width' => 75,
+      'width' => 160,
       'editable' => true,
       'filtertype' => 'yes',
       'filterdefault' => true,
@@ -138,7 +137,7 @@ $db['basic_material']=array(
         'default' => 1,
         'label' => '是否管控库存',
         'in_list' => true,
-        'default_in_list' => false,
+        'default_in_list' => true,
         'comment' => '管控库存(1=是，2=否)',
     ),
     'visibled' =>
@@ -158,6 +157,8 @@ $db['basic_material']=array(
       'label' => '创建时间',
       'in_list' => true,
       'default_in_list' => true,
+      'filtertype' => 'time',
+      'filterdefault' => true,
       'default' => 0,
     ),
     'tax_rate' =>
@@ -227,13 +228,15 @@ $db['basic_material']=array(
         'width' => 130,
         'in_list' => true,
         'default_in_list' => true,
+        'filtertype' => 'time',
+        'filterdefault' => true,
     ),
     'source' => array(
         'type'     => 'varchar(50)',
         'required' => true,
         'label'    => '数据来源',
         'default'  => 'local',
-        'default_in_list' => true,
+        // 'default_in_list' => true,
         'in_list' => true,
         'comment' => '数据来源,可选值:local(本地),api(接口)',
     ),
@@ -288,15 +291,18 @@ $db['basic_material']=array(
             0 => 'material_spu',
         ),
     ),
-    'ind_last_modified' =>
-    array(
-        'columns' =>
-        array(
+    'ind_last_modified' => array(
+        'columns' => array(
             0 => 'last_modified',
         ),
     ),
+   'create_time' => array (
+       'columns' => array (
+          0 => 'create_time',
+       ),
+   ),
   ),
   'comment' => '基础物料表,用于存储SKU纬度的商品数据',
   'engine' => 'innodb',
   'version' => '$Rev:  $',
-);
+);

app/material/dbschema/basic_material_stock.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * 基础物料库存数据结构
  *
@@ -90,6 +89,15 @@ $db['basic_material_stock']=array (
       'editable' => false,
       'comment' => '最大可下单库存最后更新时间',
     ),
+    'inc_store_lastmodify' =>
+    array (
+      'type' => 'time',
+      'editable' => false,
+      'default' => 0,
+      'comment' => '库存最后添加时间（仅库存增加时更新）',
+      'in_list' => false,
+      'default_in_list' => false,
+    ),
   ),
   'index' => array (
       'ind_last_modified' => array (
@@ -102,6 +110,11 @@ $db['basic_material_stock']=array (
               0 => 'max_store_lastmodify',
           ),
       ),
+      'ind_inc_store_lastmodify' => array (
+          'columns' => array (
+              0 => 'inc_store_lastmodify',
+          ),
+      ),
   ),
   'comment' => '基础物料总库存表',
   'engine' => 'innodb',

app/material/dbschema/sales_basic_material.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * 销售物料基础物料关联数据结构
  *
@@ -55,6 +54,12 @@ $db['sales_basic_material'] = array(
             'default'  => 100,
             'hidden'   => true,
         ),
+        'fixed_price' => array(
+            'type' => 'money',
+            'editable' => false,
+            'label'    => '固定价',
+            'hidden'   => true,
+        ),
     ),
     'index'   => array(
         'ind_sm_bm' => array('columns' => array('sm_id', 'bm_id')),

app/material/dbschema/sales_material.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 /**
  * 销售物料数据结构
  *
@@ -49,7 +48,7 @@ $db['sales_material']=array(
         array(
             'type' => 'varchar(200)',
             'label' => '销售物料编码',
-            'width' => 120,
+            'width' => 230,
             'editable' => false,
             'in_list' => true,
             'default_in_list' => true,
@@ -95,8 +94,8 @@ $db['sales_material']=array(
         'type' => 'table:customer_classify@material',
         'default' => 0,
         'editable' => false,
-        'label' => '客户分类ID',
-        'width' => 130,
+        'label' => '客户分类',
+        'width' => 160,
         'in_list' => true,
         'default_in_list' => true,
     ),
@@ -111,6 +110,8 @@ $db['sales_material']=array(
         'label' => '创建时间',
         'in_list' => true,
         'default_in_list' => true,
+        'filtertype' => 'time',
+        'filterdefault' => true,
         'default' => 0,
     ),
     'last_modify' => array(
@@ -118,6 +119,8 @@ $db['sales_material']=array(
           'label' => '最后更新时间',
           'in_list' => true,
           'default_in_list' => true,
+          'filtertype' => 'time',
+          'filterdefault' => true,
           'order' => 11,
       ),
     'disabled' =>
@@ -187,6 +190,15 @@ $db['sales_material']=array(
             'filtertype' => 'yes',
             'filterdefault' => true,
         ),
+    'source' => array(
+        'type'     => 'varchar(50)',
+        'required' => true,
+        'label'    => '数据来源',
+        'default'  => 'local',
+        // 'default_in_list' => true,
+        'in_list' => true,
+        'comment' => '数据来源,可选值:local(本地),api(接口)',
+    ),
   ),
   'comment' => '销售物料表,用于匹配销售平台订单商品编码',
   'index' =>
@@ -206,13 +218,16 @@ $db['sales_material']=array(
                     0 => 'visibled',
                 ),
         ),
-    'last_modify' =>
-    array (
-        'columns' =>
-            array (
+      'last_modify' => array (
+        'columns' => array (
                 0 => 'last_modify',
             ),
-    ),
+      ),
+      'create_time' => array (
+          'columns' => array (
+              0 => 'create_time',
+          ),
+      ),
   ),
   'engine' => 'innodb',
   'version' => '$Rev:  $',

app/material/dbschema/seller.php

@@ -0,0 +1,65 @@
+<?php
+
+$db['seller'] = array(
+    'columns' => array(
+        'id'   => array(
+            'type'     => 'int unsigned',
+            'extra'    => 'auto_increment',
+            'pkey'     => true,
+            'editable' => false,
+            'label'    => '自增ID',
+        ),
+        'seller_code'  => array(
+            'type'          => 'varchar(255)',
+            'label'         => '销售人员编码',
+            'default'       => '',
+            'in_list'       => true,
+            'default_in_list' => true,
+            'order'         => 10,
+            'searchtype'    => 'nequal',
+            'filtertype'    => 'normal',
+            'filterdefault' => true,
+        ),
+        'seller_name'  => array(
+            'type'          => 'varchar(255)',
+            'label'         => '销售人员名称',
+            'default'       => '',
+            'in_list'       => true,
+            'default_in_list' => true,
+            'is_title'      => true,
+            'order'         => 20,
+        ),
+        'disabled'     => array(
+            'type'          => 'bool',
+            'label'         => '禁用状态',
+            'default'       => 'false',
+            'in_list'       => true,
+            'default_in_list' => true,
+            'order'         => 30,
+        ),
+        'at_time'       => array(
+            'type'            => 'TIMESTAMP',
+            'label'           => '创建时间',
+            'default'         => 'CURRENT_TIMESTAMP',
+            'in_list'         => true,
+            'default_in_list' => true,
+            'order'           => 1000,
+        ),
+        'up_time'       => array(
+            'type'            => 'TIMESTAMP',
+            'label'           => '更新时间',
+            'default'         => 'CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP',
+            'in_list'         => true,
+            'default_in_list' => true,
+            'order'           => 1010,
+        ),
+    ),
+    'index'   => array(
+        'idx_seller_code'  => array('columns' => array('seller_code'), 'prefix' => 'unique'),
+        'idx_at_time'       => array('columns' => array('at_time')),
+        'idx_up_time'       => array('columns' => array('up_time')),
+    ),
+    'engine'  => 'innodb',
+    'commit'  => '',
+    'version' => 'Rev: 41996 $',
+);