清理项目文件。

代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/car_dealer_util.vcxproj

@@ -59,11 +59,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <SourcePath>.\source\;$(SourcePath)</SourcePath>
+    <SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath>
+    <IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-    <SourcePath>.\source\;$(SourcePath)</SourcePath>
+    <SourcePath>.\source\;vs2019\car_dealer_util\source\;$(SourcePath)</SourcePath>
+    <IncludePath>vs2019\car_dealer_util\source\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
     <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
@@ -83,11 +85,11 @@
     <Import Project="$(QtMsBuild)\qt_defaults.props" />
   </ImportGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QtInstall>5.13.0_msvc2017_64</QtInstall>
+    <QtInstall>5.13.1_msvc2017_x64</QtInstall>
     <QtModules>core;gui;widgets</QtModules>
   </PropertyGroup>
   <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QtInstall>5.13.0_msvc2017_64</QtInstall>
+    <QtInstall>5.13.1_msvc2017_x64</QtInstall>
     <QtModules>core;gui;widgets</QtModules>
   </PropertyGroup>
   <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
@@ -97,7 +99,7 @@
     <QtMoc>
       <PrependInclude>
       </PrependInclude>
-      <QtMocDir>source\%(RelativeDir)</QtMocDir>
+      <QtMocDir>vs2019\car_dealer_util\source\%(RelativeDir)</QtMocDir>
     </QtMoc>
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -125,7 +127,7 @@
     <QtMoc>
       <PrependInclude>
       </PrependInclude>
-      <QtMocDir>source\%(RelativeDir)</QtMocDir>
+      <QtMocDir>vs2019\car_dealer_util\source\%(RelativeDir)</QtMocDir>
     </QtMoc>
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>

代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/moc_QMainFrame.cpp

@@ -1,19 +1,19 @@
 /****************************************************************************
 ** Meta object code from reading C++ file 'QMainFrame.h'
 **
-** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.0)
+** Created by: The Qt Meta Object Compiler version 67 (Qt 5.13.1)
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/
 
 #include <memory>
-#include "../../../../source/Widgets/MainFrame/QMainFrame.h"
+#include "../../../../../../source/Widgets/MainFrame/QMainFrame.h"
 #include <QtCore/qbytearray.h>
 #include <QtCore/qmetatype.h>
 #if !defined(Q_MOC_OUTPUT_REVISION)
 #error "The header file 'QMainFrame.h' doesn't include <QObject>."
 #elif Q_MOC_OUTPUT_REVISION != 67
-#error "This file was generated using the moc from 5.13.0. It"
+#error "This file was generated using the moc from 5.13.1. It"
 #error "cannot be used with the include files from this version of Qt."
 #error "(The moc has changed too much.)"
 #endif

代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/Widgets/MainFrame/ui_QMainFrame.h

@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading UI file 'QMainFrame.ui'
 **
-** Created by: Qt User Interface Compiler version 5.13.0
+** Created by: Qt User Interface Compiler version 5.13.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!
 ********************************************************************************/

代码/cpp/car_dealer_util/proj/vs2019/car_dealer_util/source/qrc_resource.cpp

@@ -1,7 +1,7 @@
 /****************************************************************************
 ** Resource object code
 **
-** Created by: The Resource Compiler for Qt version 5.13.0
+** Created by: The Resource Compiler for Qt version 5.13.1
 **
 ** WARNING! All changes made in this file will be lost!
 *****************************************************************************/

代码/cpp/car_dealer_util/proj/vs2019/车商渠道数据管理.sln

@@ -20,6 +20,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
+		Qt5Version = 5.13.1_msvc2017_x64
 		SolutionGuid = {7A1F667A-8FB5-4B18-8D74-E810D205DFA9}
 	EndGlobalSection
 EndGlobal

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/car_dealer_util.rc

@@ -1,2 +0,0 @@
-IDI_ICON1		ICON		DISCARDABLE	"car_dealer_util.ico"
-

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/car_dealer_util.vcxproj

