feat<central-clearing-system>:新增分发打印功能，对部分菜单进行了修改

liuye
1 parent 917e2a45
Showing 10 changed files with 318 additions and 25 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
central_clearing_system/Resource/Menu/buckle-list.ico
central_clearing_system/Resource/Menu/pay-black-list.ico
central_clearing_system/Resource/Menu/pay-mode.ico
central_clearing_system/Resource/Menu/pay-white-list.ico
@@ -12,12 +12,15 @@
 	{"res_id":40002, 	"auth_id":102002,     "icon":"cate_manage.ico", 		"index":[2, 1]},
 	{"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":40005, 	"auth_id":102005,     "icon":"credt.ico", 				"index":[2, 4]},
+	{"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":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
@@ -95,7 +95,9 @@ BEGIN
         MENUITEM "品类管理",                        ID_CATEGORY_RULE
         MENUITEM "免密协议",                        ID_AGREEMENT
         MENUITEM "代卖货管理",                       ID_TAPE_HANDLE
-        MENUITEM "赊销授信管理",                      ID_CREDIT
+        MENUITEM "扣点白名单",                       ID_KOUDIAN_WHITE_LIST
+        MENUITEM "支付黑名单",                       ID_PAY_BLACK_LIST
+        MENUITEM "支付白名单",                       ID_PAY_WHITE_LIST
     END
     POPUP "系统设置"
     BEGIN
@@ -103,6 +105,7 @@ BEGIN
         MENUITEM "角色管理",                        ID_ROLE_MANAGE
         MENUITEM "参数设置",                        ID_PARAM_SET
         MENUITEM "操作日志",                        ID_LOG
+        MENUITEM "支付方式管理",                      ID_PAY_MANAGE
     END
 END
@@ -281,8 +284,8 @@ END
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,0,9
- PRODUCTVERSION 2,0,0,9
+ FILEVERSION 2,0,0,10
+ PRODUCTVERSION 2,0,0,10
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -299,12 +302,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "地利集团【DILI GROUP】"
             VALUE "FileDescription", "电子交易结算综合业务系统"
-            VALUE "FileVersion", "2.0.0.9"
-            VALUE "InternalName", "Central-Clearing-System_2.0.9.181109_Release"
+            VALUE "FileVersion", "2.0.0.10"
+            VALUE "InternalName", "Central-Clearing-System_2.0.10.181115_Release"
             VALUE "LegalCopyright", "(C) 地利集团。  保留所有权利。"
-            VALUE "OriginalFilename", "Central-Clearing-System_2.0.9.181109_Release"
-            VALUE "ProductName", "Central-Clearing-System_2.0.9.181109_Release"
-            VALUE "ProductVersion", "2.0.0.9"
+            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"
         END
     END
     BLOCK "VarFileInfo"
@@ -73,7 +73,7 @@ namespace HW
 		std::string file_id = ptree.get<std::string>(JSON_TAG_FILEID);
 		std::string data;
-		if (cmd.compare(JSON_VAL_CMD_PRINT) == 0 && file_id.compare(JSON_VAL_FILEID_ORDER) == 0)
+		if (cmd.compare(JSON_VAL_CMD_PRINT) == 0)
 		{
 			PT::ptree data_child = ptree.get_child(JSON_TAG_DATA);
 			std::ostringstream os;
@@ -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.
@@ -1254,17 +1254,6 @@ ReadPINPadCmd::Reply ReadDILIAndBankCardNumCmd::Execute(const std::string&amp; input
 	return reply;
 }
-const CString StatementNoText = L"结算单号：";
-const CString TradeTimeText = L"交易时间：";
-const CString BuyerNameText = L"买家姓名：";
-const CString SalerNameText = L"卖家姓名：";
-const CString CommNameText = L"商品名称";
-const CString PriceText = L"单价";
-const CString CountText = L"数量";
-const CString SubtotalText = L"小计/元";
-const CString ClerkText = L"结算员：";
-const CString TotalMoneyText = L"总计：";
-
 StylusPrinterCmd::Reply StylusPrinterCmd::Execute(const std::string& input)
 {
@@ -1290,6 +1279,17 @@ StylusPrinterCmd::Reply StylusPrinterCmd::Execute(const std::string&amp; input)
 std::string StylusPrinterCmd::Print(std::vector<OrderInfo> &order_vector)
 {
+	const CString StatementNoText = L"结算单号：";
+	const CString TradeTimeText = L"交易时间：";
+	const CString BuyerNameText = L"买家姓名：";
+	const CString SalerNameText = L"卖家姓名：";
+	const CString CommNameText = L"商品名称";
+	const CString PriceText = L"单价";
+	const CString CountText = L"数量";
+	const CString SubtotalText = L"小计/元";
+	const CString ClerkText = L"结算员：";
+	const CString TotalMoneyText = L"总计：";
+
 	HDC print_dc;
 	DOCINFO docin;
@@ -1624,4 +1624,255 @@ std::string DistributePrinterCmd::ParseInput(std::string &amp;input, std::vector&lt;Ord
 		result = StatusCode::PRINT_PARSE_DATA_FAILED;
 	}
 	return result;
+}
+
+DistributePrinterCmd::Reply DistributePrinterCmd::Execute(const std::string& input)
+{
+	LOG_TRACE(L"开始打印");
+	Reply reply;
+	reply.error_code = StatusCode::OK;
+
+	std::vector<OrderInfo> comm_vector;
+	do
+	{
+		LOG_TRACE(L"解析打印数据！");
+		reply.error_code = ParseInput(const_cast<std::string&>(input), comm_vector);
+		if (reply.error_code.compare(StatusCode::OK) != 0)
+		{
+			break;
+		}
+		reply.error_code = Print(comm_vector);
+	} while (0);
+
+
+	return reply;
+}
+
+std::string DistributePrinterCmd::Print(std::vector<OrderInfo> &order_vector)
+{
+	const CString RegistNoText = L"登记单号：";
+	const CString PatchNoText = L"批次号：";
+	const CString ShipNameText = L"货主姓名：";
+	const CString SheetNoText = L"进门收费单号：";
+	const CString CommNameText = L"商品名称";
+	const CString CountText = L"数量";
+	const CString PlaceText = L"产地";
+	const CString BrandText = L"品牌";
+	const CString DistributeMenText = L"分发员：";
+	const CString DistributeTimeText = L"分发时间：";
+	const CString SignText = L"客户签名：__________________";
+
+	HDC print_dc;
+	DOCINFO docin;
+
+	//设置打印机相关参数
+	docin.cbSize = sizeof(DOCINFO);
+	docin.lpszDocName = L"ETrade";
+	docin.lpszOutput = NULL;
+	CPrintDialog print_dialog(TRUE, PD_ALLPAGES | PD_NOPAGENUMS, NULL);
+	PRINTDLG *print_dlg_info = &print_dialog.m_pd;
+	AfxGetApp()->GetPrinterDeviceDefaults(print_dlg_info);
+	DEVMODE* lpDevMode = (DEVMODE*)::GlobalLock(print_dlg_info->hDevMode);
+	if (!lpDevMode)
+	{
+		return StatusCode::PRINT_GET_MACHINE_DATA_FAILED;
+	}
+	::GlobalUnlock(print_dlg_info->hDevMode);
+	lpDevMode->dmFields |= -1;
+	lpDevMode->dmPaperLength = 1397; //设定纸长为 139.7mm 
+	lpDevMode->dmPaperWidth = 2410;	 //设定纸宽为 241mm 
+	print_dc = print_dialog.CreatePrinterDC(); //返回一个打印DC句柄 
+	CDC *dc = new CDC;
+	dc->Attach(print_dc);
+	CFont title_font;
+	title_font.CreatePointFont(350, L"宋体");
+	CFont normal_font;
+	normal_font.CreatePointFont(200, L"宋体");
+	//
+
+	const int FirstPageCommCount = 5;	//如果有多页第一页商品数为6
+	const int NormalPageCommCount = 10;	//非第一页和最后一页，其他页的商品数目
+	const int LastPageCommCount = 9;	//最后一页最多商品数量
+
+	const int TitleCtrlHIBig = 700;		//表头不同组别控件横向间隔
+	const int TitleCtrlHISmall = 150;	//表头同组别控件横向间隔
+	const int TitleCtrlVI = 50;			//表头控件纵向间隔
+	const int LineStartX = 100;			//横线起点x坐标
+	const int LineLength = 1600;		//横线长度
+	const int CommStartX = 200;			//商品信息起始x坐标
+	const int CommToLineVI = 30;		//商品距横线纵向间隔
+	const int NormalCommStartY = 40;	//非第一页商品信息起始y坐标
+	const int CommHI = 300;				//商品信息横向间隔
+	const int CommVI = 80;				//商品信息纵向间隔
+	const CPoint PagePoint(1200, 870);	//页码坐标
+	const CPoint TitleStartPoint(600, 50);//表名起始坐标
+	const CPoint TitleCtrlStartPoint(100, 150);//表头控件起始坐标
+
+	//开始打印
+	StartDoc(print_dc, &docin); // 启动打印工作 
+	for (auto iter : order_vector)
+	{
+		//打印阶段单头部信息
+		StartPage(print_dc);
+
+		int y_point = TitleCtrlStartPoint.y;
+		int x_point = TitleCtrlStartPoint.x;
+
+		dc->SelectObject(&title_font);
+		dc->TextOut(TitleStartPoint.x, TitleStartPoint.y, iter.title);
+
+		dc->SelectObject(&normal_font);
+		dc->TextOut(TitleCtrlStartPoint.x, TitleCtrlStartPoint.y, RegistNoText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point, y_point, iter.reg_id);
+
+		x_point += TitleCtrlHIBig;
+		dc->TextOut(x_point, y_point, PatchNoText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point - 20, y_point, iter.sheet_id);
+
+		x_point = TitleCtrlStartPoint.x;
+		y_point += TitleCtrlVI;
+		dc->TextOut(x_point, y_point, ShipNameText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point, y_point, iter.seller_name);
+
+		x_point += TitleCtrlHIBig;
+		dc->TextOut(x_point, y_point, SheetNoText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point + 40, y_point, iter.entry_fee);
+
+		y_point += TitleCtrlVI;
+		dc->MoveTo(LineStartX, y_point);
+		x_point += LineLength;
+		dc->LineTo(x_point, y_point);
+		//
+
+		//打印商品信息头
+		x_point = CommStartX;
+		y_point += CommToLineVI;
+		dc->TextOut(x_point, y_point, CommNameText);
+		x_point += CommHI;
+		dc->TextOut(x_point, y_point, CountText);
+		x_point += CommHI;
+		dc->TextOut(x_point, y_point, PlaceText);
+		x_point += CommHI;
+		dc->TextOut(x_point, y_point, BrandText);
+		//
+
+		//计算页数
+		int comm_count = iter.comm_vector.size();
+		int page_count = 0;
+		if (comm_count <= FirstPageCommCount)
+		{
+			page_count = 1;
+		}
+		else
+		{
+			page_count = (comm_count - FirstPageCommCount - 1) / NormalPageCommCount + 2;
+		}
+		//
+
+		CString pagination;//页码文本
+
+		// 打印第一页
+		int first_page_comm = page_count > 1 ? FirstPageCommCount + 1 : comm_count; //第一页不分页最多有5条商品，分页最多有6条商品
+		int comm_index = 0;
+		for (; comm_index < first_page_comm; ++comm_index)
+		{
+			y_point += CommVI;
+			x_point = CommStartX;
+			dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].product_name);
+			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);
+			x_point += CommHI;
+			dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
+		}
+
+		if (page_count > 1)
+		{
+			pagination.Format(L"%d/%d", 1, page_count);
+			dc->TextOut(PagePoint.x, PagePoint.y, pagination);
+			dc->EndPage();
+		}
+		//
+
+		//打印除第一页和最后一页的其余页数
+		for (int index = 1; index < page_count - 1; ++index)
+		{
+			StartPage(print_dc);
+			y_point = NormalCommStartY;
+			for (int comm = 0; comm < NormalPageCommCount; ++comm, ++comm_index)
+			{
+				x_point = CommStartX;
+				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].product_name);
+				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);
+				x_point += CommHI;
+				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
+				y_point += CommVI;
+			}
+			pagination.Format(L"%d/%d", index + 1, page_count);
+			dc->TextOut(PagePoint.x, PagePoint.y, pagination);
+			dc->EndPage();
+		}
+		//
+
+		//打印最后一页
+		if (page_count > 1)
+		{
+			StartPage(print_dc);
+			y_point = NormalCommStartY;
+			for (; comm_index < comm_count; ++comm_index)
+			{
+				x_point = CommStartX;
+				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].product_name);
+				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);
+				x_point += CommHI;
+				dc->TextOut(x_point, y_point, iter.comm_vector[comm_index].brand);
+				y_point += CommVI;
+			}
+		}
+
+		x_point = LineStartX;
+		y_point += CommVI;
+		dc->MoveTo(x_point, y_point);
+		x_point += LineLength;
+		dc->LineTo(x_point, y_point);
+
+		x_point = TitleCtrlStartPoint.x;
+		y_point += CommToLineVI;
+		dc->TextOut(x_point, y_point, DistributeMenText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point - 30, y_point, iter.dis_name);
+
+		x_point += TitleCtrlHIBig / 3;
+		dc->TextOut(x_point, y_point, DistributeTimeText);
+		x_point += TitleCtrlHISmall;
+		dc->TextOut(x_point, y_point, iter.dis_date);
+
+		x_point += TitleCtrlHIBig * 2 / 3;
+		dc->TextOut(x_point, y_point, SignText);
+
+		pagination.Format(L"%d/%d", page_count, page_count);
+		dc->TextOut(PagePoint.x, PagePoint.y, pagination);
+
+		EndPage(print_dc);
+	}
+
+	title_font.DeleteObject();
+	normal_font.DeleteObject();
+
+	EndDoc(print_dc);//结束打印
+	DeleteDC(print_dc);
+	delete dc;
+
+	return StatusCode::OK;
 }
 \ No newline at end of file
@@ -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_LOG, OnMenuBtnClicked)
+	ON_COMMAND_RANGE(ID_ORDER, ID_PAY_MANAGE, OnMenuBtnClicked)
 	ON_COMMAND_RANGE(RELOAD, HOMEPAGE, OnToolBarBtnClicked)
 	ON_MESSAGE(WM_CEF_SESSION_EXPIRED, OnSessionExpired)
@@ -92,23 +92,59 @@
 #define ID_ACCELERATOR_F                32886
 #define ID_ACCELERATOR_X                32887
 #define ID_ACCELERATOR_A                32895
-#define ID_ACCELERATOR32896             32896
+
 #define ID_POINT_RULE                   40001
 #define ID_CATEGORY_RULE                40002
 #define ID_AGREEMENT                    40003
 #define ID_TAPE_HANDLE                  40004
 #define ID_CREDIT                       40005
+#define ID_KOUDIAN_WHITE_LIST           40006
+#define ID_PAY_BLACK_LIST               40007
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#define ID_PAY_WHITE_LIST               40008
 #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         32898
+#define _APS_NEXT_COMMAND_VALUE         32907
 #define _APS_NEXT_CONTROL_VALUE         1055
 #define _APS_NEXT_SYMED_VALUE           311
 #endif