liuye / etradeclient · Commits

Commit f34b379babea317ed9c00f28d37ee1924024dd55

Authored by liuye
1 parent fc8da7d0
build: skipped

feat<central-clearing-system>:调整分发打印格式，调整部分菜单项

Inline Side-by-side
Showing 6 changed files with 26 additions and 57 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
  View file @f34b379
... ... @@ -13,14 +13,14 @@
13 13 {"res_id":40003, "auth_id":102003, "icon":"agreement.ico", "index":[2, 2]},
14 14 {"res_id":40004, "auth_id":102004, "icon":"consign_manage.ico", "index":[2, 3]},
15 15 {"res_id":40006, "auth_id":102005, "icon":"buckle-list.ico", "index":[2, 4]},
16   - {"res_id":40007, "auth_id":102006, "icon":"pay-black-list.ico", "index":[2, 5]},
17   - {"res_id":40008, "auth_id":102007, "icon":"pay-white-list.ico", "index":[2, 6]},
  16 + {"res_id":40007, "auth_id":102006, "icon":"pay-black-list.ico", "index":[2, 6]},
  17 + {"res_id":40008, "auth_id":102007, "icon":"pay-white-list.ico", "index":[2, 7]},
  18 + {"res_id":40009, "auth_id":102008, "icon":"pay-mode.ico", "index":[2, 8]},
18 19 {"res_id":5, "auth_id":1040, "icon":"", "index":[3]},
19 20 {"res_id":50001, "auth_id":104001, "icon":"user.ico", "index":[3, 0]},
20 21 {"res_id":50002, "auth_id":104002, "icon":"role.ico", "index":[3, 1]},
21 22 {"res_id":50003, "auth_id":104003, "icon":"para.ico", "index":[3, 2]},
22 23 {"res_id":50004, "auth_id":104004, "icon":"log.ico", "index":[3, 3]},
23   - {"res_id":50005, "auth_id":104005, "icon":"pay-mode.ico", "index":[3, 4]},
24 24 {"res_id":11001, "auth_id":0, "icon":"exit.ico", "index":[]},
25 25 {"res_id":11002, "auth_id":0, "icon":"modify_account_pwd.ico", "index":[]}
26 26 ]
27 27 \ No newline at end of file
... ...
central_clearing_system/ETradeClient.rc
  View file @f34b379
... ... @@ -96,8 +96,10 @@ BEGIN
96 96 MENUITEM "免密协议", ID_AGREEMENT
97 97 MENUITEM "代卖货管理", ID_TAPE_HANDLE
98 98 MENUITEM "扣点白名单", ID_KOUDIAN_WHITE_LIST
  99 + MENUITEM SEPARATOR
99 100 MENUITEM "支付黑名单", ID_PAY_BLACK_LIST
100 101 MENUITEM "支付白名单", ID_PAY_WHITE_LIST
  102 + MENUITEM "支付方式管理", ID_PAY_MANAGE
101 103 END
102 104 POPUP "系统设置"
103 105 BEGIN
... ... @@ -105,7 +107,6 @@ BEGIN
105 107 MENUITEM "角色管理", ID_ROLE_MANAGE
106 108 MENUITEM "参数设置", ID_PARAM_SET
107 109 MENUITEM "操作日志", ID_LOG
108   - MENUITEM "支付方式管理", ID_PAY_MANAGE
109 110 END
110 111 END
111 112  
... ... @@ -284,8 +285,8 @@ END
284 285 //
285 286  
286 287 VS_VERSION_INFO VERSIONINFO
287   - FILEVERSION 2,0,0,10
288   - PRODUCTVERSION 2,0,0,10
  288 + FILEVERSION 2,0,0,11
  289 + PRODUCTVERSION 2,0,0,11
