提交信息!

This commit is contained in:
2020-12-18 17:21:29 +08:00
parent 63910b48ea
commit 6be7e49dd2
7 changed files with 113 additions and 79 deletions

View File

@@ -7,4 +7,4 @@ UserInfo * pStaffInfo = nullptr;
const string SYSTEM_ADMIN = "999";
const string ADMIN = "000";
const string TEAM_LEADER = "000";
const string TEAM_LEADER = "001";

View File

@@ -70,6 +70,7 @@ const wchar_t * pwszRepairOrderCaption[] = {
//卢霖城-送返修推荐表
const unsigned int REPAIR_RECOMMANDATION_CAPTION_COUNT = 11;
const wchar_t * pwszRepairRecommandationCaption[] = {
L"分公司名称",
L"工单号",
L"工单类型",
L"报案号",
@@ -781,6 +782,7 @@ void LoadRepairRecommandationFromXlsx( const std::wstring &
//起始列索引
int colunmIndex = pSheet->firstCol();
wstring branchName = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
wstring orderNo = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
wstring orderType = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
wstring notifyNo = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
@@ -793,7 +795,8 @@ void LoadRepairRecommandationFromXlsx( const std::wstring &
wstring messageSendingDate = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
wstring dataSource = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true );
RepairRecommandationRecord record( orderNo,
RepairRecommandationRecord record( branchName,
orderNo,
orderType,
notifyNo,
RecommandCarDealerCode,

View File

@@ -448,7 +448,8 @@ void ImportRepairRecommandationToOracle( const std::string &
const otext * szSql =
"BEGIN \n"
" car_dealer.data_import_util_pkg.import_repairing_suggestion(:a_order_no, \n"
" car_dealer.data_import_util_pkg.import_repairing_suggestion(:a_branch_name, \n"
" :a_order_no, \n"
" :a_order_type, \n"
" :a_notify_no, \n"
" :a_sug_cardealer_code, \n"
@@ -484,7 +485,6 @@ void ImportRepairRecommandationToOracle( const std::string &
}
catch ( runtime_error & error )
{
OCI_ConnectionFree( pConn );
OCI_Cleanup();
throw error;
@@ -497,6 +497,7 @@ void ImportRepairRecommandationToOracle( const std::string &
try
{
//绑定数据
string = QString::fromStdWString(iterOrder->getBrandName()).toLocal8Bit();
string = QString::fromStdWString( iterOrder->getOrderNo() ).toLocal8Bit();
string = QString::fromStdWString( iterOrder->getOrderType() ).toLocal8Bit();
string = QString::fromStdWString( iterOrder->getNotifyNo() ).toLocal8Bit();
@@ -515,6 +516,7 @@ void ImportRepairRecommandationToOracle( const std::string &
}
//执行语句
OCI_BindString(pStmt, ":a_branch_name", (otext*).c_str(), .size());
OCI_BindString( pStmt, ":a_order_no", (otext*).c_str(), .size() );
OCI_BindString( pStmt, ":a_order_type", (otext*).c_str(), .size() );
OCI_BindString( pStmt, ":a_notify_no", (otext*).c_str(), .size() );
@@ -540,8 +542,6 @@ void ImportRepairRecommandationToOracle( const std::string &
//output_error_message( errorMessage );
OCI_Rollback( pConn );
OCI_ConnectionFree( pConn );
OCI_Cleanup();
throw runtime_error( errorMessage );

View File

@@ -1,4 +1,4 @@
#pragma once
#pragma once
#include <string>
@@ -9,33 +9,28 @@
class RepairRecommandationRecord
{
public:
RepairRecommandationRecord( std::wstring orderNo,
std::wstring orderType,
std::wstring notifyNo,
std::wstring suggestedCarDealerCode,
std::wstring suggestedCarDealerName,
std::wstring damageDate,
std::wstring plateNumber,
std::wstring brandName,
std::wstring messageType,
std::wstring messageSendingDate,
std::wstring dataSource )
: orderNo_( std::move( orderNo ) ),
orderType_( std::move( orderType ) ),
notifyNo_( std::move( notifyNo ) ),
suggestedCarDealerCode_( std::move( suggestedCarDealerCode ) ),
suggestedCarDealerName_( std::move( suggestedCarDealerName ) ),
damageDate_( std::move( damageDate ) ),
plateNumber_( std::move( plateNumber ) ),
brandName_( std::move( brandName ) ),
messageType_( std::move( messageType ) ),
messageSendingDate_( std::move( messageSendingDate ) ),
dataSource_( std::move( dataSource ) )
RepairRecommandationRecord( std::wstring branchName, std::wstring orderNo, std::wstring orderType, std::wstring notifyNo, std::wstring suggestedCarDealerCode, std::wstring suggestedCarDealerName, std::wstring damageDate, std::wstring plateNumber, std::wstring brandName, std::wstring messageType, std::wstring messageSendingDate, std::wstring dataSource )
: branchName_( std::move(branchName) ),
orderNo_( std::move(orderNo) ),
orderType_( std::move(orderType) ),
notifyNo_( std::move(notifyNo) ),
suggestedCarDealerCode_( std::move(suggestedCarDealerCode) ),
suggestedCarDealerName_( std::move(suggestedCarDealerName) ),
damageDate_( std::move(damageDate) ),
plateNumber_( std::move(plateNumber) ),
brandName_( std::move(brandName) ),
messageType_( std::move(messageType) ),
messageSendingDate_( std::move(messageSendingDate) ),
dataSource_( std::move(dataSource) )
{
}
RepairRecommandationRecord( const RepairRecommandationRecord & other )
: orderNo_( other.orderNo_ ),
: branchName_( other.branchName_ ),
orderNo_( other.orderNo_ ),
orderType_( other.orderType_ ),
notifyNo_( other.notifyNo_ ),
suggestedCarDealerCode_( other.suggestedCarDealerCode_ ),
@@ -50,17 +45,18 @@ public:
}
RepairRecommandationRecord( RepairRecommandationRecord && other )
: orderNo_( std::move( other.orderNo_ ) ),
orderType_( std::move( other.orderType_ ) ),
notifyNo_( std::move( other.notifyNo_ ) ),
suggestedCarDealerCode_( std::move( other.suggestedCarDealerCode_ ) ),
suggestedCarDealerName_( std::move( other.suggestedCarDealerName_ ) ),
damageDate_( std::move( other.damageDate_ ) ),
plateNumber_( std::move( other.plateNumber_ ) ),
brandName_( std::move( other.brandName_ ) ),
messageType_( std::move( other.messageType_ ) ),
messageSendingDate_( std::move( other.messageSendingDate_ ) ),
dataSource_( std::move( other.dataSource_ ) )
: branchName_( std::move(other.branchName_) ),
orderNo_( std::move(other.orderNo_) ),
orderType_( std::move(other.orderType_) ),
notifyNo_( std::move(other.notifyNo_) ),
suggestedCarDealerCode_( std::move(other.suggestedCarDealerCode_) ),
suggestedCarDealerName_( std::move(other.suggestedCarDealerName_) ),
damageDate_( std::move(other.damageDate_) ),
plateNumber_( std::move(other.plateNumber_) ),
brandName_( std::move(other.brandName_) ),
messageType_( std::move(other.messageType_) ),
messageSendingDate_( std::move(other.messageSendingDate_) ),
dataSource_( std::move(other.dataSource_) )
{
}
@@ -68,6 +64,7 @@ public:
{
if ( this == &other )
return *this;
branchName_ = other.branchName_;
orderNo_ = other.orderNo_;
orderType_ = other.orderType_;
notifyNo_ = other.notifyNo_;
@@ -86,6 +83,7 @@ public:
{
if ( this == &other )
return *this;
branchName_ = std::move( other.branchName_ );
orderNo_ = std::move( other.orderNo_ );
orderType_ = std::move( other.orderType_ );
notifyNo_ = std::move( other.notifyNo_ );
@@ -100,6 +98,39 @@ public:
return *this;
}
friend bool operator==( const RepairRecommandationRecord & lhs, const RepairRecommandationRecord & rhs )
{
return lhs.branchName_ == rhs.branchName_
&& lhs.orderNo_ == rhs.orderNo_
&& lhs.orderType_ == rhs.orderType_
&& lhs.notifyNo_ == rhs.notifyNo_
&& lhs.suggestedCarDealerCode_ == rhs.suggestedCarDealerCode_
&& lhs.suggestedCarDealerName_ == rhs.suggestedCarDealerName_
&& lhs.damageDate_ == rhs.damageDate_
&& lhs.plateNumber_ == rhs.plateNumber_
&& lhs.brandName_ == rhs.brandName_
&& lhs.messageType_ == rhs.messageType_
&& lhs.messageSendingDate_ == rhs.messageSendingDate_
&& lhs.dataSource_ == rhs.dataSource_;
}
friend bool operator!=( const RepairRecommandationRecord & lhs, const RepairRecommandationRecord & rhs )
{
return !(lhs == rhs);
}
std::wstring getBranchName() const
{
return branchName_;
}
void setBranchName( const std::wstring & branchName )
{
branchName_ = branchName;
}
std::wstring getOrderNo() const
{
return orderNo_;
@@ -211,6 +242,7 @@ public:
}
private:
std::wstring branchName_;
std::wstring orderNo_;
std::wstring orderType_;
std::wstring notifyNo_;