diff --git a/C_TDSet.cpp b/C_TDSet.cpp
index eb54b68..7da1565 100644
--- a/C_TDSet.cpp
+++ b/C_TDSet.cpp
@@ -452,7 +452,7 @@ BOOL CC_TDSet::OnInitDialog()
 	m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_MANAGER) );
 	m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_LOCK) );
 	m_wndList.SubClassWindow2();
-	m_wndList.SetHeadings(_T("序号,50;通道名称,100;接入号,150;网关账号,120;启用,60;默认,60;能力,60;运营商,90;序列号,80;通道号,80;SendRet,80;补发级别,80;当日短信量,100;失败率,80;当月短信量,100;失败率,80;备注,200;"));
+	m_wndList.SetHeadings(_T("序号,50;通道名称,100;接入号,150;网关账号,120;启用,60;默认,60;能力,60;运营商,90;序列号,80;通道号,80;SendRet,80;补发次序,80;当日短信量,100;失败率,80;当月短信量,100;失败率,80;备注,200;"));
 	m_wndList.SetGridLines(true);
 	m_wndList.SetImageList(&m_Image,LVSIL_SMALL);
 
diff --git a/DLG_GZMsg_JL.cpp b/DLG_GZMsg_JL.cpp
index 6631bd4..c273da4 100644
--- a/DLG_GZMsg_JL.cpp
+++ b/DLG_GZMsg_JL.cpp
@@ -33,6 +33,7 @@ void DLG_GZMsg_JL::DoDataExchange(CDataExchange* pDX)
 	DDX_Control(pDX, IDD_K_GZMSG_JL_PK2, m_wndPK2);
 	DDX_Control(pDX, IDD_K_GZMSG_JL_PKRATIO, m_wndPKRatio);
 	DDX_Control(pDX, IDD_K_GZMSG_JL_TYPE, m_wndType);
+	DDX_Control(pDX, IDD_K_GZMSG_JL_ADDLIST, m_B_AddList);
 }
 
 
@@ -42,6 +43,7 @@ BEGIN_MESSAGE_MAP(DLG_GZMsg_JL, CDialogEx)
 	ON_COMMAND(MENU_GZMSG_JL_COPY, On_GZMsg_Copy)
 	ON_COMMAND(MENU_GZMSG_JL_DEL, On_GZMsg_Del)
 	ON_CBN_SELCHANGE(IDD_K_GZMSG_JL_TYPE, &DLG_GZMsg_JL::OnSelchangeIddKGzmsgJlType)
+	ON_BN_CLICKED(IDD_K_GZMSG_JL_INPORTMMDCOUNT, &DLG_GZMsg_JL::OnBnClickedKGzmsgJlInportmmdcount)
 END_MESSAGE_MAP()
 
 
@@ -63,7 +65,7 @@ void DLG_GZMsg_JL::OnBnClickedKGzmsgJlQuery()
 	{
 		if (pJL->lPK1 == pJL->lPK2)
 		{
-			MessageBox(_T("鎸戞垬鑰呬笌琚寫鎴樿�呬笉鑳界浉鍚岋紒"), _T("閿欒"), MB_ICONWARNING);
+			MessageBox(_T("鎸戞垬鑰呬笌搴旀垬鑰呬笉鑳界浉鍚岋紒"), _T("閿欒"), MB_ICONWARNING);
 			m_wndPK1.SetFocus();
 			return;
 		}
@@ -79,6 +81,16 @@ void DLG_GZMsg_JL::OnBnClickedKGzmsgJlQuery()
 			m_wndPK1.SetFocus();
 			return;
 		}
+
+		long lColumeCount = m_wndList.GetColumnCount();
+		if (m_B_AddList.GetCheck() && m_wndList.GetColumnCount() != 8)
+		{
+
+			m_wndList.DeleteAllItems();
+			m_wndList.DeleteAllColumns();
+			m_wndList.SetHeadings(_T("搴忓彿,50; 鎸戞垬鑰�,150;琚寫鎴樿��,150;鎸戞垬鐩爣,100;鎸戞垬缁撴灉,150; 璧㈡柟,150;鎸戞垬鑰�-涓氱哗宸�,200;琚寫鎴樿��-涓氱哗宸�,200;"));
+		}
+
 	}
 
 	m_pMainFrame->SendFrame(SMSFUNC_GZMSG_JL, (BYTE*)pJL, sizeof(REQ_GZMsg_JL));
@@ -105,6 +117,341 @@ BOOL DLG_GZMsg_JL::ProcessSocket(Socket_Head_Add *pHead, BYTE* pFrame)
 			return true;
 		}
 