289 290 FILEFLAGSMASK 0x3fL
290 291 #ifdef _DEBUG
291 292 FILEFLAGS 0x1L
... ... @@ -302,12 +303,12 @@ BEGIN
302 303 BEGIN
303 304 VALUE "CompanyName", "地利集团【DILI GROUP】"
304 305 VALUE "FileDescription", "电子交易结算综合业务系统"
305   - VALUE "FileVersion", "2.0.0.10"
306   - VALUE "InternalName", "Central-Clearing-System_2.0.10.181115_Release"
  306 + VALUE "FileVersion", "2.0.0.11"
  307 + VALUE "InternalName", "Central-Clearing-System_2.0.11.181115_Release"
307 308 VALUE "LegalCopyright", "(C) 地利集团。 保留所有权利。"
308   - VALUE "OriginalFilename", "Central-Clearing-System_2.0.10.181115_Release"
309   - VALUE "ProductName", "Central-Clearing-System_2.0.10.181115_Release"
310   - VALUE "ProductVersion", "2.0.0.10"
  309 + VALUE "OriginalFilename", "Central-Clearing-System_2.0.11.181115_Release"
  310 + VALUE "ProductName", "Central-Clearing-System_2.0.11.181115_Release"
  311 + VALUE "ProductVersion", "2.0.0.11"
311 312 END
312 313 END
313 314 BLOCK "VarFileInfo"
... ...
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
  View file @f34b379
... ... @@ -136,7 +136,7 @@ namespace HW
136 136 LOG_TRACE(L"Ö´ÐÐÓ²¼þµ÷ÓÃÇëÇó:" + str_2_wstr("[" + hw_req.cmd + "," + hw_req.file_id + "," + hw_req.seq + "]"));
137 137 HardwareCmd::Reply reply;
138 138 std::string answer = "";
139   -
  139 +
140 140 reply = m_hw_cmd_map.at(hw_req.cmd + hw_req.file_id).Execute(hw_req.data);
141 141  
142 142 if (boost::iequals(OK, reply.error_code)) // Succeed.
... ...
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
  View file @f34b379
... ... @@ -1690,9 +1690,9 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1690 1690 normal_font.CreatePointFont(200, L"宋体");
1691 1691 //
1692 1692  
1693   - const int FirstPageCommCount = 5; //如果有多页第一页商品数为6
1694   - const int NormalPageCommCount = 10; //非第一页和最后一页，其他页的商品数目
1695   - const int LastPageCommCount = 9; //最后一页最多商品数量
  1693 + const int FirstPageCommCount = /*5*/12; //如果有多页第一页商品数为13
  1694 + const int NormalPageCommCount = 19; //非第一页和最后一页，其他页的商品数目
  1695 + const int LastPageCommCount = 18; //最后一页最多商品数量
1696 1696  
1697 1697 const int TitleCtrlHIBig = 700; //表头不同组别控件横向间隔
1698 1698 const int TitleCtrlHISmall = 150; //表头同组别控件横向间隔
... ... @@ -1703,7 +1703,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1703 1703 const int CommToLineVI = 30; //商品距横线纵向间隔
1704 1704 const int NormalCommStartY = 40; //非第一页商品信息起始y坐标
1705 1705 const int CommHI = 300; //商品信息横向间隔
1706   - const int CommVI = 80; //商品信息纵向间隔
  1706 + const int CommVI = 40; //商品信息纵向间隔
1707 1707 const CPoint PagePoint(1200, 870); //页码坐标
1708 1708 const CPoint TitleStartPoint(600, 50);//表名起始坐标
1709 1709 const CPoint TitleCtrlStartPoint(100, 150);//表头控件起始坐标
... ... @@ -1755,7 +1755,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1755 1755 x_point += CommHI;
1756 1756 dc->TextOut(x_point, y_point, CountText);
1757 1757 x_point += CommHI;
1758   - dc->TextOut(x_point, y_point, PlaceText);
  1758 + dc->TextOut(x_point + 30, y_point, PlaceText);
