Commit 58d38911d6f8daded732269503aca24146d7fc68
1 parent
f0e26553
feat<central>:新增多品登记按钮,同时项目配置中允许大地址,以此解决品类登记内存消耗过大的问题。
Signed-off-by: liuye <liuye@diligrp.com>
Showing
4 changed files
with
13 additions
and
9 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
... | ... | @@ -5,8 +5,9 @@ |
5 | 5 | {"res_id":2, "auth_id":1010, "icon":"", "index":[1]}, |
6 | 6 | {"res_id":20001, "auth_id":101001, "icon":"comm_regist.ico", "index":[1, 0]}, |
7 | 7 | {"res_id":20002, "auth_id":101002, "icon":"comm_distrib.ico", "index":[1, 1]}, |
8 | - {"res_id":20003, "auth_id":101003, "icon":"query_manage.ico", "index":[1, 2]}, | |
9 | - {"res_id":20004, "auth_id":101004, "icon":"special_handle.ico", "index":[1, 3]}, | |
8 | + {"res_id":20003, "auth_id":101005, "icon":"comm_regist.ico", "index":[1, 2]}, | |
9 | + {"res_id":20004, "auth_id":101003, "icon":"query_manage.ico", "index":[1, 3]}, | |
10 | + {"res_id":20005, "auth_id":101004, "icon":"special_handle.ico", "index":[1, 4]}, | |
10 | 11 | {"res_id":4, "auth_id":1020, "icon":"", "index":[2]}, |
11 | 12 | {"res_id":40001, "auth_id":102002, "icon":"cate_manage.ico", "index":[2, 0]}, |
12 | 13 | {"res_id":40002, "auth_id":102003, "icon":"agreement.ico", "index":[2, 1]}, | ... | ... |
central_clearing_system/ETradeClient.rc
... | ... | @@ -86,6 +86,7 @@ BEGIN |
86 | 86 | BEGIN |
87 | 87 | MENUITEM "商品登记", ID_COMM_REGIST |
88 | 88 | MENUITEM "商品分发", ID_COMM_DISTRIB |
89 | + MENUITEM "多品登记", ID_MORE_REGIS | |
89 | 90 | MENUITEM "查询管理", ID_QUERY_MANAGE |
90 | 91 | MENUITEM "特殊处理", ID_SPECIAL_HANDLE |
91 | 92 | END |
... | ... | @@ -286,8 +287,8 @@ END |
286 | 287 | // |
287 | 288 | |
288 | 289 | VS_VERSION_INFO VERSIONINFO |
289 | - FILEVERSION 4,0,1,0 | |
290 | - PRODUCTVERSION 4,0,1,0 | |
290 | + FILEVERSION 4,0,2,0 | |
291 | + PRODUCTVERSION 4,0,2,0 | |
291 | 292 | FILEFLAGSMASK 0x3fL |
292 | 293 | #ifdef _DEBUG |
293 | 294 | FILEFLAGS 0x1L |
... | ... | @@ -304,12 +305,12 @@ BEGIN |
304 | 305 | BEGIN |
305 | 306 | VALUE "CompanyName", "地利集团【DILI GROUP】" |
306 | 307 | VALUE "FileDescription", "电子交易结算综合业务系统" |
307 | - VALUE "FileVersion", "4.0.1.0" | |
308 | + VALUE "FileVersion", "4.0.2.0" | |
308 | 309 | VALUE "InternalName", "电子交易结算综合业务系统" |
309 | 310 | VALUE "LegalCopyright", "(C) 地利集团保留所有权利。" |
310 | 311 | VALUE "OriginalFilename", "电子交易结算综合业务系统" |
311 | 312 | VALUE "ProductName", "电子交易结算综合业务系统" |
312 | - VALUE "ProductVersion", "4.0.1.0" | |
313 | + VALUE "ProductVersion", "4.0.2.0" | |
313 | 314 | END |
314 | 315 | END |
315 | 316 | BLOCK "VarFileInfo" | ... | ... |
central_clearing_system/ETradeClient.vcxproj
... | ... | @@ -90,6 +90,7 @@ |
90 | 90 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
91 | 91 | <OptimizeReferences>true</OptimizeReferences> |
92 | 92 | <AdditionalDependencies>dlcm.lib;SynIDCardAPI.lib;DesDLL.lib;%(AdditionalDependencies)</AdditionalDependencies> |
93 | + <LargeAddressAware>true</LargeAddressAware> | |
93 | 94 | </Link> |
94 | 95 | <Midl> |
95 | 96 | <MkTypLibCompatible>false</MkTypLibCompatible> | ... | ... |
central_clearing_system/Resource.h
... | ... | @@ -77,8 +77,9 @@ |
77 | 77 | #define ID_MODIFY_PASSWORD 11002 |
78 | 78 | #define ID_COMM_REGIST 20001 |
79 | 79 | #define ID_COMM_DISTRIB 20002 |
80 | -#define ID_QUERY_MANAGE 20003 | |
81 | -#define ID_SPECIAL_HANDLE 20004 | |
80 | +#define ID_MORE_REGIS 20003 | |
81 | +#define ID_QUERY_MANAGE 20004 | |
82 | +#define ID_SPECIAL_HANDLE 20005 | |
82 | 83 | #define ID_MENU_DELETE 32846 |
83 | 84 | #define ID_POPMENU_LIST 32848 |
84 | 85 | #define ID_POPMENU_DELETE 32850 |
... | ... | @@ -111,7 +112,7 @@ |
111 | 112 | #ifdef APSTUDIO_INVOKED |
112 | 113 | #ifndef APSTUDIO_READONLY_SYMBOLS |
113 | 114 | #define _APS_NEXT_RESOURCE_VALUE 333 |
114 | -#define _APS_NEXT_COMMAND_VALUE 32910 | |
115 | +#define _APS_NEXT_COMMAND_VALUE 32913 | |
115 | 116 | #define _APS_NEXT_CONTROL_VALUE 1055 |
116 | 117 | #define _APS_NEXT_SYMED_VALUE 311 |
117 | 118 | #endif | ... | ... |