@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{B12702AD-ABFB-343A-A199-8E24837244A3}</ProjectGuid>
-    <Keyword>QtVS_v301</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <PropertyGroup Condition="'$(QtMsBuild)'=='' or !Exists('$(QtMsBuild)\qt.targets')">
-    <QtMsBuild>$(MSBuildProjectDirectory)\QtMsBuild</QtMsBuild>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <Target Name="QtMsBuildNotFound" BeforeTargets="CustomBuild;ClCompile" Condition="!Exists('$(QtMsBuild)\qt.targets') or !Exists('$(QtMsBuild)\qt.props')">
-    <Message Importance="High" Text="QtMsBuild: could not locate qt.targets, qt.props; project may not build correctly." />
-  </Target>
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="Shared" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt_defaults.props')">
-    <Import Project="$(QtMsBuild)\qt_defaults.props" />
-  </ImportGroup>
-  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <QtInstall>5.13.0_msvc2017_64</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-  </PropertyGroup>
-  <PropertyGroup Label="QtSettings" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <QtInstall>5.13.0_msvc2017_64</QtInstall>
-    <QtModules>core;gui;widgets</QtModules>
-  </PropertyGroup>
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.props')">
-    <Import Project="$(QtMsBuild)\qt.props" />
-  </ImportGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <Optimization>Disabled</Optimization>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <DebugInformationFormat />
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <OutputFile>$(OutDir)\$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="widgets\MainFrame\QMainFrame.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtRcc Include="resource.qrc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="car_dealer_util.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtUic Include="widgets\MainFrame\QMainFrame.ui" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtMoc Include="widgets\MainFrame\QMainFrame.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Condition="Exists('$(QtMsBuild)\qt.targets')">
-    <Import Project="$(QtMsBuild)\qt.targets" />
-  </ImportGroup>
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/car_dealer_util.vcxproj.filters

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
-      <Extensions>qrc;*</Extensions>
-      <ParseFiles>false</ParseFiles>
-    </Filter>
-    <Filter Include="Form Files">
-      <UniqueIdentifier>{99349809-55BA-4b9d-BF79-8FDBB0286EB3}</UniqueIdentifier>
-      <Extensions>ui</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}</UniqueIdentifier>
-      <Extensions>qrc;*</Extensions>
-      <ParseFiles>false</ParseFiles>
-    </Filter>
-    <Filter Include="窗口">
-      <UniqueIdentifier>{e9560f23-aca5-4e4a-96bb-b3e285a2c097}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="窗口\主窗口">
-      <UniqueIdentifier>{7068cd3f-c878-404f-8410-cebbc5133a6a}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="widgets\MainFrame\QMainFrame.cpp">
-      <Filter>窗口\主窗口</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <QtRcc Include="resource.qrc">
-      <Filter>Resource Files</Filter>
-    </QtRcc>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="car_dealer_util.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <QtUic Include="widgets\MainFrame\QMainFrame.ui">
-      <Filter>窗口\主窗口</Filter>
-    </QtUic>
-  </ItemGroup>
-  <ItemGroup>
-    <QtMoc Include="widgets\MainFrame\QMainFrame.h">
-      <Filter>窗口\主窗口</Filter>
-    </QtMoc>
-  </ItemGroup>
-</Project>

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/car_dealer_util.vcxproj.user

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/main.cpp

@@ -1,11 +0,0 @@
-
-#include <QtWidgets/QApplication>
-#include "widgets/MainFrame/QMainFrame.h"
-
-int main(int argc, char* argv[])
-{
-	QApplication a(argc, argv);
-	QMainFrame w;
-	w.show();
-	return a.exec();
-}

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/resource.qrc

@@ -1,34 +0,0 @@
-<RCC>
-    <qresource prefix="/QMainFrame">
-        <file>Resources/8218_box1.png</file>
-        <file>Resources/20121016085311441_easyicon_cn_128.png</file>
-        <file>Resources/app.ico</file>
-        <file>Resources/car.png</file>
-        <file>Resources/car2.png</file>
-        <file>Resources/cat.png</file>
-        <file>Resources/clean.png</file>
-        <file>Resources/CNY_Red.png</file>
-        <file>Resources/CPIC.png</file>
-        <file>Resources/CPIC透明.png</file>
-        <file>Resources/dec.png</file>
-        <file>Resources/edit.png</file>
-        <file>Resources/excel.png</file>
-        <file>Resources/face.png</file>
-        <file>Resources/find.png</file>
-        <file>Resources/folder.png</file>
-        <file>Resources/gear.png</file>
-        <file>Resources/login.png</file>
-        <file>Resources/manager.png</file>
-        <file>Resources/new.png</file>
-        <file>Resources/ok.png</file>
-        <file>Resources/option.png</file>
-        <file>Resources/plus.png</file>
-        <file>Resources/print.png</file>
-        <file>Resources/quit.png</file>
-        <file>Resources/save.png</file>
-        <file>Resources/save2.png</file>
-        <file>Resources/telephone.png</file>
-        <file>Resources/tongji.png</file>
-        <file>Resources/x.png</file>
-    </qresource>
-</RCC>

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/widgets/MainFrame/QMainFrame.cpp