+		if (pJL->lType == 0)
+		{
+			CString str;
+			m_wndList.DeleteAllItems();
+			m_wndList.DeleteAllColumns();
+			//2025骞存柊鐨勮瘎姣旇鍒�
+			if (m_lShowType == 1)
+				m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100; 涔堜箞鍝�,80;  A鍊�,80;  B鍊�,80;鏈湀寰楀垎,100;   澶囨敞,120;"));
+			else
+				m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100;  涓氱哗,100; 涔堜箞鍝�,80;  A鍊�,80;  B鍊�,80;鏈湀寰楀垎,100;   澶囨敞,120;"));
+
+			for (int i = 0; i < pJL->lCount; i++)
+			{
+				str.Format(_T("%d"), i + 1);
+				m_wndList.InsertItem(i, str, 0);
+				int iTemp = 1;
+				m_wndList.SetItemText(i, iTemp++, pJLData->szGroupName);
+				m_wndList.SetItemText(i, iTemp++, pJLData->szYWYName);
+				str.Format(_T("%04d骞�%02d鏈�"), pJLData->tMon1.wYear, pJLData->tMon1.wMonth);
+				m_wndList.SetItemText(i, iTemp++, str);
+
+				if (m_lShowType != 1)
+				{
+					str.Format(_T("%10.2f"), pJLData->fYZ1);
+					m_wndList.SetItemText(i, iTemp++, str);
+				}
+				str.Format(_T("%8d"), pJLData->lMMDCount);
+				m_wndList.SetItemText(i, iTemp++, str);
+
+				str.Format(_T("%8.2f"), pJLData->fA1);
+				m_wndList.SetItemText(i, iTemp++, str);
+				str.Format(_T("%8.2f"), pJLData->fB1);
+				m_wndList.SetItemText(i, iTemp++, str);
+
+				str.Format(_T("%9.2f"), pJLData->fAvg);
+				m_wndList.SetItemText(i, iTemp++, str);
+
+				if (pJLData->bUnconfirmed)
+				{
+					m_wndList.SetItemText(i, iTemp++, _T("鍚湭纭涓氱哗"));
+				}
+				else
+				{
+					if (pJLData->fAvg < 50.0f)
+					{
+						m_wndList.SetItemText(i, iTemp++, _T("杩涙绌洪棿宸ㄥぇ"));
+					}
+
+				}
+				pJLData++;
+			}
+		}
+		if (pJL->lType == 1)
+		{
+
+			if (m_B_AddList.GetCheck())
+			{
+				CString str;
+				long lItem = m_wndList.GetItemCount();
+
+				str.Format(_T("%d"), lItem + 1);
+				m_wndList.InsertItem(lItem, str, 0);
+				int iTemp = 1;
+				//m_wndList.SetHeadings(_T("搴忓彿,50; 鎸戞垬鑰�,150;琚寫鎴樿��,150;鎸戞垬鐩爣,100;鎸戞垬缁撴灉,150; 璧㈡柟,150;鎸戞垬鑰�-涓氱哗宸�,200;琚寫鎴樿��-涓氱哗宸�,200;"));
+				m_wndList.SetItemText(lItem, iTemp++, pJLData2->szPK1);
+				m_wndList.SetItemText(lItem, iTemp++, pJLData2->szPK2);
+				str.Format(_T("%10.0f%%"), pJLData2->fAddRatio * 100.0f);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				CString strResult;
+				CString strWinner;
+				if (pJLData2->bWin)
+				{
+					strResult = _T("鎸戞垬鎴愬姛锛侊紒");
+					strWinner = pJLData2->szPK1;
+				}
+				else
+				{
+					strResult = _T("鎸戞垬澶辫触锛侊紒");
+					strWinner = pJLData2->szPK2;
+				}
+				m_wndList.SetItemText(lItem, iTemp++, strResult);
+				m_wndList.SetItemText(lItem, iTemp++, strWinner);
+
+				str.Format(_T("%10.2f"), pJLData2->fWin1YZ);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				str.Format(_T("%10.2f"), pJLData2->fWin2YZ);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+			}
+			else
+			{
+				m_wndList.DeleteAllItems();
+				m_wndList.DeleteAllColumns();
+				m_wndList.SetHeadings(_T("椤圭洰,200; 鍐呭,450;"));
+
+				CString str;
+				int iTemp = 0;
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+				str.Format(_T("    %s PK缁撴灉"), pJL->szMon);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+
+				if (pJLData2->bPK1Unconfirmed)
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�(鍚湭纭涓氱哗)"), 1);
+				else
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�"), 1);
+				m_wndList.SetItemText(iTemp - 1, 1, pJLData2->szPK1);
+				if (pJLData2->bPK1Unconfirmed)
+					m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�(鍚湭纭涓氱哗)"), 1);
+				else
+					m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�"), 1);
+				m_wndList.SetItemText(iTemp - 1, 1, pJLData2->szPK2);
+
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬鐩爣"), 1);
+				str.Format(_T("%10.0f%%"), pJLData2->fAddRatio * 100.0f);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+				if (m_lShowType != 1)
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囦笟缁�"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fPK1Pre3);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+
+					m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囦笟缁�"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fPK2Pre3);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+					m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囦箞涔堝搾"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fPK1MMDCount);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+
+					m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囦箞涔堝搾"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fPK2MMDCount);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+					m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+				}
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囧緱鍒�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK1Now);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囧緱鍒�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK2Now);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+				if (m_lShowType != 1)
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-鍒嗘暟宸�"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fWin1Score);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+
+					m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-鍒嗘暟宸�"), 1);
+					str.Format(_T("%10.2f"), pJLData2->fWin2Score);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+					m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+				}
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-涓氱哗宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin1YZ);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-涓氱哗宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin2YZ);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-涔堜箞鍝掑樊"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin1MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-涔堜箞鍝掑樊"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin2MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+				m_wndList.InsertItem(iTemp++, _T(""), 1);  //绌鸿
+
+
+				if (pJLData2->bWin)
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬鎴愬姛锛侊紒"), 0);
+					str.Format(_T("璧㈡柟锛�%s"), pJLData2->szPK1);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+				}
+				else
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬澶辫触锛侊紒"), 1);
+					m_wndList.SetItemText(iTemp - 1, 1, _T("鎸戞垬澶辫触锛侊紒"));
+					str.Format(_T("璧㈡柟锛�%s"), pJLData2->szPK2);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+				}
+			}
+
+			//鏃фā寮忥紝鍒嗗垪琛ㄦ樉绀轰笌琛ㄦ牸鏄剧ず銆�
+			//2025骞村洜涓哄彧鏈夋垬闃烶K锛岀粺涓�鏀规垚鍙敤琛ㄦ牸鏄剧ず
+			/*
+			if (m_lShowType == 1)
+			{
+				CString str;
+				long lItem = m_wndList.GetItemCount();
+
+				str.Format(_T("%d"), lItem + 1);
+				m_wndList.InsertItem(lItem, str, 0);
+				int iTemp = 1;
+				//m_wndList.SetHeadings(_T("搴忓彿,50;鏈堜唤,100; 鎸戞垬闃�,150; 搴旀垬闃�,150;鎸戞垬鐩爣,80;鎸戞垬缁撴灉,120;  璧㈡柟,150;鎸戞垬闃熷垎鏁�,100;搴旀垬闃熷垎鏁�,100;鎸戞垬涓氱哗宸�,100;搴旀垬涓氱哗宸�,100;鎸戞垬涔堜箞鍝掑樊,100;搴旀垬涔堜箞鍝掑樊,100;"));
+				m_wndList.SetItemText(lItem, iTemp++, pJL->szMon);
+				m_wndList.SetItemText(lItem, iTemp++, pJLData2->szPK1);
+				m_wndList.SetItemText(lItem, iTemp++, pJLData2->szPK2);
+				str.Format(_T("%6.0f%%"), pJLData2->fAddRatio*100.0f);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				CString strResult;
+				CString strWinner;
+				if (pJLData2->bWin)
+				{
+					strResult = _T("鎸戞垬鎴愬姛锛侊紒");
+					strWinner = pJLData2->szPK1;
+				}
+				else
+				{
+					strResult = _T("鎸戞垬澶辫触锛侊紒");
+					strWinner = pJLData2->szPK2;
+				}
+				m_wndList.SetItemText(lItem, iTemp++, strResult);
+				m_wndList.SetItemText(lItem, iTemp++, strWinner);
+
+				str.Format(_T("%10.2f"), pJLData2->fWin1Score);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				str.Format(_T("%10.2f"), pJLData2->fWin2Score);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+
+				str.Format(_T("%10.2f"), pJLData2->fWin1YZ);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				str.Format(_T("%10.2f"), pJLData2->fWin2YZ);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+
+				str.Format(_T("%10.2f"), pJLData2->fWin1MMDCount);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+				str.Format(_T("%10.2f"), pJLData2->fWin2MMDCount);
+				m_wndList.SetItemText(lItem, iTemp++, str);
+			}
+			else
+			{
+				m_wndList.DeleteAllItems();
+				m_wndList.DeleteAllColumns();
+				m_wndList.SetHeadings(_T("椤圭洰,250; 鍐呭,450;"));
+
+				CString str;
+				int iTemp = 0;
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+				str.Format(_T("    %s PK缁撴灉"), pJL->szMon);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+				m_wndList.InsertItem(iTemp++, _T(""), 1);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�"), 1);
+				m_wndList.SetItemText(iTemp - 1, 1, pJLData2->szPK1);
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�"), 1);
+				m_wndList.SetItemText(iTemp - 1, 1, pJLData2->szPK2);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬鐩爣"), 1);
+				str.Format(_T("%10.0f%%"), pJLData2->fAddRatio*100.0f);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囦笟缁�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK1Pre3);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囦笟缁�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK2Pre3);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囦箞涔堝搾"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK1MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囦箞涔堝搾"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK2MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃熷钩鍧囧緱鍒�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK1Now);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃熷钩鍧囧緱鍒�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fPK2Now);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-鍒嗘暟宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin1Score);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-鍒嗘暟宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin2Score);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-涓氱哗宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin1YZ);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-涓氱哗宸�"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin2YZ);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("鎸戞垬闃�-涔堜箞鍝掑樊"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin1MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+				m_wndList.InsertItem(iTemp++, _T("搴旀垬闃�-涔堜箞鍝掑樊"), 1);
+				str.Format(_T("%10.2f"), pJLData2->fWin2MMDCount);
+				m_wndList.SetItemText(iTemp - 1, 1, str);
+
+
+				if (pJLData2->bWin)
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬鎴愬姛锛侊紒"), 0);
+					str.Format(_T("璧㈡柟锛�%s"), pJLData2->szPK1);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+				}
+				else
+				{
+					m_wndList.InsertItem(iTemp++, _T("鎸戞垬澶辫触锛侊紒"), 1);
+					m_wndList.SetItemText(iTemp - 1, 1, _T("鎸戞垬澶辫触锛侊紒"));
+					str.Format(_T("璧㈡柟锛�%s"), pJLData2->szPK2);
+					m_wndList.SetItemText(iTemp - 1, 1, str);
+				}
+			}
+			*/
+		}
+
+		/*  2024骞村墠鏃х殑璇勬瘮瑙勫垯
 		if (pJL->lType == 0)
 		{
 			CString str;
@@ -114,8 +461,6 @@ BOOL DLG_GZMsg_JL::ProcessSocket(Socket_Head_Add *pHead, BYTE* pFrame)
 				m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100;  涓婃湀,100;涓婃湀寰楀垎,100;  鏈湀,100;  鏈湀A,100;  鏈湀B,100;  鏈湀C,100;鏈湀鎬诲垎,100;   骞冲潎鍒�,100;"));
 			else
 				m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100;  涓婃湀,100;骞冲潎涓氱哗,100;骞冲潎瀹㈡埛,80;涓婃湀涓氱哗,100;涓婃湀瀹㈡埛,80;  涓婃湀A,100;  涓婃湀B,100;  涓婃湀C,100;涓婃湀鎬诲垎,100;  鏈湀,100;骞冲潎涓氱哗,100;骞冲潎瀹㈡埛,80;鏈湀涓氱哗,100;鏈湀瀹㈡埛,80;  鏈湀A,100;  鏈湀B,100;  鏈湀C,100;鏈湀鎬诲垎,100;   骞冲潎鍒�,100;"));
-
-
 			for (int i = 0; i < pJL->lCount; i++)
 			{
 				str.Format(_T("%d"), i + 1);
@@ -281,7 +626,50 @@ BOOL DLG_GZMsg_JL::ProcessSocket(Socket_Head_Add *pHead, BYTE* pFrame)
 				}
 			}
 		}
+		*/
+		return true;
+	}
 
