Merge branch 'dev' into ZJX

OTSIncAMeasureApp/0-OTSModel/DTLBase/CSQLiteQuery.cs

@@ -63,7 +63,12 @@ namespace OTSModelSharp.DTLBase
 
         public string GetColValue(int a_nColIndex)
         {
-            return (string)reader.GetValue(a_nColIndex);
+            string readerValue = "";
+            while (reader.Read())
+            {
+                readerValue = (string)reader.GetValue(a_nColIndex);
+            }
+            return readerValue;
         }
 
         public bool IsColNull(int a_nColIndex)

OTSIncAMeasureApp/0-OTSModel/Measure/GetParamData/COTSMsrPrjResultData.cs

@@ -385,9 +385,16 @@ namespace OTSModelSharp
                 status.SetCompletedFieldsCenter(completedflds);
                 status.SetCompletedFields(completedflds.Count);
                 DateTime timeStart, timeEnd;
-
-                timeStart = Convert.ToDateTime(strTimeStart);
-                timeEnd = Convert.ToDateTime(strTimeEnd);
+                try
+                {
+                    timeStart = Convert.ToDateTime(ConvertFormatOfDateString(strTimeStart)); //此处为兼容之前得测量得结果可以打开，故在此进行数据格式变换
+                    timeEnd = Convert.ToDateTime(ConvertFormatOfDateString(strTimeEnd));
+                }
+                catch
+                {
+                    timeStart = Convert.ToDateTime(strTimeStart); //此处为兼容之前得测量得结果可以打开，故在此进行数据格式变换
+                    timeEnd = Convert.ToDateTime(strTimeEnd);
+                }
                 status.SetStartTime(timeStart);
                 status.SetEndTime(timeEnd);
                 status.SetUsedTime(timeEnd - timeStart);
@@ -420,6 +427,12 @@ namespace OTSModelSharp
             return false;
         }
 