1759 1759 x_point += CommHI;
1760 1760 dc->TextOut(x_point, y_point, BrandText);
1761 1761 //
... ... @@ -1776,7 +1776,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1776 1776 CString pagination;//页码文本
1777 1777  
1778 1778 // 打印第一页
1779   - int first_page_comm = page_count > 1 ? FirstPageCommCount + 1 : comm_count; //第一页不分页最多有5条商品，分页最多有6条商品
  1779 + int first_page_comm = comm_count > FirstPageCommCount + 1 ? FirstPageCommCount + 1 : comm_count; //第一页不分页最多有5条商品，分页最多有6条商品
1780 1780 int comm_index = 0;
1781 1781 for (; comm_index < first_page_comm; ++comm_index)
1782 1782 {
... ... @@ -1786,7 +1786,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1786 1786 x_point += CommHI;
1787 1787 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
1788 1788 x_point += CommHI;
1789   - dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
  1789 + dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
1790 1790 x_point += CommHI;
1791 1791 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
1792 1792 }
... ... @@ -1811,7 +1811,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1811 1811 x_point += CommHI;
1812 1812 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
1813 1813 x_point += CommHI;
1814   - dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
  1814 + dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
1815 1815 x_point += CommHI;
1816 1816 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
1817 1817 y_point += CommVI;
... ... @@ -1834,7 +1834,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
1834 1834 x_point += CommHI;
1835 1835 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
1836 1836 x_point += CommHI;
1837   - dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
  1837 + dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
1838 1838 x_point += CommHI;
1839 1839 dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
1840 1840 y_point += CommVI;
... ...
central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp
  View file @f34b379
... ... @@ -82,7 +82,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
82 82 ON_COMMAND(ID_MODIFY_PASSWORD, OnModifyPwd)
83 83 ON_UPDATE_COMMAND_UI(USER_MESSAGE, &CMainFrame::OnUpdateToolBarMsgCount)
84 84  
85   - ON_COMMAND_RANGE(ID_ORDER, ID_PAY_MANAGE, OnMenuBtnClicked)
  85 + ON_COMMAND_RANGE(ID_ORDER, ID_LOG, OnMenuBtnClicked)
86 86 ON_COMMAND_RANGE(RELOAD, HOMEPAGE, OnToolBarBtnClicked)
87 87  
88 88 ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired)
... ...
central_clearing_system/Resource.h
  View file @f34b379
... ... @@ -92,7 +92,6 @@
92 92 #define ID_ACCELERATOR_F 32886
93 93 #define ID_ACCELERATOR_X 32887
94 94 #define ID_ACCELERATOR_A 32895
95   -
96 95 #define ID_POINT_RULE 40001
97 96 #define ID_CATEGORY_RULE 40002
98 97 #define ID_AGREEMENT 40003
... ... @@ -100,51 +99,20 @@
100 99 #define ID_CREDIT 40005
101 100 #define ID_KOUDIAN_WHITE_LIST 40006
102 101 #define ID_PAY_BLACK_LIST 40007
103   -
104   -
105   -
106   -
107   -
108   -
109   -
110   -
111   -
112   -
113   -
114   -
115   -
116   -
117   -
118   -
119   -
120   -
121   -
122   -
123   -
124   -
125   -
126   -
127   -
128   -
129   -
130   -
131   -
132   -
133   -
134   -
135 102 #define ID_PAY_WHITE_LIST 40008
  103 +#define ID_PAY_MANAGE 40009
136 104 #define ID_USER_MANAGE 50001
137 105 #define ID_ROLE_MANAGE 50002
138 106 #define ID_PARAM_SET 50003
139 107 #define ID_LOG 50004
140   -#define ID_PAY_MANAGE 50005
  108 +
141 109  
142 110 // Next default values for new objects
143 111 //
144 112 #ifdef APSTUDIO_INVOKED
145 113 #ifndef APSTUDIO_READONLY_SYMBOLS
146 114 #define _APS_NEXT_RESOURCE_VALUE 333
147   -#define _APS_NEXT_COMMAND_VALUE 32907
  115 +#define _APS_NEXT_COMMAND_VALUE 32909
148 116 #define _APS_NEXT_CONTROL_VALUE 1055
149 117 #define _APS_NEXT_SYMED_VALUE 311
150 118 #endif
... ...