Z991239-5028 #comment feat: 调整同步物料计数和吞卡返回RTA值

Signed-Off-By: commit-hook

Module/mod_CardIssuerStand/CardIssuerFSM.cpp

@@ -4568,7 +4568,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 	client = create_http(HttpsLogCallBack);
 	CRegistSwallowCardReq qRegistCardReq;
 	CRegistSwallowCardRet qRegistCardRet;
-	qRegistCardReq.m_timeOut = 5;//5 second
+	qRegistCardReq.m_timeOut = 15;//15 second
 
 	qRegistCardReq.m_url = m_csSwallowCardUrl.GetData();
 	qRegistCardReq.cardNo = cardno;
@@ -4600,7 +4600,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 		if (bParse)
 		{
 			if (qRegistCardRet.returnInfo.returnCode.compare("SUC0000") != 0)
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA230Z")("登记吞卡信息到后台失败:%s,%s"
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2341")("登记吞卡信息到后台失败:%s,%s"
 					, qRegistCardRet.returnInfo.returnCode.c_str(), qRegistCardRet.returnInfo.errorMsg.c_str());
 			else
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220304")("吞卡登记成功");
@@ -4609,7 +4609,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304")("解析返回报文qRegistCardRet失败");
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA230Z")("访问吞卡登记失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2340")("访问吞卡登记失败");
 	}
 	client->Destory();
 	return true;
@@ -4689,7 +4689,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 
 	if (!client->Post(qTempReq, qTempRet)) {
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, http req fail,url=%s, err=%s", qTempReq.m_url.c_str(), qTempRet.m_errMsg.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2310")("同步物料计数通讯失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2330")("同步物料计数通讯失败");
 		return false;//通讯失败
 	}
 
@@ -4698,7 +4698,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 	if (!reader.parse(qTempRet.m_retStr, rootRet, false))
 	{
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, parse resp is fail, url=%s", qTempReq.m_url.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2311")("同步物料计数解析返回报文失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2331")("同步物料计数解析返回报文失败");
 		return false;//解析失败
 	}
 
@@ -4713,14 +4713,14 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 		else {
 			//失败
 			LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, is error, url=%s", qTempReq.m_url.c_str()).GetData());
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2312")("同步物料计数失败");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2332")("同步物料计数失败");
 			return false;
 		}
 	}
 	else {
 		//参数不符合
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, resp param is error, url=%s", qTempReq.m_url.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2313")("同步物料计数返回参数不对");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2333")("同步物料计数返回参数不对");
 		return false;
 	}
 }

Module/mod_cardissuer/CardIssuerFSM.cpp

@@ -4569,7 +4569,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 	client = create_http(HttpsLogCallBack);
 	CRegistSwallowCardReq qRegistCardReq;
 	CRegistSwallowCardRet qRegistCardRet;
-	qRegistCardReq.m_timeOut = 5;//5 second
+	qRegistCardReq.m_timeOut = 15;//15 second
 
 	qRegistCardReq.m_url = m_csSwallowCardUrl.GetData();
 	qRegistCardReq.cardNo = cardno;
@@ -4601,7 +4601,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 		if (bParse)
 		{
 			if (qRegistCardRet.returnInfo.returnCode.compare("SUC0000") != 0)
-				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA230Z")("登记吞卡信息到后台失败:%s,%s"
+				DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2341")("登记吞卡信息到后台失败:%s,%s"
 					, qRegistCardRet.returnInfo.returnCode.c_str(), qRegistCardRet.returnInfo.errorMsg.c_str());
 			else
 				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_USER).setLogCode("QLR040220304")("吞卡登记成功");
@@ -4610,7 +4610,7 @@ bool CCardIssuerFSM::RegistCardWhileCaptureCard(CSimpleStringA cardno)
 			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304")("解析返回报文qRegistCardRet失败");
 	}
 	else {
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA230Z")("访问吞卡登记失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR040220304").setResultCode("RTA2340")("访问吞卡登记失败");
 	}
 	client->Destory();
 	return true;
@@ -4690,7 +4690,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 
 	if (!client->Post(qTempReq, qTempRet)) {
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, http req fail,url=%s, err=%s", qTempReq.m_url.c_str(), qTempRet.m_errMsg.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2310")("同步物料计数通讯失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2330")("同步物料计数通讯失败");
 		return false;//通讯失败
 	}
 
@@ -4699,7 +4699,7 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 	if (!reader.parse(qTempRet.m_retStr, rootRet, false))
 	{
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, parse resp is fail, url=%s", qTempReq.m_url.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2311")("同步物料计数解析返回报文失败");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2331")("同步物料计数解析返回报文失败");
 		return false;//解析失败
 	}
 
@@ -4714,14 +4714,14 @@ bool CCardIssuerFSM::SyncMaterialCount(IHttpFunc* client,SyncMaterialCountInfo s
 		else {
 			//失败
 			LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, is error, url=%s", qTempReq.m_url.c_str()).GetData());
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2312")("同步物料计数失败");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2332")("同步物料计数失败");
 			return false;
 		}
 	}
 	else {
 		//参数不符合
 		LogWarn(Severity_Middle, Error_Exception, CardIssuer_UserErrorCode_SyncMaterialCount_Failed, CSimpleStringA::Format("<SyncMaterialCount>, resp param is error, url=%s", qTempReq.m_url.c_str()).GetData());
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2313")("同步物料计数返回参数不对");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_USER).setLogCode("QLR0402203Z02").setResultCode("RTA2333")("同步物料计数返回参数不对");
 		return false;
 	}
 }