+        string ConvertFormatOfDateString(string Time)
+        {
+            string[] str1 = Time.Split(' ');
+            string[] str2 = str1[0].Split('/');
+            return str2[2] + "/" + str2[1] + "/" + str2[0] +" "+ str1[1];
+        }
 
         public bool Save()
         {
@@ -468,7 +481,7 @@ namespace OTSModelSharp
             String strPathName = "";
             // file open dialog
             SaveFileDialog saveFileDialog = new SaveFileDialog();
-            saveFileDialog.FileName = m_strPathName;
+            saveFileDialog.FileName = m_strPathName.Split('\\')[m_strPathName.Split('\\').Length-1];
             saveFileDialog.Filter = "Probject Files (*.prj)|*.prj|All files (*.*)|*.*";
             if (saveFileDialog.ShowDialog() != DialogResult.OK)
             {

OTSIncAMeasureApp/0-OTSModel/Measure/GetParticleData/GenInfoDB.cs

@@ -254,7 +254,7 @@ namespace OTSModelSharp
 
             var sNameColumnName = tableInfoPtr.GetColumnName((int)CGenInfoTable.ColumnID.ITEM - (int)CGenInfoTable.ColumnID.MIN);
             String sSQLCommand = "";
-            string.Format("SELECT * FROM \'{0}\' WHERE {1} = \'{2}\'",
+            sSQLCommand=string.Format("SELECT * FROM \'{0}\' WHERE {1} = \'{2}\'",
                 (string)tableInfoPtr.GetTableName(),
                 sNameColumnName,
                 a_sItemName);

OTSIncAMeasureApp/0-OTSModel/Measure/GetStageInfo/DlgStageMgr.Designer.cs

@@ -49,17 +49,20 @@
             this.groupBox1.Controls.Add(this.m_ctrlBtnApply);
             this.groupBox1.Controls.Add(this.m_ctrlStagePicture);
             this.groupBox1.Controls.Add(this.m_ctrlListBoxStageList);
-            this.groupBox1.Location = new System.Drawing.Point(2, 1);
+            this.groupBox1.Location = new System.Drawing.Point(3, 2);
+            this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Size = new System.Drawing.Size(697, 317);
+            this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.groupBox1.Size = new System.Drawing.Size(1046, 476);
             this.groupBox1.TabIndex = 0;
             this.groupBox1.TabStop = false;
             // 
             // m_ctrlBtnExport
             // 
-            this.m_ctrlBtnExport.Location = new System.Drawing.Point(619, 291);
+            this.m_ctrlBtnExport.Location = new System.Drawing.Point(928, 436);
+            this.m_ctrlBtnExport.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlBtnExport.Name = "m_ctrlBtnExport";
-            this.m_ctrlBtnExport.Size = new System.Drawing.Size(75, 23);
+            this.m_ctrlBtnExport.Size = new System.Drawing.Size(112, 34);
             this.m_ctrlBtnExport.TabIndex = 6;
             this.m_ctrlBtnExport.Text = "导出";
             this.m_ctrlBtnExport.UseVisualStyleBackColor = true;
@@ -67,9 +70,10 @@
             // 
             // IDC_BTN_IMPORT
             // 
-            this.IDC_BTN_IMPORT.Location = new System.Drawing.Point(525, 291);
+            this.IDC_BTN_IMPORT.Location = new System.Drawing.Point(788, 436);
+            this.IDC_BTN_IMPORT.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.IDC_BTN_IMPORT.Name = "IDC_BTN_IMPORT";
-            this.IDC_BTN_IMPORT.Size = new System.Drawing.Size(75, 23);
+            this.IDC_BTN_IMPORT.Size = new System.Drawing.Size(112, 34);
             this.IDC_BTN_IMPORT.TabIndex = 5;
             this.IDC_BTN_IMPORT.Text = "导入";
             this.IDC_BTN_IMPORT.UseVisualStyleBackColor = true;
@@ -77,9 +81,10 @@
             // 
             // m_ctrlBtnRename
             // 
-            this.m_ctrlBtnRename.Location = new System.Drawing.Point(169, 291);
+            this.m_ctrlBtnRename.Location = new System.Drawing.Point(254, 436);
+            this.m_ctrlBtnRename.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlBtnRename.Name = "m_ctrlBtnRename";
-            this.m_ctrlBtnRename.Size = new System.Drawing.Size(75, 23);
+            this.m_ctrlBtnRename.Size = new System.Drawing.Size(112, 34);
             this.m_ctrlBtnRename.TabIndex = 4;
             this.m_ctrlBtnRename.Text = "重命名";
             this.m_ctrlBtnRename.UseVisualStyleBackColor = true;
@@ -87,9 +92,10 @@
             // 
             // m_ctrlBtnDelete
             // 
-            this.m_ctrlBtnDelete.Location = new System.Drawing.Point(87, 291);
+            this.m_ctrlBtnDelete.Location = new System.Drawing.Point(130, 436);
+            this.m_ctrlBtnDelete.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlBtnDelete.Name = "m_ctrlBtnDelete";
-            this.m_ctrlBtnDelete.Size = new System.Drawing.Size(75, 23);
+            this.m_ctrlBtnDelete.Size = new System.Drawing.Size(112, 34);
             this.m_ctrlBtnDelete.TabIndex = 3;
             this.m_ctrlBtnDelete.Text = "删除";
             this.m_ctrlBtnDelete.UseVisualStyleBackColor = true;
@@ -97,9 +103,10 @@
             // 
             // m_ctrlBtnApply
             // 
-            this.m_ctrlBtnApply.Location = new System.Drawing.Point(6, 291);
+            this.m_ctrlBtnApply.Location = new System.Drawing.Point(9, 436);
+            this.m_ctrlBtnApply.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlBtnApply.Name = "m_ctrlBtnApply";
-            this.m_ctrlBtnApply.Size = new System.Drawing.Size(75, 23);
+            this.m_ctrlBtnApply.Size = new System.Drawing.Size(112, 34);
             this.m_ctrlBtnApply.TabIndex = 2;
             this.m_ctrlBtnApply.Text = "应用";
             this.m_ctrlBtnApply.UseVisualStyleBackColor = true;
@@ -108,33 +115,36 @@
             // m_ctrlStagePicture
             // 
             this.m_ctrlStagePicture.BackColor = System.Drawing.Color.White;
-            this.m_ctrlStagePicture.Location = new System.Drawing.Point(316, 17);
+            this.m_ctrlStagePicture.Location = new System.Drawing.Point(474, 26);
+            this.m_ctrlStagePicture.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlStagePicture.Name = "m_ctrlStagePicture";
-            this.m_ctrlStagePicture.Size = new System.Drawing.Size(378, 267);
+            this.m_ctrlStagePicture.Size = new System.Drawing.Size(567, 400);
             this.m_ctrlStagePicture.TabIndex = 1;
             this.m_ctrlStagePicture.TabStop = false;
             // 
             // m_ctrlListBoxStageList
             // 
             this.m_ctrlListBoxStageList.FormattingEnabled = true;
-            this.m_ctrlListBoxStageList.ItemHeight = 12;
-            this.m_ctrlListBoxStageList.Location = new System.Drawing.Point(6, 17);
+            this.m_ctrlListBoxStageList.ItemHeight = 18;
+            this.m_ctrlListBoxStageList.Location = new System.Drawing.Point(9, 26);
+            this.m_ctrlListBoxStageList.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.m_ctrlListBoxStageList.Name = "m_ctrlListBoxStageList";
-            this.m_ctrlListBoxStageList.Size = new System.Drawing.Size(294, 268);
+            this.m_ctrlListBoxStageList.Size = new System.Drawing.Size(439, 400);
             this.m_ctrlListBoxStageList.TabIndex = 0;
             this.m_ctrlListBoxStageList.SelectedValueChanged += new System.EventHandler(this.OnSelchangeListStage);
             // 
             // DlgStageMgr
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(699, 320);
+            this.ClientSize = new System.Drawing.Size(1040, 454);
             this.Controls.Add(this.groupBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.MaximizeBox = false;
-            this.MaximumSize = new System.Drawing.Size(715, 359);
+            this.MaximumSize = new System.Drawing.Size(1062, 510);
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(715, 359);
+            this.MinimumSize = new System.Drawing.Size(1062, 510);
             this.Name = "DlgStageMgr";
             this.ShowIcon = false;
             this.ShowInTaskbar = false;

OTSIncAMeasureApp/0-OTSModel/Measure/GetStageInfo/DlgStageMgr.cs

@@ -241,7 +241,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
         void OnSelchangeListStage(object sender, EventArgs e)
         {
             m_nListBoxStageListIndex = m_ctrlListBoxStageList.SelectedIndex;
-            UpdateStageFileData(true);
+            //UpdateStageFileData(true);   为避免关闭界面仍然保存当前选择的样品台，此处注销了
             m_ctrlStagePicture.Refresh();
             DrawStage();
         }

OTSIncAMeasureApp/1-OTSMeasure/MeasureCheckResultInfoWindow.cs

@@ -39,7 +39,8 @@ namespace OTSMeasureApp
             //设置颗粒数量
             lblParticleCount.Text = particleCount.ToString();
             //开始与截至时间 相差时间
-            TimeSpan tsSub = MsrUsedTime;
+            //TimeSpan tsSub = MsrUsedTime;   
+            TimeSpan tsSub = TimeSpans(Convert.ToDateTime(beginTime), Convert.ToDateTime(endTime)); //为差值显示例准确，于此计算但数值不一定为真实值并且与domeasure中差值会出现不一致
             //设置测量时间
             string measureTime = string.Empty;
             if (tsSub.Days > 0)

OTSIncAMeasureApp/2-OTSMeasureParamManage/OTSMeasureParam.cs

@@ -173,8 +173,8 @@ namespace OTSMeasureApp
 
        
 
-        //新建样品工作文件
-        public bool CreateNewFile()
+        //新建样品工作文件 0:报错 1：正常 2：取消
+        public int CreateNewFile()
         {
             if (m_ResultData.IsModified())    // 文件被修改
             {
@@ -184,9 +184,13 @@ namespace OTSMeasureApp
                     if (!m_ResultData.Save())
                     {
 
-                        return false;
+                        return 0;
                     }
                 }
+                else if((int)MessageBoxRev.DIALOG_CANCEL == iRev)
+                {
+                    return 2;
+                }
             }
 
             //新建新的工作文件
@@ -200,10 +204,10 @@ namespace OTSMeasureApp
             //m_ProgMgr.SetPackId((int)OTS_SOFT_PACKAGE_ID.OTSIncA);
             if (!this.InitResultData())
             {
-                return false;
+                return 0;
             }
 
-            return true;
+            return 1;
         }
 
 

OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -158,7 +158,6 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(2);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -189,7 +188,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1283, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1924, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -687,11 +686,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 731);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 1010);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(1, 0, 9, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1283, 24);
+            this.statusStrip1.Size = new System.Drawing.Size(1924, 35);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -699,20 +698,20 @@
             // 
             this.TSGrayVal.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.TSGrayVal.Name = "TSGrayVal";
-            this.TSGrayVal.Size = new System.Drawing.Size(50, 19);
+            this.TSGrayVal.Size = new System.Drawing.Size(68, 28);
             this.TSGrayVal.Text = "灰度值";
             // 
             // STSemCoordinate
             // 
             this.STSemCoordinate.BorderSides = System.Windows.Forms.ToolStripStatusLabelBorderSides.Right;
             this.STSemCoordinate.Name = "STSemCoordinate";
-            this.STSemCoordinate.Size = new System.Drawing.Size(60, 19);
+            this.STSemCoordinate.Size = new System.Drawing.Size(88, 28);
             this.STSemCoordinate.Text = "SEM坐标";
             // 
             // toolStripStatusLabel1
             // 
             this.toolStripStatusLabel1.Name = "toolStripStatusLabel1";
-            this.toolStripStatusLabel1.Size = new System.Drawing.Size(47, 19);
+            this.toolStripStatusLabel1.Size = new System.Drawing.Size(77, 28);
             this.toolStripStatusLabel1.Text = "IsReady";
             this.toolStripStatusLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.toolStripStatusLabel1.Visible = false;
@@ -725,9 +724,9 @@
             this.dockPanel.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dockPanel.DockBackColor = System.Drawing.SystemColors.Control;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(4);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1283, 601);