+	if (pHead->lFuncType == SMSFUNC_GZMSG_JL_MMDCOUNT)
+	{
+		ANS_GZMsg_JL_MMDCount* pRet = (ANS_GZMsg_JL_MMDCount*)pFrame;
+		ANS_GZMsg_JL_MMDCount_Data* pRetData = (ANS_GZMsg_JL_MMDCount_Data*)(pFrame + sizeof(ANS_GZMsg_JL_MMDCount));
+
+		if (pRet->lErrCode !=0 )
+		{
+			str.Format(_T("璁剧疆涔堜箞鍝掓暟鎹け璐ワ細%d - %s"), pRet->lErrCode,pRet->szErrMsg);
+			MessageBox(str, _T("閿欒"), MB_ICONERROR);
+			return true;
+		}
+		//鐢熸垚鏄剧ず鐨勬暟鎹�
+		CString strShowText;
+		long lShowTextCount = 0;
+		for (int i = 0; i < pRet->lCount && i<16; i++)
+		{
+			str.Format(_T("%-10s%6d"), pRetData[i].szYWYName, pRetData[i].lMMDCount);
+			if (lShowTextCount <= 0)
+			{
+				strShowText += str;
+				lShowTextCount++;
+			}
+			else
+			{
+				if (lShowTextCount >= 2)
+				{
+					strShowText = strShowText + _T("  |  ") + str;
+					strShowText.Append(_T("\r\n"));
+					lShowTextCount = 0;
+				}
+				else
+				{
+					strShowText = strShowText + _T("  |  ") + str;
+					lShowTextCount++;
+				}
+			}
+		}
+
+		str.Format(_T("宸插鍏�%s鐨勪箞涔堝搾鏁版嵁锛屽叡瀵煎叆%d涓暟鎹細\r\n\r\n%s"), pRet->szMon, pRet->lCount,strShowText);
+		MessageBox(str, _T("淇℃伅"), MB_ICONINFORMATION);
 		return true;
 	}
 	return false;
@@ -312,10 +700,18 @@ BOOL DLG_GZMsg_JL::OnInitDialog()
 	m_Image.Add(AfxGetApp()->LoadIcon(IDI_L_SWTSQ));
 
 	m_wndList.SubClassWindow2();
+	//2025骞存柊鐨勮瘎姣旇鍒�
+	if (m_lShowType == 1)
+		m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100;涔堜箞鍝�,80;  A鍊�,100;  B鍊�,100; 鏈湀寰楀垎,100;"));
+	else
+		m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100;  涓氱哗,100;涔堜箞鍝�,80;  A鍊�,100;  B鍊�,100; 鏈湀寰楀垎,100;"));
+
+	/*  2024骞村墠鏃х殑璇勬瘮瑙勫垯
 	if (m_lShowType == 1)
 		m_wndList.SetHeadings(_T("搴忓彿,50; 鎸戞垬鑰�,150;琚寫鎴樿��,150;鎸戞垬鐩爣,100;鎸戞垬缁撴灉,150; 璧㈡柟,150;鎸戞垬鑰�-涓氱哗宸�,200;琚寫鎴樿��-涓氱哗宸�,200;"));
 	else
 		m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100;  涓婃湀,100;  涓婃湀A,100;  涓婃湀B,100;  涓婃湀C,100;涓婃湀鎬诲垎,100;  鏈湀,100;  鏈湀A,100;  鏈湀B,100;  鏈湀C,100;鏈湀鎬诲垎,100;   骞冲潎鍒�,100;"));
+	*/
 	m_wndList.SetGridLines(true);
 	m_wndList.SetImageList(&m_Image, LVSIL_SMALL);
 
@@ -326,10 +722,12 @@ BOOL DLG_GZMsg_JL::OnInitDialog()
 	{
 		return true;
 	}
+
 	if (m_lShowType == 1)
 		m_wndType.SetCurSel(1);
 	else
 		m_wndType.SetCurSel(0);
