1.打印中不再提示;2.送出时间调整;3.修复无打印机名称无法保存打印配置的bug;4.修改版本号

takeout/control/orderprintwork.cpp

@@ -35,10 +35,10 @@ bool orderprintwork::event(QEvent *e)
                 map[EVENT_KEY_MSG].toInt() == DEFAULT_LOCATION_PRINT)
         {
 
-            QVariantMap smap;
-            smap.insert(EVENT_KEY_ORDERSTATUS, 0);
-            smap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("打印中..."));
-            POSTEVENTTYPE(PosEvent::s_opt_status,smap,QVariantMap);
+//            QVariantMap smap;
+//            smap.insert(EVENT_KEY_ORDERSTATUS, 0);
+//            smap.insert(EVENT_KEY_MSG, QString::fromLocal8Bit("打印中..."));
+//            POSTEVENTTYPE(PosEvent::s_opt_status,smap,QVariantMap);
 
             OrderObject order;
 

takeout/takeout.rc

@@ -4,8 +4,8 @@
 #include <winver.h>
 #endif
 VS_VERSION_INFO VERSIONINFO
-    FILEVERSION 3,0,0,4
-    PRODUCTVERSION 3,0,0,4
+    FILEVERSION 3,0,0,6
+    PRODUCTVERSION 3,0,0,6
     FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
     FILEFLAGS VS_FF_DEBUG
@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
             BEGIN
                 VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
                 VALUE "FileDescription", "FREEMUD Manager System"
-                VALUE "FileVersion", "3.0.0.4"
+                VALUE "FileVersion", "3.0.0.6"
                 VALUE "InternalName", "FREEMUD"
                 VALUE "LegalCopyright", "Copyright (C)2017-2020"
                 VALUE "OriginalFilename", "fmTakeout.exe"
                 VALUE "ProductName", "fmTakeout"
-                VALUE "ProductVersion", "3.0.0.4"
+                VALUE "ProductVersion", "3.0.0.6"
             END
         END
         BLOCK "VarFileInfo"

takeout/view/detailForm.cpp

@@ -140,7 +140,10 @@ void DetailForm::InitData(OrderObject *orderObject)
     ui->detailLab3->setText(orderObject->address);
     ui->detailLab4->setText(QString::fromLocal8Bit("[配送方式]%1 [配送费]%2").arg(orderObject->delivery_party,
                                                                  Penny2Dollar(orderObject->send_fee)));
-    ui->detailLab5->setText(orderObject->delivery_time==0? QString::fromLocal8Bit("立即送出") : QDateTime::fromTime_t(orderObject->delivery_time).toString("MM/dd hh:mm"));
+    if(orderObject->order_type == 1 || orderObject->order_type == 2)
+        ui->detailLab5->setText(orderObject->srcdlv_time==0? QString::fromLocal8Bit("立即送出") : QDateTime::fromTime_t(orderObject->srcdlv_time).toString("MM/dd hh:mm"));
+    else
+        ui->detailLab5->setText(orderObject->srcdlv_time==0? QString::fromLocal8Bit("") : QDateTime::fromTime_t(orderObject->srcdlv_time).toString("MM/dd hh:mm"));
 //    ui->detailLab6->setText(orderObject->courier_name.isEmpty() ? QString::fromLocal8Bit("暂未指定") : QString::fromLocal8Bit("[姓名]%1 [电话]%2")
 //                                                                            .arg(orderObject->courier_name, orderObject->courier_phone));
     if(orderObject->disList.size() > 0)

takeout/view/prtsettingform.cpp

@@ -373,9 +373,12 @@ void PrtSettingForm::on_pushButton_save_clicked()
 
     QLOG_DEBUG() << "printf file name : " << filename;
 
-    if(Wigth.isEmpty() || name.isEmpty())
+    if(Wigth.isEmpty())
         return ;
 
+    if(name.isEmpty())
+        name = "test01" ;
+
     QString confilename = qApp->applicationDirPath() + "/" + CONFIG_NAME;
     QString tmpconfilename = qApp->applicationDirPath() + "/" + PREINTER_NEED;