+            this.dockPanel.Size = new System.Drawing.Size(1924, 880);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -804,9 +803,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1283, 755);
+            this.ClientSize = new System.Drawing.Size(1924, 1045);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -814,8 +813,7 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.MinimumSize = new System.Drawing.Size(684, 553);
+            this.MinimumSize = new System.Drawing.Size(1015, 744);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "样品测量程序";

OTSIncAMeasureApp/OTSIncAMeasureAppForm.cs

@@ -449,12 +449,18 @@ namespace OTSMeasureApp
         //新建样品工作文件
         private void ribbonOrbMenuItem3_CreateWorkspace_Click(object sender, EventArgs e)
         {
+            int iCreateNewFileResult = m_ProjParam.CreateNewFile();
 
-            if (!m_ProjParam.CreateNewFile())
+            if (iCreateNewFileResult == 0)
             {
                 log.Error("(OTSIncAMeasureAppForm.rbNew_CreateWorkspace_Click)  m_DataMgrFun.CreateNewFile() Failed !");
                 return;
             }
+            else if(iCreateNewFileResult == 2)
+            {
+                log.Info("(OTSIncAMeasureAppForm.rbNew_CreateWorkspace_Click)  m_DataMgrFun.CreateNewFile() Cancel !");
+                return;
+            }
             m_RibbonFun.SetAllRibbonButnStatus(true);
             //清除TREEVIEW和GRID上的显示的已经保存的样品信息
             m_SolutionWindows.m_TreeViewBase.DeleteAllTreeNode();
@@ -1183,6 +1189,10 @@ namespace OTSMeasureApp
                         return;
                     }
                 }