+
 	ANS_GZMsg_JL_PARA_DATE * pMon = pData;
 	for (int i = 0; i < pPara->lMonCount; i++)
 	{
@@ -346,34 +744,56 @@ BOOL DLG_GZMsg_JL::OnInitDialog()
 	m_wndPKRatio.SetCurSel(0);
 	pData += pPara->lPKRatioCount;
 
+	//浠ヤ笅涓烘坊鍔燩K鐨勯槦鍛樹俊鎭紝骞朵笖鑷姩鍖归厤閫夋嫨瀵规墜
 	ANS_GZMsg_JL_PARA_DATE * pYWY = pData;
+	int iPK1Sel = 0;
+	int iPK2Sel = 0;
+	int iPK1SelID = 0;
+	int iPK2SelID = 0;
 	for (int i = 0; i < pPara->lYWYCount; i++)
 	{
 		int iItem = m_wndPK1.AddString(pYWY[i].szName);
 		m_wndPK1.SetItemData(iItem, pYWY[i].lYWYID);
-
 		iItem = m_wndPK2.AddString(pYWY[i].szName);
 		m_wndPK2.SetItemData(iItem, pYWY[i].lYWYID);
-	}
-	m_wndPK1.SetCurSel(0);
-	m_wndPK2.SetCurSel(0);
 
+		if (i == 0)
+		{
+			iPK1SelID = pYWY[i].lYWYID;
+			iPK1Sel = 0;
+		}
+		else
+		{
+			if (iPK2Sel<=0 && iPK1SelID < 500000 && pYWY[i].lYWYID< 500000)  //鍚岀被鍨嬬殑
+			{
+				iPK2Sel = i;
+			}
+			if (iPK2Sel <= 0 && iPK1SelID >= 500000 && pYWY[i].lYWYID >= 500000)  //鍚岀被鍨嬬殑
+			{
+				iPK2Sel = i;
+			}
+
+		}
+	}
+
+	m_wndPK1.SetCurSel(iPK1Sel);
+	m_wndPK2.SetCurSel(iPK2Sel);
+
+
+	OnSelchangeIddKGzmsgJlType();
+
+	/*
 	if (m_lShowType != 1)
 	{
 		//榛樿涓烘煡璇㈡湀搴︿箣鏄燂紝闅愯棌鐩稿叧鍙傛暟
 		m_wndPK1.ShowWindow(SW_HIDE);
 		m_wndPK2.ShowWindow(SW_HIDE);
 		m_wndPKRatio.ShowWindow(SW_HIDE);
+		m_B_AddList.ShowWindow(SW_HIDE);
 		GetDlgItem(IDD_K_GZMSG_JL_PK1_S)->ShowWindow(SW_HIDE);
 		GetDlgItem(IDD_K_GZMSG_JL_PK2_S)->ShowWindow(SW_HIDE);
 		GetDlgItem(IDD_K_GZMSG_JL_PKRATIO_S)->ShowWindow(SW_HIDE);
 	}
-
-	/*
-	if (m_lShowType == 1)
-	{
-		GetDlgItem(IDD_K_GZMSG_JL_TYPE)->EnableWindow(false);
-	}
 	*/
 		
 	return TRUE;  // return TRUE unless you set the focus to a control
@@ -425,6 +845,7 @@ void DLG_GZMsg_JL::OnSelchangeIddKGzmsgJlType()
 		m_wndPK1.ShowWindow(SW_HIDE);
 		m_wndPK2.ShowWindow(SW_HIDE);
 		m_wndPKRatio.ShowWindow(SW_HIDE);
+		m_B_AddList.ShowWindow(SW_HIDE);
 
 		GetDlgItem(IDD_K_GZMSG_JL_PK1_S)->ShowWindow(SW_HIDE);
 		GetDlgItem(IDD_K_GZMSG_JL_PK2_S)->ShowWindow(SW_HIDE);
@@ -432,10 +853,20 @@ void DLG_GZMsg_JL::OnSelchangeIddKGzmsgJlType()
 
 		m_wndList.DeleteAllItems();
 		m_wndList.DeleteAllColumns();
+
+		//2025骞存柊鐨勮瘎姣旇鍒�
+		if (m_lShowType == 1)
+			m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100;涔堜箞鍝�,80;  A鍊�,100;  B鍊�,100; 鏈湀寰楀垎,100;"));
+		else
+			m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100; 鏈堜唤,100;  涓氱哗,100;涔堜箞鍝�,80;  A鍊�,100;  B鍊�,100; 鏈湀寰楀垎,100;"));
+
+
+		/* 2024骞村墠鏃х殑璇勬瘮瑙勫垯
 		if (m_lShowType == 1)
 			m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100;  涓婃湀,100;涓婃湀寰楀垎,100;  鏈湀,100;  鏈湀A,100;  鏈湀B,100;  鏈湀C,100;鏈湀鎬诲垎,100;   骞冲潎鍒�,100;"));
 		else
 			m_wndList.SetHeadings(_T("搴忓彿,50; 閮ㄩ棬,100; 瀹㈡埛缁忕悊,100;  涓婃湀,100;骞冲潎涓氱哗,100;骞冲潎瀹㈡埛,80;涓婃湀涓氱哗,100;涓婃湀瀹㈡埛,80;  涓婃湀A,100;  涓婃湀B,100;  涓婃湀C,100;涓婃湀鎬诲垎,100;  鏈湀,100;骞冲潎涓氱哗,100;骞冲潎瀹㈡埛,80;鏈湀涓氱哗,100;鏈湀瀹㈡埛,80;  鏈湀A,100;  鏈湀B,100;  鏈湀C,100;鏈湀鎬诲垎,100;   骞冲潎鍒�,100;"));
+		*/
 
 	}
 	else
@@ -443,6 +874,7 @@ void DLG_GZMsg_JL::OnSelchangeIddKGzmsgJlType()
 		m_wndPK1.ShowWindow(SW_SHOW);
 		m_wndPK2.ShowWindow(SW_SHOW);
 		m_wndPKRatio.ShowWindow(SW_SHOW);
+		m_B_AddList.ShowWindow(SW_SHOW);
 
 		GetDlgItem(IDD_K_GZMSG_JL_PK1_S)->ShowWindow(SW_SHOW);
 		GetDlgItem(IDD_K_GZMSG_JL_PK2_S)->ShowWindow(SW_SHOW);
@@ -451,9 +883,164 @@ void DLG_GZMsg_JL::OnSelchangeIddKGzmsgJlType()
 		m_wndList.DeleteAllItems();
 		m_wndList.DeleteAllColumns();
 		if (m_lShowType == 1)
-			m_wndList.SetHeadings(_T("搴忓彿,50; 鎸戞垬鑰�,150;琚寫鎴樿��,150;鎸戞垬鐩爣,100;鎸戞垬缁撴灉,150; 璧㈡柟,150;鎸戞垬鑰�-涓氱哗宸�,200;琚寫鎴樿��-涓氱哗宸�,200;"));
+			m_wndList.SetHeadings(_T("搴忓彿,50; 鏈堜唤,100; 鎸戞垬闃�,150; 搴旀垬闃�,150;鎸戞垬鐩爣,80;鎸戞垬缁撴灉,120;  璧㈡柟,150;鎸戞垬闃熷垎鏁�,100;搴旀垬闃熷垎鏁�,100;鎸戞垬涓氱哗宸�,120;搴旀垬涓氱哗宸�,120;鎸戞垬涔堜箞鍝掑樊,120;搴旀垬涔堜箞鍝掑樊,120;"));
 		else
 			m_wndList.SetHeadings(_T("椤圭洰,250; 鍐呭,450;"));
 
 	}
 }
