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

liuye
1 parent fc8da7d0
Showing 6 changed files with 26 additions and 57 deletions
central_clearing_system/Config/menu_res_auth_cfg.json
central_clearing_system/ETradeClient.rc
central_clearing_system/ETradeClient/browser/async_js_callback_handler.cpp
central_clearing_system/ETradeClient/hardware/hardware_cmd.cpp
central_clearing_system/ETradeClient/mfc_ui/MainFrm.cpp
central_clearing_system/Resource.h
@@ -13,14 +13,14 @@
 	{"res_id":40003, 	"auth_id":102003,     "icon":"agreement.ico", 			"index":[2, 2]},
 	{"res_id":40004, 	"auth_id":102004,     "icon":"consign_manage.ico", 		"index":[2, 3]},
 	{"res_id":40006, 	"auth_id":102005,     "icon":"buckle-list.ico", 		"index":[2, 4]},
-	{"res_id":40007, 	"auth_id":102006,     "icon":"pay-black-list.ico", 		"index":[2, 5]},
-	{"res_id":40008, 	"auth_id":102007,     "icon":"pay-white-list.ico", 		"index":[2, 6]},
+	{"res_id":40007, 	"auth_id":102006,     "icon":"pay-black-list.ico", 		"index":[2, 6]},
+	{"res_id":40008, 	"auth_id":102007,     "icon":"pay-white-list.ico", 		"index":[2, 7]},
+	{"res_id":40009, 	"auth_id":102008,     "icon":"pay-mode.ico", 			"index":[2, 8]},
 	{"res_id":5, 		"auth_id":1040, 	  "icon":"", 						"index":[3]},
 	{"res_id":50001, 	"auth_id":104001,     "icon":"user.ico", 				"index":[3, 0]},
 	{"res_id":50002, 	"auth_id":104002,     "icon":"role.ico", 				"index":[3, 1]},
 	{"res_id":50003, 	"auth_id":104003,     "icon":"para.ico", 				"index":[3, 2]},
 	{"res_id":50004, 	"auth_id":104004,     "icon":"log.ico", 				"index":[3, 3]},
-	{"res_id":50005, 	"auth_id":104005,     "icon":"pay-mode.ico", 			"index":[3, 4]},
 	{"res_id":11001, 	"auth_id":0,     	  "icon":"exit.ico", 				"index":[]},
 	{"res_id":11002, 	"auth_id":0,     	  "icon":"modify_account_pwd.ico",	"index":[]}
 ]
 \ No newline at end of file
@@ -96,8 +96,10 @@ BEGIN
         MENUITEM "免密协议",                        ID_AGREEMENT
         MENUITEM "代卖货管理",                       ID_TAPE_HANDLE
         MENUITEM "扣点白名单",                       ID_KOUDIAN_WHITE_LIST
+        MENUITEM SEPARATOR
         MENUITEM "支付黑名单",                       ID_PAY_BLACK_LIST
         MENUITEM "支付白名单",                       ID_PAY_WHITE_LIST
+        MENUITEM "支付方式管理",                      ID_PAY_MANAGE
     END
     POPUP "系统设置"
     BEGIN
@@ -105,7 +107,6 @@ BEGIN
         MENUITEM "角色管理",                        ID_ROLE_MANAGE
         MENUITEM "参数设置",                        ID_PARAM_SET
         MENUITEM "操作日志",                        ID_LOG
-        MENUITEM "支付方式管理",                      ID_PAY_MANAGE
     END
 END
@@ -284,8 +285,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,10
- PRODUCTVERSION 2,0,0,10
+ FILEVERSION 2,0,0,11
+ PRODUCTVERSION 2,0,0,11
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -302,12 +303,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.10"
-            VALUE "InternalName", "Central-Clearing-System_2.0.10.181115_Release"
+            VALUE "FileVersion", "2.0.0.11"
+            VALUE "InternalName", "Central-Clearing-System_2.0.11.181115_Release"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
-            VALUE "OriginalFilename", "Central-Clearing-System_2.0.10.181115_Release"
-            VALUE "ProductName", "Central-Clearing-System_2.0.10.181115_Release"
-            VALUE "ProductVersion", "2.0.0.10"
+            VALUE "OriginalFilename", "Central-Clearing-System_2.0.11.181115_Release"
+            VALUE "ProductName", "Central-Clearing-System_2.0.11.181115_Release"
+            VALUE "ProductVersion", "2.0.0.11"
         END
     END
     BLOCK "VarFileInfo"
@@ -136,7 +136,7 @@ namespace HW
 				LOG_TRACE(L"Ö´ÐÐÓ²¼þµ÷ÓÃÇëÇó:" + str_2_wstr("[" + hw_req.cmd + "," + hw_req.file_id + "," + hw_req.seq + "]"));
 				HardwareCmd::Reply reply;
 				std::string answer = "";