+                else if((int)MessageBoxRev.DIALOG_CANCEL== iRev)
+                {
+                    return;
+                }
             }
 
             bool bOpenFlag=false;

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -1628,7 +1628,7 @@ namespace OTSIncAReportGrids
             }
             else
             {
-                dmin = Convert.ToInt32(min);
+                dmin = Convert.ToDouble(min);
             }
             if(dmin<=dmax)
             {
@@ -1681,10 +1681,13 @@ namespace OTSIncAReportGrids
                 }
             }
 
-            if(!CompareInput(tBx_AreaMin.Text, Tbx_AreaMax.Text))
+            if (!string.IsNullOrWhiteSpace(tBx_AreaMin.Text) && !string.IsNullOrWhiteSpace(Tbx_AreaMax.Text))
             {
-                MessageBox.Show(table["str11"].ToString());
-                return;
+                if (!CompareInput(tBx_AreaMin.Text, Tbx_AreaMax.Text))
+                {
+                    MessageBox.Show(table["str11"].ToString());
+                    return;
+                }
             }
             
 
@@ -1726,10 +1729,13 @@ namespace OTSIncAReportGrids
                 }
             }
 
-            if (!CompareInput(tbx_DmaxMin.Text, tbx_DmaxMax.Text))
+            if (!string.IsNullOrWhiteSpace(tbx_DmaxMin.Text) && !string.IsNullOrWhiteSpace(tbx_DmaxMax.Text))
             {
-                MessageBox.Show(table["str11"].ToString());
-                return;
+                if (!CompareInput(tbx_DmaxMin.Text, tbx_DmaxMax.Text))
+                {
+                    MessageBox.Show(table["str11"].ToString());
+                    return;
+                }
             }
 
             if (!string.IsNullOrWhiteSpace(tbx_Type.Text))

