From 651d1f87d2e0e26021c20f3667e1db7b1349b478 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:27:44 +0800
Subject: [PATCH] 冲突缺少文件补充
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs | 78 +++++++++++++++------------------------
1 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
index eee6078..f31e572 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs
@@ -1,4 +1,7 @@
-锘縩amespace HStation.WinFrmUI
+锘縰sing HStation.Vmo;
+using NPOI.HSSF.Record;
+
+namespace HStation.WinFrmUI
{
public partial class SetXhsProjectMapLocationWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -24,17 +27,17 @@
this.mapSetSimpleMarkerContainer1.LoadCompletedEvent += MapSetSimpleMarkerContainer1_LoadCompletedEvent;
this.mapSetSimpleMarkerContainer1.SetMarkerEvent += MapSetSimpleMarkerContainer1_SetMarkerEvent;
await this.mapSetSimpleMarkerContainer1.InitialContainer();
- if (!InputXhsProjectInfoWizardPage.AllowImport)
- {
- AllowNext = false;
- AllowComplete = true;
- PageStateChangedEvent.Invoke();
- }
- else
- {
- AllowNext = true;
- AllowComplete = false;
- }
+ /* if (!InputXhsProjectInfoWizardPage.AllowImport)
+ {
+ AllowNext = false;
+ AllowComplete = true;
+ }
+ else
+ {
+ AllowNext = true;
+ AllowComplete = false;
+ }*/
+ PageStateChangedEvent.Invoke();
}
/// <summary>
@@ -62,8 +65,8 @@
/// </summary>
public bool AllowNext
{
- get;
- set;
+ get { return true; }
+ set { }
}
/// <summary>
@@ -79,8 +82,8 @@
/// </summary>
public bool AllowComplete
{
- get;
- set;
+ get { return false; }
+ set { }
}
/// <summary>
@@ -112,14 +115,15 @@
/// </summary>
public bool CanComplete()
{
- Task.Run(() => InsertProject());
+ Task<bool> task = Task.Run(async () => await InsertProject());
+ var bol = task.GetAwaiter();
return true;
}
- private async void InsertProject()
+ private async Task<bool> InsertProject()
{
var bllXhsProjectExtensions = new BLL.XhsProjectExtensions();
- var project = new Vmo.Xhs.XhsProjectExtensions();
+ var project = new XhsProjectExtensionsVmo();
project.NO = _vm.NO;
project.Name = _vm.Name;
project.Address = _vm.Address;
@@ -127,8 +131,8 @@
project.Flags = _vm.Flags;
project.TagName = _vm.TagName;
project.Description = _vm.Description;
- project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
- new Vmo.Xhs.XhsProjectSite(){
+ project.SiteList = new List<XhsProjectSiteVmo>() {
+ new XhsProjectSiteVmo(){
Name=_vm.Name,
Description=_vm.Description
}
@@ -136,9 +140,10 @@
var projectId = await bllXhsProjectExtensions.Insert(project);
if (projectId > 1)
{
+ _vm.ProjectID = projectId;
if (_vm.Location != null)
{
- var mapInfo = new Yw.Vmo.Map.MapInfo();
+ var mapInfo = new Yw.Vmo.MapInfoVmo();
mapInfo.ObjectType = HStation.Xhs.DataType.XhsProject;
mapInfo.ObjectID = projectId;
mapInfo.ObjectName = project.Name;
@@ -149,38 +154,15 @@
var mapInfoId = await new Yw.BLL.MapInfo().Insert(mapInfo);
if (mapInfoId < 1)
{
- if (this.InvokeRequired)
- {
- this.Invoke(new Action(() =>
- {
- // 鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }));
- }
- else
- {
- // 鐩存帴鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }
+ return false;
}
else
{
- if (this.InvokeRequired)
- {
- this.Invoke(new Action(() =>
- {
- // 鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }));
- }
- else
- {
- // 鐩存帴鏇存柊UI鎺т欢
- MessageBoxHelper.ShowError("瀵煎叆閿欒!");
- }
+ return true;
}
}
}
+ return true;
}
//鍦板浘鍔犺浇瀹屾垚
--
Gitblit v1.9.3