Исправлена ошибка при выдаче устройства: Query error in SRepairModel:…

… "Column 'reject_reason' cannot be null QMYSQL: Unable to execute query".
solderercb · Jan 10, 2024 · 3fb2fee · 3fb2fee
1 parent 72c7c15
commit 3fb2fee
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/appver.h b/appver.h
@@ -8,7 +8,7 @@
 #define APP_MAJOR 0
 #define APP_MINOR 0
 #define APP_PATCH 0
-#define APP_COMMIT 285
+#define APP_COMMIT 286
 
 #define FILE_VER                    APP_MAJOR,APP_MINOR,APP_PATCH,APP_COMMIT    // обязательно запятые!
 #define PRODUCT_VER                 FILE_VER

diff --git a/widgets/sdialogissuerepair.cpp b/widgets/sdialogissuerepair.cpp
@@ -393,7 +393,8 @@ void SDialogIssueRepair::issueRepairs()
 
         repairModel->setBoxIndex(-1);
         repairModel->setState(newState);
-        repairModel->setRejectReason(m_rejectReason);
+        if(!m_rejectReason.isEmpty())
+            repairModel->setRejectReason(m_rejectReason);
         BOQModel->repair_saveTables(SSaleTableModel::RepairOpType::Sale);
         repairModel->commit();
         nErr = workshopIssuedModel->commit();

diff --git a/widgets/sdialogissuerepair.h b/widgets/sdialogissuerepair.h
@@ -61,7 +61,7 @@ class SDialogIssueRepair : public SModalWidget
     bool m_isPayFromBalance = 0;
     bool m_isIssuingInCredit = 0;
     int m_paymentSystemId = 0;
-    QString m_rejectReason;
+    QString m_rejectReason = "";
     QMap<QString, double> m_repairsWithPayment; // QString для удобства обработки
     void setDefaultStyleSheets();
     void initWidgets();