|
|
@@ -385,7 +385,7 @@ typedef struct CQueryCardTypeReq : CHTTPReq {
|
|
|
|
|
|
for (int i = 0; i < X1Count; i++) {
|
|
|
Json::Value x1Elm;
|
|
|
- Json::FastWriter fwX1Elm;//写入对象
|
|
|
+ Json::FastWriter fwX1Elm;//鍐欏叆瀵硅薄
|
|
|
x1Elm[REFLECTION(xEacNbr)] = BODY.x1.xEacNbr.c_str();
|
|
|
x1Elm[REFLECTION(xCltNbr)] = BODY.x1.xCltNbr.c_str();
|
|
|
x1Elm[REFLECTION(xIacNbr)] = BODY.x1.xIacNbr.c_str();
|
|
|
@@ -519,7 +519,7 @@ typedef struct CQueryCardTypeRet : CHTTPRet {
|
|
|
Json::Value::UInt index;
|
|
|
if (!reader.parse(strData, root, false))
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//又不能打印，有什么太大意义?
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//鍙堜笉鑳芥墦鍗帮紝鏈変粈涔堝お澶ф剰涔�?
|
|
|
return false;
|
|
|
}
|
|
|
index = 0;
|
|
|
@@ -584,7 +584,7 @@ typedef struct CRegistSwallowCardRet : CHTTPRet {
|
|
|
Json::Reader reader;
|
|
|
if (!reader.parse(strData, root, false))
|
|
|
{
|
|
|
- DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//又不能打印，有什么太大意义?
|
|
|
+ DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM)("reader.parse false");//鍙堜笉鑳芥墦鍗帮紝鏈変粈涔堝お澶ф剰涔�?
|
|
|
return false;
|
|
|
}
|
|
|
if (!root["returnInfo"].isNull()) {
|
|
|
@@ -592,13 +592,13 @@ typedef struct CRegistSwallowCardRet : CHTTPRet {
|
|
|
return true;
|
|
|
}
|
|
|
else {
|
|
|
- return false;//报文结构不对，解析失败
|
|
|
+ return false;//鎶ユ枃缁撴瀯涓嶅�锛岃В鏋愬け璐�
|
|
|
}
|
|
|
//returnInfo.returnCode = root["returnInfo"][REFLECTION(returnCode)].asCString();
|
|
|
}
|
|
|
} CRegistSwallowCardRet;
|
|
|
|
|
|
-// 同步卡库计数到后台服务实体类
|
|
|
+// 鍚屾�鍗″簱璁℃暟鍒板悗鍙版湇鍔″疄浣撶被
|
|
|
struct SyncMaterialCountInfo
|
|
|
{
|
|
|
CSimpleStringA strDeviceNo;
|
|
|
@@ -887,7 +887,7 @@ public:
|
|
|
|
|
|
int SetDevStateAndSendMsg(const DevStateEnum eState, bool bForceSend = true);
|
|
|
int UpdateLocalRunCfg(CAutoArray<int> hopperArr);
|
|
|
- int SyncDataToDB(bool bMaintain[12],bool bSetCaptured=true);//同步物料计数
|
|
|
+ int SyncDataToDB(bool bMaintain[12],bool bSetCaptured=true);//鍚屾�鐗╂枡璁℃暟
|
|
|
void SetHopperNum(int hopperNum);
|
|
|
void DoExitWhenIdle();
|
|
|
int SAMICCommand(SpReqAnsContext<CardIssuerService_SAMICCommand_Req, CardIssuerService_SAMICCommand_Ans>::Pointer ctx);
|
|
|
@@ -936,7 +936,7 @@ private:
|
|
|
bool m_bUseRFTillNext;//if ReadCard by RF,the following PreOnline & PostOnline always use RF till the next card(insert/issue)
|
|
|
ErrorCodeEnum m_testResult;
|
|
|
|
|
|
- int m_CardCaptured,m_iInWhatPage/*在哪个页面，区分首页，用户桌面，其他页*/;
|
|
|
+ int m_CardCaptured,m_iInWhatPage/*鍦ㄥ摢涓�〉闈�紝鍖哄垎棣栭〉锛岀敤鎴锋�闈�紝鍏朵粬椤�*/;
|
|
|
int m_issueStatusFromFile, m_issueStatus/*the status maybe changed by Business call*/;
|
|
|
//1:default, 2:SCI, 3:no cfg
|
|
|
int m_machineType;
|
|
|
@@ -970,7 +970,7 @@ private:
|
|
|
void ToLogWarnInfoAboutTermCustom();
|
|
|
bool ToRegistCaptureCardInfo();
|
|
|
bool IfUseRf();
|
|
|
- //0:unknow（havn't access microservice or access failed），1：both mag & ic ，2：mag only，3：ic only
|
|
|
+ //0:unknow锛坔avn't access microservice or access failed锛夛紝1锛歜oth mag & ic 锛�2锛歮ag only锛�3锛歩c only
|
|
|
//int JudgeCardType();
|
|
|
CSimpleStringA m_csAlarmMsg,m_EacQueryHost, m_csSwallowCardUrl, m_csSyncMaterialUrl;
|
|
|
MagTracks m_magTracks;
|
|
|
@@ -1049,7 +1049,7 @@ struct PreOnlineTask : public ITaskSp
|
|
|
void Process()
|
|
|
{
|
|
|
FSMEvent *e = new FSMEvent(USER_EVT_PREONLINEFINISHED);
|
|
|
- e->param1 = fsm->PreOnline(ctx);//oilyang@20220611 实际上，为简化处理，PreOnline函数默认返回0
|
|
|
+ e->param1 = fsm->PreOnline(ctx);//oilyang@20220611 瀹為檯涓婏紝涓虹畝鍖栧�鐞嗭紝PreOnline鍑芥暟榛樿�杩斿洖0
|
|
|
fsm->PostEventFIFO(e);
|
|
|
}
|
|
|
};
|
|
|
@@ -1169,7 +1169,7 @@ struct SyncMaterialCountTask : public ITaskSp
|
|
|
void Process()
|
|
|
{
|
|
|
LOG_FUNCTION();
|
|
|
- //同步物料信息
|
|
|
+ //鍚屾�鐗╂枡淇℃伅
|
|
|
IHttpFunc* client;
|
|
|
client = create_http(fsm->HttpsLogCallBack);
|
|
|
bool ret = fsm->SyncMaterialCount(client,syncInfo);
|
刘文涛80174520