OTSIncAReportApp/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1991,6 +1991,8 @@ namespace OTSIncAReportApp
             WriteRictBox("-----------------导出完成!--------------------", Color.Red);
             MemoryManagementClass.FlushMemory();
 
+
+
             //导出完成，打开报表
             OpenOTSINcAreportTemplateAPP();
             m_ReportApp.m_DataMgrFun.ShowsTheDefaultPic();

OTSIncAReportTemplate/OTSIncAReportTemplate.cs

@@ -61,7 +61,7 @@ namespace OTSIncAReportTemplate
             //}
 
             //方便测试代码分岐
-            bool bDebug = false;
+            bool bDebug = true;
             if (bDebug == false)
             {
                 m_arg1 = args[0].Replace("^", " ");
@@ -85,7 +85,7 @@ namespace OTSIncAReportTemplate
                 //m_arg4 = "0-983";
                 //m_arg5 = "";
 
-                m_arg1 = "C:\\Users\\admin\\Desktop\\aaa\\Sample1\\ReportTemplateDB.db";
+                m_arg1 = "E:\\ResultFile\\beijing20210708\\Sample4\\ReportTemplateDB.db";
                 m_arg2 = "./Config/ProData/ReportTemplateConfig.xml";
                 m_arg3 = "MainReport";
                 m_arg4 = "100";
@@ -224,7 +224,7 @@ namespace OTSIncAReportTemplate
             }
 
 
-            if (m_mbszclass.M_SY.b_ck_jggk)//判断样品说明是否显示
+            if (m_mbszclass.M_SY.b_ck_ypsm)//判断样品说明是否显示
             {
                 rmReport1.AddDataSet(ls_resultgrid, "ResultGrid");
                 ls_resultgrid.Dispose();
@@ -548,6 +548,7 @@ namespace OTSIncAReportTemplate
                 m_mbszclass.M_YMYJ.str_tb_KHH = xmlutil.Read("M_YMYJ", "str_tb_KHH");
                 m_mbszclass.M_YMYJ.b_ck_ym = Convert.ToBoolean(xmlutil.Read("M_YMYJ", "b_ck_ym"));
                 m_mbszclass.M_YMYJ.str_tb_yjwb = xmlutil.Read("M_YMYJ", "str_tb_yjwb");
+                MessageBox.Show(m_mbszclass.M_YMYJ.str_tb_ymwb+"!!"+m_mbszclass.M_YMYJ.str_tb_KHH+"!!"+m_mbszclass.M_YMYJ.str_tb_yjwb);
                 //颗粒分析结果
                 m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk = Convert.ToBoolean(xmlutil.Read("M_KLFXJG", "b_ck_klcc_xsmk"));//是否显示模块
                 m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = Convert.ToInt32(xmlutil.Read("M_KLFXJG", "index_cb_klcc_jsfs"));//计算方式

OTSIncAReportTemplate/OTSIncAReportTemplate.csproj

@@ -53,12 +53,9 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
     <LangVersion>7.3</LangVersion>
     <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DocumentationFile>
-    </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>..\bin\x64\Release\</OutputPath>
@@ -71,7 +68,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release_oxford50|x64'">
-    <OutputPath>..\bin\x64\Release_oxford50\</OutputPath>
+    <OutputPath>..\Bin\x64\%24%28Configuration%29\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -98,9 +95,14 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Bin\x64\Debug\ReportTemplateExe\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.114.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.114.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.114.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.114.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.114.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -154,6 +156,8 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.114.0\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
 </Project>