+
+
+void DLG_GZMsg_JL::OnBnClickedKGzmsgJlInportmmdcount()
+{
+	if (!m_pMainFrame->GetUserPurview(PURVIEW_LIST))  //闇�瑕佹煡璇㈡竻鍗曟潈闄愭墠鑳藉鍏MD
+	{
+		return;
+	}
+	CString str;
+	CString strExcelFileName;
+
+	// 璁剧疆鏂囦欢杩囨护鍣紝鏀寔.xls銆�.xlsx銆�.xlsm
+	LPCTSTR lpszFilter =
+		_T("Excel Files (*.xls; *.xlsx;)|*.xls;*.xlsx;|")
+		_T("鎵�鏈夋枃浠� (*.*)|*.*||");
+
+	// 鍒涘缓鏂囦欢瀵硅瘽妗嗗璞★紙TRUE琛ㄧず鎵撳紑鏂囦欢锛孎ALSE琛ㄧず淇濆瓨鏂囦欢锛�
+	CFileDialog fileDlg(TRUE, _T("xlsx"), NULL, OFN_HIDEREADONLY | OFN_FILEMUSTEXIST, lpszFilter, this, 0, TRUE);
+
+	// 璁剧疆瀵硅瘽妗嗘爣棰�
+	fileDlg.m_ofn.lpstrTitle = _T("閫夋嫨涔堜箞鍝掓暟鎹枃浠�");
+
+	// 鏄剧ず瀵硅瘽妗�
+	if (fileDlg.DoModal() == IDOK)
+	{
+		// 鑾峰彇鐢ㄦ埛閫夋嫨鐨勫畬鏁存枃浠惰矾寰�
+		strExcelFileName = fileDlg.GetPathName();
+	}
+	else
+	{
+		return;
+	}
+
+	//鎵撳紑鏂囦欢
+	//绗竴姝ワ紝杩炴帴鍒癊xcel鏁版嵁搴�
+	CAdoConnection adoConnectX;
+	CAdoRecordSet  adoRSX;
+	if (!adoConnectX.ConnectExcel(strExcelFileName))
+	{
+		str.Format(_T("鎵撳紑鏂囦欢澶辫触锛�%s"), strExcelFileName);
+		MessageBox(str, _T("閿欒"), MB_ICONWARNING);
+		return;
+	}
+
+	//涓存椂鐢熸垚淇濆瓨绌洪棿
+	long lMaxYWYCount = 128;
+	ANS_GZMsg_JL_MMDCount_Data* pMMDCount = new ANS_GZMsg_JL_MMDCount_Data[lMaxYWYCount];
+	memset((BYTE*)pMMDCount, 0, sizeof(ANS_GZMsg_JL_MMDCount_Data) * lMaxYWYCount);
+
+
+	adoRSX.SetAdoConnection(&adoConnectX);
+	adoRSX.Open(_T("select * from [Sheet1$A1:IV65536]"));
+	int lYWYCount = 0;
+	int lIndex = 0;
+
+	CString strShowText;  //鐢ㄤ簬鏄剧ず濮撳悕鍙婁箞涔堝搾鏁伴噺
+	int     lShowTextCount = 0;
+	while (!adoRSX.IsEOF() && lIndex < lMaxYWYCount)
+	{
+		CString strYWYName;
+		CString strMMD;
+		long lMMDCount = 0;
+		adoRSX.GetCollect(_T("瀹㈡埛缁忕悊"), strYWYName); strYWYName.Trim(); strYWYName.Replace(_T("\r"), _T(""));; strYWYName.Replace(_T("\n"), _T(""));; strYWYName.Replace(_T("\t"), _T(""));
+		adoRSX.GetCollect(_T("涔堜箞鍝�"), strMMD); strMMD.Trim(); strMMD.Replace(_T("\r"), _T(""));; strMMD.Replace(_T("\n"), _T(""));; strMMD.Replace(_T("\t"), _T(""));
+
+		//鍒ゆ柇濮撳悕鏄惁鏈夋晥
+		if (strYWYName.GetLength() > 1 && strYWYName.GetLength() < 8 && strYWYName != _T("瀹㈡埛缁忕悊") || strYWYName != _T("濮撳悕"))
+		{
+			//鍒ゆ柇鏁伴噺鏄惁鏈夋晥
+			BOOL bVaildMMDCount = true;
+			if (strMMD.GetLength() > 0)
+			{
+				for (int i = 0; i < strMMD.GetLength(); i++)
+				{
+					const TCHAR ch = strMMD[i];
+					if (!_istdigit(ch) && ch != _T('.'))
+					{
+						bVaildMMDCount = false;
+						break;
+					}
+				}
+			}
+			if (bVaildMMDCount)
+			{
+				lMMDCount = _ttol(strMMD);
+				_tcscpy(pMMDCount[lYWYCount].szYWYName, strYWYName);
+				pMMDCount[lYWYCount].lMMDCount = lMMDCount;
+				lYWYCount++;
+
+				//鐢ㄤ簬鏄剧ず
+				if (lYWYCount <= 16)
+				{
+					str.Format(_T("%-10s%6d"), strYWYName, lMMDCount);
+					if (lShowTextCount <= 0)
+					{
+						strShowText += str;
+						lShowTextCount++;
+					}
+					else
+					{
+						if (lShowTextCount >= 2)
+						{
+							strShowText = strShowText + _T("  |  ") + str;
+							strShowText.Append(_T("\r\n"));
+							lShowTextCount = 0;
+						}
+						else
+						{
+							strShowText = strShowText + _T("  |  ") + str;
+							lShowTextCount++;
+						}
+					}
+				}
+			}
+		}
+		adoRSX.MoveNext();
+		lIndex++;
+	}
+
+	if (lYWYCount <= 0)
+	{
+		MessageBox(_T("瀵煎叆鐨勬枃浠舵病鎵惧埌涔堜箞鍝掍俊鎭�"), _T("閿欒"), MB_ICONWARNING);
+		delete[] pMMDCount;
+		return;
+	}
+
+	CString strMon;  //鍙栧鍏ユ湀浠�
+	m_wndMon.GetWindowText(strMon);
+
+	str.Format(_T("灏嗚瀵煎叆%s鐨勪箞涔堝搾鏁版嵁锛岃纭锛乗r\n\r\n%s"), strMon, strShowText);
+	int iRet = MessageBox(str, _T("璇风‘璁�"), MB_ICONQUESTION | MB_YESNO | MB_DEFBUTTON1);
+
+	if (iRet != IDYES)
+	{
+		delete[] pMMDCount;
+		return;
+	}
+
+	long lSize = sizeof(REQ_GZMsg_JL_MMDCount) + sizeof(ANS_GZMsg_JL_MMDCount_Data) * lYWYCount;
+	BYTE* pData = new BYTE[lSize];
+	memset(pData, 0, lSize);
+
+	REQ_GZMsg_JL_MMDCount* pReq = (REQ_GZMsg_JL_MMDCount*)pData;
+	ANS_GZMsg_JL_MMDCount_Data* pReqData = (ANS_GZMsg_JL_MMDCount_Data*)(pData + sizeof(REQ_GZMsg_JL_MMDCount));
+
+	pReq->lType = 1;  //瀵煎叆涔堜箞鍝掓暟鎹�
+	pReq->lCount = lYWYCount;  //瀹㈡埛缁忕悊鏁伴噺
+	_tcscpy(pReq->szMon, strMon);  //瀵煎叆鏈堜唤
+	//澶嶅埗涔堜箞鍝掓暟鎹�
+	memcpy((BYTE*)pReqData, (BYTE*)pMMDCount, sizeof(ANS_GZMsg_JL_MMDCount_Data) * lYWYCount);
+
+	m_pMainFrame->SendFrame(SMSFUNC_GZMSG_JL_MMDCOUNT, (BYTE*)pData, lSize);
+
+	delete [] pMMDCount;
+}
diff --git a/DLG_GZMsg_JL.h b/DLG_GZMsg_JL.h
index bd16713..0a7d5c9 100644
--- a/DLG_GZMsg_JL.h
+++ b/DLG_GZMsg_JL.h
@@ -50,4 +50,6 @@ public:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnRclickGzmsgJlList(NMHDR *pNMHDR, LRESULT *pResult);
 	afx_msg void OnSelchangeIddKGzmsgJlType();
+	afx_msg void OnBnClickedKGzmsgJlInportmmdcount();
+	CButton m_B_AddList;
 };