-	
+
 				reply = m_hw_cmd_map.at(hw_req.cmd + hw_req.file_id).Execute(hw_req.data);
 				if (boost::iequals(OK, reply.error_code)) // Succeed.
@@ -1690,9 +1690,9 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 	normal_font.CreatePointFont(200, L"宋体");
 	//
-	const int FirstPageCommCount = 5;	//如果有多页第一页商品数为6
-	const int NormalPageCommCount = 10;	//非第一页和最后一页，其他页的商品数目
-	const int LastPageCommCount = 9;	//最后一页最多商品数量
+	const int FirstPageCommCount = /*5*/12;	//如果有多页第一页商品数为13
+	const int NormalPageCommCount = 19;	//非第一页和最后一页，其他页的商品数目
+	const int LastPageCommCount = 18;	//最后一页最多商品数量
 	const int TitleCtrlHIBig = 700;		//表头不同组别控件横向间隔
 	const int TitleCtrlHISmall = 150;	//表头同组别控件横向间隔
@@ -1703,7 +1703,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 	const int CommToLineVI = 30;		//商品距横线纵向间隔
 	const int NormalCommStartY = 40;	//非第一页商品信息起始y坐标
 	const int CommHI = 300;				//商品信息横向间隔
-	const int CommVI = 80;				//商品信息纵向间隔
+	const int CommVI = 40;				//商品信息纵向间隔
 	const CPoint PagePoint(1200, 870);	//页码坐标
 	const CPoint TitleStartPoint(600, 50);//表名起始坐标
 	const CPoint TitleCtrlStartPoint(100, 150);//表头控件起始坐标
@@ -1755,7 +1755,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 		x_point += CommHI;
 		dc->TextOut(x_point, y_point, CountText);
 		x_point += CommHI;
-		dc->TextOut(x_point, y_point, PlaceText);
+		dc->TextOut(x_point + 30, y_point, PlaceText);
 		x_point += CommHI;
 		dc->TextOut(x_point, y_point, BrandText);
 		//
@@ -1776,7 +1776,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 		CString pagination;//页码文本
 		// 打印第一页
-		int first_page_comm = page_count > 1 ? FirstPageCommCount + 1 : comm_count; //第一页不分页最多有5条商品，分页最多有6条商品
+		int first_page_comm = comm_count > FirstPageCommCount + 1 ? FirstPageCommCount + 1 : comm_count; //第一页不分页最多有5条商品，分页最多有6条商品
 		int comm_index = 0;
 		for (; comm_index < first_page_comm; ++comm_index)
 		{
@@ -1786,7 +1786,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 			x_point += CommHI;
 			dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
 			x_point += CommHI;
-			dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
+			dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
 			x_point += CommHI;
 			dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
 		}
@@ -1811,7 +1811,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 				x_point += CommHI;
 				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
 				x_point += CommHI;
-				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
+				dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
 				x_point += CommHI;
 				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
 				y_point += CommVI;
@@ -1834,7 +1834,7 @@ std::string DistributePrinterCmd::Print(std::vector&lt;OrderInfo&gt; &amp;order_vector)
 				x_point += CommHI;
 				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].amount);
 				x_point += CommHI;
-				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].place);
+				dc->TextOut(x_point + 30, y_point, iter.comm_vector[comm_index].place);
 				x_point += CommHI;
 				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
 				y_point += CommVI;
@@ -82,7 +82,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_COMMAND(ID_MODIFY_PASSWORD, OnModifyPwd)
 	ON_UPDATE_COMMAND_UI(USER_MESSAGE, &CMainFrame::OnUpdateToolBarMsgCount)
-	ON_COMMAND_RANGE(ID_ORDER, ID_PAY_MANAGE, OnMenuBtnClicked)
+	ON_COMMAND_RANGE(ID_ORDER, ID_LOG, OnMenuBtnClicked)
 	ON_COMMAND_RANGE(RELOAD, HOMEPAGE, OnToolBarBtnClicked)
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired)
@@ -92,7 +92,6 @@
 #define ID_ACCELERATOR_F                32886
 #define ID_ACCELERATOR_X                32887
 #define ID_ACCELERATOR_A                32895
-
 #define ID_POINT_RULE                   40001
 #define ID_CATEGORY_RULE                40002
 #define ID_AGREEMENT                    40003
@@ -100,51 +99,20 @@
 #define ID_CREDIT                       40005
 #define ID_KOUDIAN_WHITE_LIST           40006
 #define ID_PAY_BLACK_LIST               40007
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #define ID_PAY_WHITE_LIST               40008
+#define ID_PAY_MANAGE                   40009
 #define ID_USER_MANAGE                  50001
 #define ID_ROLE_MANAGE                  50002
 #define ID_PARAM_SET                    50003
 #define ID_LOG                          50004
-#define ID_PAY_MANAGE                   50005
+
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        333
-#define _APS_NEXT_COMMAND_VALUE         32907
+#define _APS_NEXT_COMMAND_VALUE         32909
 #define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif