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

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

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

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

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

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

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

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

app/console/dbschema/foreign_sku.php

@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 $db['foreign_sku']=array (
   'columns' => 
   array (
@@ -139,8 +138,8 @@ $db['foreign_sku']=array (
       array (
         0 => '未同步',
         1 => '同步失败',
-        2 => '同步成功',
-        3 => '无需同步',
+        2 => '无需同步',
+        3 => '同步成功',
       ),
       'default' => '0',
       'required' => true,
@@ -204,4 +203,4 @@ $db['foreign_sku']=array (
   'comment' => '外部sku关联表',
   'engine' => 'innodb',
   'version' => '$Rev: 40654 $',
-);
+);

app/console/dbschema/inventory_snapshot_items.php

@@ -44,7 +44,7 @@ $db['inventory_snapshot_items'] = [
         ],
         'item_code'      => [
             'type'            => 'varchar(32)',
-            'label'           => '商品编码',
+            'label'           => '基础物料编码',
             'in_list'         => true,
             'default_in_list' => true,
             'order'           => 10,
@@ -76,14 +76,14 @@ $db['inventory_snapshot_items'] = [
 
         'item_id'        => [
             'type'            => 'varchar(32)',
-            'label'           => '商品ID',
+            'label'           => '基础物料ID',
             'in_list'         => true,
             'default_in_list' => true,
             'order'           => 50,
         ],
         'inventory_type' => [
             'type'            => 'varchar(32)',
-            'label'           => '商品类型',
+            'label'           => '基础物料类型',
             'in_list'         => true,
             'default_in_list' => true,
             'order'           => 60,
@@ -128,7 +128,7 @@ $db['inventory_snapshot_items'] = [
         ],
         'product_date'   => [
             'type'            => 'varchar(32)',
-            'label'           => '商品生产日期',
+            'label'           => '基础物料生产日期',
             'in_list'         => true,
             'default_in_list' => true,
             'order'           => 110,
@@ -137,7 +137,7 @@ $db['inventory_snapshot_items'] = [
         ],
         'expire_date'    => [
             'type'            => 'varchar(32)',
-            'label'           => '商品过期日期',
+            'label'           => '基础物料过期日期',
             'in_list'         => true,
             'default_in_list' => true,
             'order'           => 120,

app/console/dbschema/wms_stockin_items.php

@@ -69,6 +69,11 @@ $db['wms_stockin_items'] = array(
             'default'         => '',
             'label'           => '第三方货品编码',
         ),
+        'inventoryType'      => array(
+            'type'            => 'varchar(25)', // ZP/CC
+            'default'         => '',
+            'label'           => '库存类型',
+        ),
         'at_time'       => array(
             'type'            => 'TIMESTAMP',
             'label'           => '创建时间',