@@ -1,7 +0,0 @@
-#include "QMainFrame.h"
-
-QMainFrame::QMainFrame(QWidget *parent)
-	: QMainWindow(parent)
-{
-	ui.setupUi(this);
-}

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/widgets/MainFrame/QMainFrame.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#include <QtWidgets/QMainWindow>
-#include "ui_QMainFrame.h"
-
-class QMainFrame : public QMainWindow
-{
-	Q_OBJECT
-
-public:
-	QMainFrame(QWidget *parent = Q_NULLPTR);
-
-private:
-	Ui::QMainFrameClass ui;
-};

代码/cpp/car_dealer_util/proj/vs2019_bak/car_dealer_util/widgets/MainFrame/QMainFrame.ui

@@ -1,29 +0,0 @@
-<UI version="4.0" >
- <class>QMainFrameClass</class>
- <widget class="QMainWindow" name="QMainFrameClass" >
-  <property name="objectName" >
-   <string notr="true">QMainFrameClass</string>
-  </property>
-  <property name="geometry" >
-   <rect>
-	<x>0</x>
-	<y>0</y>
-	<width>600</width>
-	<height>400</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>QMainFrame</string>
-  </property>
-  <widget class="QMenuBar" name="menuBar" />
-  <widget class="QToolBar" name="mainToolBar" />
-  <widget class="QWidget" name="centralWidget" />
-  <widget class="QStatusBar" name="statusBar" />
- </widget>
- <layoutDefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
- <resources>
-   <include location="resource.qrc"/>
- </resources>
- <connections/>
-</UI>

代码/cpp/car_dealer_util/proj/vs2019_bak/车商数据管理.sln

@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29609.76
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "car_dealer_util", "car_dealer_util\car_dealer_util.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64
-		{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64
-		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.ActiveCfg = Release|x64
-		{B12702AD-ABFB-343A-A199-8E24837244A3}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {38531906-6682-48A8-AF7C-FA9DD7277509}
-	EndGlobalSection
-EndGlobal

代码/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp

@@ -13,7 +13,7 @@ void SetKey( Book * pBook )
 		return;
 	}
 
-	pBook->setKey(L"cpic", L"windows-202d21040bc4e70060bc6264a6ucu7i1");
+	pBook->setKey( L"cpic", L"windows-202d21040bc4e70060bc6264a6ucu7i1" );
 }
 
 /************************************************
@@ -21,16 +21,38 @@ void SetKey( Book * pBook )
 * \param filePath Excel文件路径
 * \param schemeMap 存放车商方案数据的map
 ************************************************/
-void LoadCarDealerSchemeFromXlsx( const wstring &        filePath,
+void LoadCarDealerSchemeFromXlsx( const wstring &                 filePath,
+                                  unsigned int                    sheetIndex,
+                                  unsigned int                    firstRowIndex,
                                   map<wstring, CarDealerScheme> & schemeMap )
 {
-	Book* pBook = xlCreateXMLBookW();
-	Sheet* pSheet = nullptr;
+	Book *  pBook  = xlCreateXMLBookW();
+	Sheet * pSheet = nullptr;
 
 	if ( pBook == nullptr )
 	{
-		throw runtime_error("libxl库加载失败！");
+		throw runtime_error( "libxl库加载失败！" );
 	}
 
-	SetKey(pBook);
+	SetKey( pBook );
+
+	if ( pBook->load( filePath.c_str() ) != true )
+	{
+		string errorMessage = "打开文件失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		throw runtime_error( errorMessage );
+	}
+
+	pSheet = pBook->getSheet( sheetIndex );
+
+	if ( pSheet == nullptr )
+	{
+		string errorMessage = "读取sheet失败！";
+		errorMessage.append( pBook->errorMessage() );
+
+		throw runtime_error( errorMessage );
+	}
+
+	
 }

发布/组件.txt

@@ -0,0 +1,3 @@
+qt 5.13.1
+libxl 3.8.5
+ocilib 4.6.3