diff --git a/Debug_Unicode/SmsManager.exe b/Debug_Unicode/SmsManager.exe
index 8a7e5bf..2240901 100644
Binary files a/Debug_Unicode/SmsManager.exe and b/Debug_Unicode/SmsManager.exe differ
diff --git a/Debug_Unicode/SmsManager.res b/Debug_Unicode/SmsManager.res
index cc6f144..66d8d89 100644
Binary files a/Debug_Unicode/SmsManager.res and b/Debug_Unicode/SmsManager.res differ
diff --git a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog
index 90c2a1b..a35d5e6 100644
Binary files a/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.read.1.tlog differ
diff --git a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog
index bc1070b..0564e33 100644
Binary files a/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog and b/Debug_Unicode/SmsManager.tlog/CL.write.1.tlog differ
diff --git a/Debug_Unicode/SmsManager.tlog/link.read.1.tlog b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog
index 24bc6e0..9d3c8da 100644
Binary files a/Debug_Unicode/SmsManager.tlog/link.read.1.tlog and b/Debug_Unicode/SmsManager.tlog/link.read.1.tlog differ
diff --git a/Debug_Unicode/SmsManager.tlog/link.write.1.tlog b/Debug_Unicode/SmsManager.tlog/link.write.1.tlog
index db5758a..2c71b05 100644
Binary files a/Debug_Unicode/SmsManager.tlog/link.write.1.tlog and b/Debug_Unicode/SmsManager.tlog/link.write.1.tlog differ
diff --git a/Debug_Unicode/vc143.idb b/Debug_Unicode/vc143.idb
index e8b8f6f..430c078 100644
Binary files a/Debug_Unicode/vc143.idb and b/Debug_Unicode/vc143.idb differ
diff --git a/K_GZMsg.cpp b/K_GZMsg.cpp
index 786965c..9d0c816 100644
--- a/K_GZMsg.cpp
+++ b/K_GZMsg.cpp
@@ -1110,7 +1110,7 @@ BOOL CK_GZMsg::ProcessSocket(Socket_Head_Add *pHead, BYTE* pFrame)
 		}
 		return true;
 	}
-	if (pHead->lFuncType == SMSFUNC_GZMSG_JL)
+	if (pHead->lFuncType == SMSFUNC_GZMSG_JL || pHead->lFuncType == SMSFUNC_GZMSG_JL_MMDCOUNT)
 	{
 		if (m_pDlgJL)
 		{
diff --git a/MainFrm.cpp b/MainFrm.cpp
index eb2e286..d0ebb97 100644
--- a/MainFrm.cpp
+++ b/MainFrm.cpp
@@ -40,6 +40,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_WM_CREATE()
 	ON_WM_TIMER()
 	ON_COMMAND(ID_QUERY_JL, OnQueryJL)
+	ON_COMMAND(ID_QUERY_JL_INPORTMMDCOUNT, OnQueryJL_InportMMDCount)
 	ON_COMMAND(ID_MODIFY_PASSWD, OnModifyPasswd)
 	ON_COMMAND(ID_WARNINGSETUP, OnWarningSetup)
 	ON_COMMAND(ID_WXWORKSETUP, OnWxWorkSetup)
@@ -120,7 +121,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			submenu->DeleteMenu(ID_CLISMSTD, MF_BYCOMMAND);
 			submenu->DeleteMenu(ID_REBOOT, MF_BYCOMMAND);
 			submenu->DeleteMenu(ID_DOG, MF_BYCOMMAND);
-			submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+			//submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+			//submenu->DeleteMenu(ID_QUERY_JL_INPORTMMDCOUNT, MF_BYCOMMAND);
 #ifdef SMSCENTER_NX
 			submenu->DeleteMenu(ID_WARNINGSETUP, MF_BYCOMMAND);
 			submenu->DeleteMenu(ID_WXWORKSETUP, MF_BYCOMMAND);
@@ -129,7 +131,8 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 		submenu = mmenu->GetSubMenu(2);
 		if (submenu)
 		{
-			submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+			//submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+			//submenu->DeleteMenu(ID_QUERY_JL_INPORTMMDCOUNT, MF_BYCOMMAND);
 		}
 	}
 #endif
@@ -142,11 +145,13 @@ int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 	if (submenu)
 	{
 		submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+		submenu->DeleteMenu(ID_QUERY_JL_INPORTMMDCOUNT, MF_BYCOMMAND);
 	}
 	}
 	}
 #endif
 
+
 	//有命令行参数,自动启动
 	TCHAR szCmd[ 256 ]={0};
 	_stprintf( szCmd , ::AfxGetApp()->m_lpCmdLine );
@@ -1558,6 +1563,7 @@ LONG CMainFrame::ProcessSocket_Frame( WPARAM wParam , LPARAM lParam )
 			 break;
 		 case SMSFUNC_GZMSG_JL:
 		 case SMSFUNC_GZMSG_JL_PARA:
+		 case SMSFUNC_GZMSG_JL_MMDCOUNT:
 			 if (m_lCurFunc == FUNC_GZMSG)
 			 {
 				 m_pUserView->m_dlgGZMsg.ProcessSocket(pHeadAdd, (BYTE*)(pHead->pFrame + lSizeOfHeadAdd));
@@ -1566,7 +1572,6 @@ LONG CMainFrame::ProcessSocket_Frame( WPARAM wParam , LPARAM lParam )
 			 {
 				 ProcessSocket(pHeadAdd, (BYTE*)(pHead->pFrame + lSizeOfHeadAdd));
 			 }
-
 			 break;
 		 case SMSFUNC_FPQUERY:
 			 m_pUserView->m_dlgFPQuery.ProcessSocket(pHeadAdd, (BYTE*)(pHead->pFrame + lSizeOfHeadAdd));
@@ -1675,12 +1680,24 @@ void CMainFrame::OnTimer(UINT nIDEvent)
 
 				m_wndBar.RemoveItem(FUNC_WHITEC);
 			}
