增加rpa拉取全量订单处理

takeout/control/ordergetwork.cpp

@@ -622,8 +622,6 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
 		//是否发送给rpa。这里测试，先写死，后面从配置文件读取
         bool isSendToRPA=true;
         if(isSendToRPA){
-            //已完成的订单才发送给RPA
-            if(orderObject.status == ServiceOrder || orderObject.status == CompleteOrder){
             //if(orderObject.status == FirmOrder){
             QString error;
             if(!RpaInterface::Instance().sendToRPA(QJsonDocument(jsonObject).toJson(QJsonDocument::Compact),error)){
@@ -633,7 +631,6 @@ void OrderGetWork::optOrder(const QJsonArray &orders)
             }
         }
     }
-    }
 }
 
 void OrderGetWork::optPickUpOrder(const QJsonArray &pickuporderoptlist)

takeout/control/rpainterface.cpp

@@ -5,6 +5,7 @@
 #include <QJsonParseError>
 #include "event/posevent.h"
 #include "event/fmapplication.h"
+#include "model/posorderpool.h"
 
 #define BUFFER_SIZE             1024     //缓冲区大小
 #define SEND_PORT               30001    //socket发送端口
@@ -53,16 +54,9 @@ void RpaInterface::onReadyRead()
         if(length>0){
             QLOG_INFO() << "onReadyRead data:"<<recvBuf;
             QJsonObject recvObj = QJsonDocument::fromJson(recvBuf).object();
-            if(recvObj.contains("show_window")){
-                bool show=recvObj["show_window"].toBool();
-                if(show){
-                    QLOG_INFO() << "s_show_float show";
-                    DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
-                }else{
-                    QLOG_INFO() << "s_show_float hide";
-                    DEFAULTPOSTEVENT(PosEvent::s_hide_mainform, "");
-                    DEFAULTPOSTEVENT(PosEvent::s_hide_float, "");
-                }
+            if(recvObj.contains("fm_cmd")){
+                int fm_cmd=recvObj["fm_cmd"].toInt();
+                onResponseMessage(fm_cmd);
             }
         }
     }
@@ -174,3 +168,36 @@ bool RpaInterface::sendToRPA(const QByteArray &orderData,QString& error)
     delete[] m_pFmPackage;
     return result;
 }
+
+void RpaInterface::onResponseMessage(const int fm_cmd)
+{
+    switch (fm_cmd) {
+        case RPA_REQ_SHOW_WINDOW:
+            QLOG_INFO() << "s_show_float show";
+            DEFAULTPOSTEVENT(PosEvent::s_show_float, "");
+            break;
+        case RPA_REQ_HIDE_WINDOW:
+            QLOG_INFO() << "s_show_float hide";
+            DEFAULTPOSTEVENT(PosEvent::s_hide_mainform, "");
+            DEFAULTPOSTEVENT(PosEvent::s_hide_float, "");
+            break;
+        case RPA_REQ_GET_ALL_ORDER:
+        {
+            QVector<OrderObject> vecOrders;
+            PosOrderPool::GetAllOrders(vecOrders);
+            for(int i=0;i<vecOrders.size();i++){
+                OrderObject orderObj=&vecOrders[i];
+                QString error;
+
+                if(!RpaInterface::Instance().sendToRPA(QJsonDocument(orderObj.getOrderObject()).toJson(QJsonDocument::Compact),error)){
+                    QLOG_ERROR()<<"send to rpa failed:"<<error<<" orderid:"<<orderObj.order_id;
+                }else{
+                    QLOG_INFO()<<"send data to RPA,orderid:"<<orderObj.order_id;
+                }
+            }
+            break;
+        }
+        default:
+            break;
+    }
+}

takeout/control/rpainterface.h

@@ -12,6 +12,9 @@ typedef struct {
     int len;
 }FMSOCKEHEADER;
 
+const int RPA_REQ_SHOW_WINDOW     =  1000;   //显示窗口
+const int RPA_REQ_HIDE_WINDOW     =  1001;   //隐藏窗口
+const int RPA_REQ_GET_ALL_ORDER   =  1002;   //获取全部订单
 
 class RpaInterface:public QTcpServer
 {
@@ -25,6 +28,12 @@ private slots:
     void onDisconnected();
     void onReadyRead();
 
+    /* 功能:响应RPA请求信息
+     * 参数:[1]请求命令
+     * 返回:NULL
+     * */
+    void onResponseMessage(const int fm_cmd);
+
     int socketRecvData(char * recvBuf, int bufSize, QTcpSocket *sockClient);
 private:
     RpaInterface();

takeout/model/orderObject.h

@@ -147,7 +147,6 @@ public:
     int getSrcdlv_time() const;
     void setSrcdlv_time(int value);
 
-protected:
     QJsonObject getOrderObject() const
     {
         return _orderObject;
@@ -156,6 +155,7 @@ protected:
     {
         _orderObject = orderObject;
     }
+protected:
     QString getstore_name() const;
     void setstore_name(const QString &value);
 

takeout/model/posorderpool.cpp

@@ -947,3 +947,17 @@ void PosOrderPool::UpdateOrderNum(const OrderObject *order, const OrderObject *o
     }
 }
 
+void PosOrderPool::GetAllOrders(QVector<OrderObject> &vecOrders)
+{
+    if(PosOrderPool::s_mutex.tryLock())
+    {
+        if(!s_order_pool.empty())
+        {
+            for (auto it = s_order_pool.begin(); it != s_order_pool.end(); ++ it)
+            {
+                vecOrders.push_back(it.value().order_data);
+            }
+        }
+        s_mutex.unlock();
+    }
+}

takeout/model/posorderpool.h

@@ -245,6 +245,8 @@ public:
 
     static bool GetSearchOrder(QString key, QMap<QString, QString> &map, int condition);
 
+    static void GetAllOrders(QVector<OrderObject> &vecOrders);
+
 private:
     static void UpdateOrderNum(const OrderObject *order, const OrderObject *orderold = NULL);