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

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

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

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

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

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

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

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

app/base/dbschema/rpcnotify.php

@@ -52,7 +52,7 @@ $db['rpcnotify']=array (
       'default_in_list' => true,
     ),
     'msg'=>array(
-      'type' => 'varchar(255)',
+      'type' => 'text',
       'required' => true,
       'width'=>200,
       'label' => app::get('base')->_('信息'),
@@ -81,6 +81,14 @@ $db['rpcnotify']=array (
       'in_list' =>true,
       'default_in_list' => true,
     ),
+    'read_user' =>
+    array(
+      'type' => 'varchar(255)',
+      'label' => app::get('base')->_('已读人'),
+      'width' => 100,
+      'in_list' =>true,
+      'default_in_list' => true,
+    ),
     ),
   'index' => 
   array (
@@ -91,6 +99,13 @@ $db['rpcnotify']=array (
         0 => 'status',
       ),
     ),
+    'ind_notifytime' => 
+    array (
+      'columns' => 
+      array (
+        0 => 'notifytime',
+      ),
+    ),
   ),
     'comment' => '系统通知表',
     'engine' => 'innodb',

app/base/lib/application/manage.php

@@ -282,6 +282,7 @@ class base_application_manage{
                 $app->setConf($set['key'],$set['value']);
             }
         }
+        kernel::single('base_initial', $app_id)->init();
 
         $app->runtask('post_install',$options);
 

app/base/lib/db/connections.php

@@ -291,6 +291,7 @@ class base_db_connections extends base_db_abstract implements base_interface_db
             ome_branch_product::delRedisBranchFlow();
             material_basic_material_stock::delRedisMaterialFlow();
 
+            
             ome_branch_product::initRedisBranch();
             material_basic_material_stock::initRedisMaterialStock();
             return true;

app/base/lib/enterprise.php

@@ -147,9 +147,9 @@ class base_enterprise {
         $query_string = http_build_query($params);
         
         // 如果企业已经认证过了（ent_id存在），返回组织列表URL，否则返回认证URL
-        if (!empty($entId)) {
-            return $base . '/organization/list?' . $query_string;
-        }
+        // if (!empty($entId)) {
+        //     return $base . '/organization/list?' . $query_string;
+        // }
         
         return $base . '/system/apply?' . $query_string;
     }

app/base/lib/finder/rpcnotify.php

@@ -30,18 +30,20 @@ class base_finder_rpcnotify
             $msg = json_decode($info['msg'], true);
             if (is_array($msg)) {
                 $shop = $shopMdl->dump(array('node_id' => $msg['node_id']), 'name');
+                $data['msg']       = $msg['info'];
+                $data['shop_name'] = $shop['name'];
+            } else {
+                $data['msg']       = $info['msg'];
             }
         }
-        
-        $data['msg']       = $msg['info'];
-        $data['shop_name'] = $shop['name'];
+
         //修改已有缓存
         $cacheInfo = cachecore::fetch('system_notice_data');
         if ($cacheInfo) {
             $infoKey = array_search($id, array_column($cacheInfo, 'id'));
             $cacheInfo[$infoKey]['status'] = 'true';
             cachecore::store('system_notice_data', $cacheInfo, 1800);
-            $noticeMdl->update(['status' => 'true'], array('id' => $id));
+            $noticeMdl->update(['status' => 'true','read_user'=>kernel::single('desktop_user')->get_login_name()], array('id' => $id));
         }
         $render->pagedata['info'] = $data;
         

app/base/lib/shell/buildin.php

@@ -241,8 +241,8 @@ EOF;
                 
         $applist = kernel::single('base_application_manage')->install_queue($applist);
 		$this->install_app_by_install_queue($applist, $options);		
-
-       $this->command_install_demodata("demodata");
+		
+		$this->command_install_demodata('demodata');
 	}
 	
 	var $command_install_demodata = "安装初始化数据";

app/base/view/admin/system/detail_basic.html

@@ -27,14 +27,16 @@
                                     <table cellspacing="0" cellpadding="0" border="0">
 
                                         <tbody>
-                                        <tr>
-                                            <th>店铺名称：</th>
-                                            <td><{$info.shop_name}></td>
-                                        </tr>
-                                        <tr>
-                                            <th>消息内容：</th>
-                                            <td><{$info.msg}></td>
-                                        </tr>
+                                            <{if $info.shop_name}>
+                                            <tr>
+                                                <th>店铺名称：</th>
+                                                <td><{$info.shop_name}></td>
+                                            </tr>
+                                            <{/if}>
+                                            <tr>
+                                                <th>消息内容：</th>
+                                                <td><{$info.msg}></td>
+                                            </tr>
                                         </tbody>
                                     </table>