-			if ( !GetUserPurview(PURVIEW_LIST,false) )
+			if (!GetUserPurview(PURVIEW_LIST, false))
 			{
 				m_wndBar.RemoveItem(FUNC_LISTMMSC);
 				m_wndBar.RemoveItem(FUNC_LISTC);
 				m_wndBar.RemoveItem(FUNC_BACKC);
 				m_wndBar.RemoveItem(FUNC_TDSET2C);
+
+				CMenu* mmenu = GetMenu();
+				if (mmenu)
+				{
+					CMenu* submenu = mmenu->GetSubMenu(2);
+					if (submenu)
+					{
+						submenu->DeleteMenu(ID_QUERY_JL, MF_BYCOMMAND);
+						submenu->DeleteMenu(ID_QUERY_JL_INPORTMMDCOUNT, MF_BYCOMMAND);
+					}
+				}
+
 			}
 /*			
 			if ( GetUserPurview(PURVIEW_SP,false) ) //为开发票专员
@@ -2137,7 +2154,7 @@ BOOL CMainFrame::GetUserPurview(ULONG ulPurview,BOOL bShowWarning)
 
 void CMainFrame::OnQueryJL()
 {
-	if (!GetUserPurview(PURVIEW_CORP_ADD))
+	if (!GetUserPurview(PURVIEW_LIST))
 	{
 		return;
 	}
@@ -2146,6 +2163,11 @@ void CMainFrame::OnQueryJL()
 	SendFrame(SMSFUNC_GZMSG_JL_PARA, (BYTE*)pGZMsg, sizeof(REQ_GZMsg_JL_PARA));
 }
 
+void CMainFrame::OnQueryJL_InportMMDCount()
+{
+
+}
+
 
 void CMainFrame::OnModifyPasswd() 
 {
@@ -2264,7 +2286,7 @@ BOOL CMainFrame::ProcessSocket(Socket_Head_Add *pHead,BYTE* pFrame)
 		}
 		return 0;
 	}
-	if (pHead->lFuncType == SMSFUNC_GZMSG_JL)
+	if (pHead->lFuncType == SMSFUNC_GZMSG_JL || pHead->lFuncType== SMSFUNC_GZMSG_JL_MMDCOUNT)
 	{
 		if (m_pDlgJL)
 		{
diff --git a/MainFrm.h b/MainFrm.h
index 3fac731..f0bf74c 100644
--- a/MainFrm.h
+++ b/MainFrm.h
@@ -237,6 +237,7 @@ protected:
 	afx_msg void OnUpdateClismstd(CCmdUI* pCmdUI);
 	afx_msg void OnClismstd();
 	afx_msg void OnQueryJL();
+	afx_msg void OnQueryJL_InportMMDCount();
 	//}}AFX_MSG
 	afx_msg long OnOutbarNotify(WPARAM wParam, LPARAM lParam);
 	afx_msg LONG ProcessSocket_Error( WPARAM wParam , LPARAM lParam );
diff --git a/Release_Unicode/SmsManager.res b/Release_Unicode/SmsManager.res
index 7c15342..dc0e863 100644
Binary files a/Release_Unicode/SmsManager.res and b/Release_Unicode/SmsManager.res differ
diff --git a/Release_Unicode/SmsManager.tlog/CL.command.1.tlog b/Release_Unicode/SmsManager.tlog/CL.command.1.tlog
index 4cf90f4..f593c12 100644
Binary files a/Release_Unicode/SmsManager.tlog/CL.command.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.command.1.tlog differ
diff --git a/Release_Unicode/SmsManager.tlog/CL.read.1.tlog b/Release_Unicode/SmsManager.tlog/CL.read.1.tlog
index 75f0f12..c124904 100644
Binary files a/Release_Unicode/SmsManager.tlog/CL.read.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.read.1.tlog differ
diff --git a/Release_Unicode/SmsManager.tlog/CL.write.1.tlog b/Release_Unicode/SmsManager.tlog/CL.write.1.tlog
index d8d9d64..6b59baa 100644
Binary files a/Release_Unicode/SmsManager.tlog/CL.write.1.tlog and b/Release_Unicode/SmsManager.tlog/CL.write.1.tlog differ
diff --git a/Release_Unicode/SmsManager3.exe b/Release_Unicode/SmsManager3.exe
index a4abdff..39ba09b 100644
Binary files a/Release_Unicode/SmsManager3.exe and b/Release_Unicode/SmsManager3.exe differ
diff --git a/SmsManager.rc b/SmsManager.rc
index a83d75c..8f79719 100644
--- a/SmsManager.rc
+++ b/SmsManager.rc
@@ -4287,49 +4287,49 @@ BEGIN
     EDITTEXT        IDC_TDSET_MODIFY_ACCESSPORT,50,48,74,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_TDSET_MODIFY_LOGINNAME,164,33,43,12,ES_AUTOHSCROLL
     EDITTEXT        IDC_TDSET_MODIFY_SENDRET,178,18,29,12,ES_AUTOHSCROLL | ES_NUMBER
-    COMBOBOX        IDC_TDSET_MODIFY_ABILITY,50,72,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_TDSET_MODIFY_TYPE,50,88,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_TDSET_MODIFY_LIMITS,50,104,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_TDSET_MODIFY_TDNUM,50,120,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    COMBOBOX        IDC_TDSET_MODIFY_MODE,50,136,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_TDSET_MODIFY_CONTENTLEN,182,73,21,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_TDSET_MODIFY_LONGCONTENTLEN,183,88,21,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_TDSET_MODIFY_SIGNLEN,182,104,21,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_TDSET_MODIFY_XYLEN,182,120,21,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_TDSET_MODIFY_XYTDID,181,136,21,12,ES_AUTOHSCROLL | ES_NUMBER
-    CONTROL         "启用此通道",IDC_TDSET_MODIFY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,157,53,10
-    CONTROL         "此通道可发营销",IDC_TDSET_MODIFY_GGTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,157,68,10
-    CONTROL         "本类型默认通道",IDC_TDSET_MODIFY_DEFAULTTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,171,68,10
-    CONTROL         "此通道常用",IDC_TDSET_MODIFY_OFTENUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,172,68,10
-    EDITTEXT        IDC_TDSET_MODIFY_BFPRIORITY,49,184,30,12,ES_AUTOHSCROLL | ES_NUMBER
-    EDITTEXT        IDC_TDSET_MODIFY_BZ,47,199,154,35,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
+    EDITTEXT        IDC_TDSET_MODIFY_BFPRIORITY,50,63,30,12,ES_AUTOHSCROLL | ES_NUMBER
+    COMBOBOX        IDC_TDSET_MODIFY_ABILITY,50,80,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_TDSET_MODIFY_TYPE,50,96,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_TDSET_MODIFY_LIMITS,50,112,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_TDSET_MODIFY_TDNUM,50,128,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    COMBOBOX        IDC_TDSET_MODIFY_MODE,50,144,74,171,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_TDSET_MODIFY_CONTENTLEN,182,81,21,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_TDSET_MODIFY_LONGCONTENTLEN,183,96,21,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_TDSET_MODIFY_SIGNLEN,182,112,21,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_TDSET_MODIFY_XYLEN,182,128,21,12,ES_AUTOHSCROLL | ES_NUMBER
+    EDITTEXT        IDC_TDSET_MODIFY_XYTDID,181,144,21,12,ES_AUTOHSCROLL | ES_NUMBER
+    CONTROL         "启用此通道",IDC_TDSET_MODIFY_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,160,53,10
+    CONTROL         "此通道可发营销",IDC_TDSET_MODIFY_GGTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,160,68,10
+    CONTROL         "本类型默认通道",IDC_TDSET_MODIFY_DEFAULTTD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,50,174,68,10
+    CONTROL         "此通道常用",IDC_TDSET_MODIFY_OFTENUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,137,175,52,10
+    EDITTEXT        IDC_TDSET_MODIFY_BZ,47,194,154,35,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
     DEFPUSHBUTTON   "确 定",IDOK,250,46,50,21
     PUSHBUTTON      "取 消",IDCANCEL,250,80,50,21
     EDITTEXT        IDC_TDSET_MODIFY_MSG,222,132,100,101,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
     EDITTEXT        IDC_TDSET_MODIFY_TDID,50,18,58,12,ES_AUTOHSCROLL | ES_READONLY
     GROUPBOX        "基本资料",IDC_STATIC,6,7,205,234
     LTEXT           "通道名称",IDC_STATIC,15,34,31,8
-    LTEXT           "运营商",IDC_STATIC,15,90,23,8
-    LTEXT           "备  注",IDC_STATIC,15,201,24,8
+    LTEXT           "运营商",IDC_STATIC,15,98,23,8
+    LTEXT           "备  注",IDC_STATIC,15,197,24,8
     ICON            IDR_MAINFRAME,IDC_STATIC,262,16,20,20
-    LTEXT           "通道状态",IDC_STATIC,15,158,31,8
-    LTEXT           "默认通道",IDC_STATIC,15,173,31,8
+    LTEXT           "通道状态",IDC_STATIC,15,161,31,8
+    LTEXT           "默认通道",IDC_STATIC,15,176,31,8
     GROUPBOX        "统计数据",IDC_STATIC,216,118,112,125
     LTEXT           "通道ID",IDC_STATIC,14,19,24,8
-    LTEXT           "通道能力",IDC_STATIC,14,74,31,8
-    LTEXT           "发送序列",IDC_STATIC,15,106,31,8
-    LTEXT           "通道号",IDC_STATIC,15,122,23,8
-    LTEXT           "特殊模式",IDC_STATIC,15,138,31,8
+    LTEXT           "通道能力",IDC_STATIC,14,82,31,8
+    LTEXT           "发送序列",IDC_STATIC,15,114,31,8
+    LTEXT           "通道号",IDC_STATIC,15,130,23,8
+    LTEXT           "特殊模式",IDC_STATIC,15,146,31,8
     LTEXT           "接入号",IDC_STATIC,15,49,23,8
-    LTEXT           "内容最大长度",IDC_STATIC,132,75,46,8
-    LTEXT           "长短信长度",IDC_STATIC,140,90,38,8
-    LTEXT           "签名长度",IDC_STATIC,147,106,31,8
+    LTEXT           "内容最大长度",IDC_STATIC,132,83,46,8
+    LTEXT           "长短信长度",IDC_STATIC,140,98,38,8
+    LTEXT           "签名长度",IDC_STATIC,147,114,31,8
     LTEXT           "发送ID(SendRet)",IDC_STATIC,117,20,60,8
-    LTEXT           "小于字数",IDC_STATIC,146,123,31,8
-    LTEXT           "转通道ID",IDC_STATIC,146,138,31,8
+    LTEXT           "小于字数",IDC_STATIC,146,131,31,8
+    LTEXT           "转通道ID",IDC_STATIC,146,146,31,8
     LTEXT           "网关帐号",IDC_STATIC,130,35,30,8
-    LTEXT           "补发级别",IDC_STATIC,15,185,31,8
-    LTEXT           "(数字越大越优先，0不参加补发）",IDC_STATIC,85,185,108,8
+    LTEXT           "补发级别",IDC_STATIC,16,64,31,8
+    LTEXT           "(数字越大越优先，0不参加补发）",IDC_STATIC,86,64,108,8
 END
 
 IDD_C_TRANSCODESET_MODIFY DIALOGEX 0, 0, 247, 115
@@ -4950,25 +4950,27 @@ BEGIN
     COMBOBOX        IDC_CORP_ANALYSE_QUERYALL,404,34,64,187,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_K_GZMSG_JL DIALOGEX 0, 0, 386, 289
+IDD_K_GZMSG_JL DIALOGEX 0, 0, 397, 288
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "激励评比结果"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     LTEXT           "评比类型",IDC_STATIC,19,18,29,8
-    COMBOBOX        IDD_K_GZMSG_JL_TYPE,55,16,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "属性选择",IDC_STATIC,7,3,372,63
-    LTEXT           "月份",IDC_STATIC,144,18,15,8
-    COMBOBOX        IDD_K_GZMSG_JL_MON,169,17,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "挑战者",IDD_K_GZMSG_JL_PK1_S,19,37,29,8
-    COMBOBOX        IDD_K_GZMSG_JL_PK1,55,35,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "被挑战者",IDD_K_GZMSG_JL_PK2_S,134,36,29,8
-    COMBOBOX        IDD_K_GZMSG_JL_PK2,170,35,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "挑战比例",IDD_K_GZMSG_JL_PKRATIO_S,244,37,29,8
-    COMBOBOX        IDD_K_GZMSG_JL_PKRATIO,280,36,35,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    PUSHBUTTON      "查询评比结果",IDD_K_GZMSG_JL_QUERY,251,14,65,17
-    GROUPBOX        "结果",IDC_STATIC,7,62,372,220
-    CONTROL         "",IDC_GZMSG_JL_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_TABSTOP,13,74,360,198
+    COMBOBOX        IDD_K_GZMSG_JL_TYPE,54,16,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "属性选择",IDC_STATIC,7,3,383,63
+    LTEXT           "月份",IDC_STATIC,135,18,15,8
+    COMBOBOX        IDD_K_GZMSG_JL_MON,155,17,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "挑战队",IDD_K_GZMSG_JL_PK1_S,26,38,22,8
+    COMBOBOX        IDD_K_GZMSG_JL_PK1,54,36,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "应战队",IDD_K_GZMSG_JL_PK2_S,128,37,22,8
+    COMBOBOX        IDD_K_GZMSG_JL_PK2,155,36,64,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    LTEXT           "挑战比例",IDD_K_GZMSG_JL_PKRATIO_S,231,38,29,8
+    COMBOBOX        IDD_K_GZMSG_JL_PKRATIO,267,37,35,132,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "查询评比结果",IDD_K_GZMSG_JL_QUERY,238,15,65,17
+    GROUPBOX        "结果",IDC_STATIC,7,62,383,220
+    CONTROL         "",IDC_GZMSG_JL_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | WS_TABSTOP,13,74,370,198
+    PUSHBUTTON      "导入么么哒数据",IDD_K_GZMSG_JL_INPORTMMDCOUNT,313,15,65,17
+    CONTROL         "报表模式",IDD_K_GZMSG_JL_ADDLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,314,38,44,10
 END
 
 IDD_C_FPQUERY DIALOGEX 0, 0, 441, 223
@@ -6891,9 +6893,9 @@ BEGIN
     IDD_K_GZMSG_JL, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 379
+        RIGHTMARGIN, 390
         TOPMARGIN, 7
-        BOTTOMMARGIN, 282
+        BOTTOMMARGIN, 281
     END
 
     IDD_C_FPQUERY, DIALOG
diff --git a/resource.h b/resource.h
index a895d6b..87310f4 100644
--- a/resource.h
+++ b/resource.h
@@ -1867,6 +1867,7 @@
 #define IDC_TDSET_ADD_MOBILE_S5         2226
 #define IDD_K_GZMSG_JL_QUERY            2226
 #define IDC_TDSET_ADD_YYS               2227
+#define IDD_K_GZMSG_JL_INPORTMMDCOUNT   2227
 #define IDC_GZMSG_JL_LIST               2228
 #define IDD_K_GZMSG_JL_PK1_S            2229
 #define IDD_K_GZMSG_JL_PK2_S            2230
@@ -2083,6 +2084,7 @@
 #define IDC_CORP_EXPIRYRECYCLING_CORPID_S 2426
 #define IDC_CORP_EXPIRYRECYCLING_S1     2427
 #define IDC_CORP_EXPIRYRECYCLING_LASTLOGIN 2428
+#define IDD_K_GZMSG_JL_ADDLIST          2428
 #define IDC_HANDCUR                     3010
 #define IDD_CORP_BZ                     32260
 #define IDD_CORP_OPER_OPEN              32261
@@ -2200,6 +2202,8 @@
 #define ID_WXWORKSETUP                  32784
 #define ID_32785                        32785
 #define ID_QUERY_JL                     32786
+#define ID_32787                        32787
+#define ID_QUERY_JL_INPORTMMDCOUNT      32788
 
 // Next default values for new objects
 // 
@@ -2207,8 +2211,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        318
-#define _APS_NEXT_COMMAND_VALUE         32787
-#define _APS_NEXT_CONTROL_VALUE         2428
+#define _APS_NEXT_COMMAND_VALUE         32789
+#define _APS_NEXT_CONTROL_VALUE         2429
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif