From 7d49fe63d26ec26ebee525a7ee26d8ee1dfbbc60 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期四, 22 八月 2024 08:48:19 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs | 107 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 15 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 2eb39da..99ea45b 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,5 +1,4 @@
-锘�
-namespace HStation.WinFrmUI
+锘縩amespace HStation.WinFrmUI
{
public partial class SetXhsProjectMapLocationWizardPage : DevExpress.XtraEditors.XtraUserControl, Yw.WinFrmUI.IWizardPage<ImportXhsProjectViewModel>
{
@@ -16,18 +15,27 @@
/// </summary>
public async void InitialPage(ImportXhsProjectViewModel t)
{
- if (_isInitialize)
- {
- return;
- }
+ /* if (_isInitialize)
+ {
+ return;
+ }*/
_vm = t;
- _isInitialize = true;
+ //_isInitialize = true;
this.mapSetSimpleMarkerContainer1.LoadCompletedEvent += MapSetSimpleMarkerContainer1_LoadCompletedEvent;
this.mapSetSimpleMarkerContainer1.SetMarkerEvent += MapSetSimpleMarkerContainer1_SetMarkerEvent;
await this.mapSetSimpleMarkerContainer1.InitialContainer();
+ if (!InputXhsProjectInfoWizardPage.AllowImport)
+ {
+ AllowNext = false;
+ AllowComplete = true;
+ }
+ else
+ {
+ AllowNext = true;
+ AllowComplete = false;
+ }
+ PageStateChangedEvent.Invoke();
}
-
-
/// <summary>
/// 鏄惁鍒濆鍖�
@@ -36,6 +44,7 @@
{
get { return _isInitialize; }
}
+
private bool _isInitialize = false;
public event Action PageStateChangedEvent;
@@ -53,7 +62,8 @@
/// </summary>
public bool AllowNext
{
- get { return true; }
+ get;
+ set;
}
/// <summary>
@@ -69,7 +79,8 @@
/// </summary>
public bool AllowComplete
{
- get { return false; }
+ get;
+ set;
}
/// <summary>
@@ -101,7 +112,75 @@
/// </summary>
public bool CanComplete()
{
- return false;
+ Task.Run(() => InsertProject());
+ return true;
+ }
+
+ private async void InsertProject()
+ {
+ var bllXhsProjectExtensions = new BLL.XhsProjectExtensions();
+ var project = new Vmo.Xhs.XhsProjectExtensions();
+ project.NO = _vm.NO;
+ project.Name = _vm.Name;
+ project.Address = _vm.Address;
+ project.Customer = _vm.Customer;
+ project.Flags = _vm.Flags;
+ project.TagName = _vm.TagName;
+ project.Description = _vm.Description;
+ project.SiteList = new List<Vmo.Xhs.XhsProjectSite>() {
+ new Vmo.Xhs.XhsProjectSite(){
+ Name=_vm.Name,
+ Description=_vm.Description
+ }
+ };
+ var projectId = await bllXhsProjectExtensions.Insert(project);
+ if (projectId > 1)
+ {
+ if (_vm.Location != null)
+ {
+ var mapInfo = new Yw.Vmo.Map.MapInfo();
+ mapInfo.ObjectType = HStation.Xhs.DataType.XhsProject;
+ mapInfo.ObjectID = projectId;
+ mapInfo.ObjectName = project.Name;
+ mapInfo.Purpose = Yw.Map.Purpose.Location;
+ mapInfo.Kind = Yw.Map.Kind.Gaodei;
+ mapInfo.Shape = Yw.Map.Shape.Marker;
+ mapInfo.Position = _vm.Location.ToJson();
+ 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("瀵煎叆閿欒!");
+ }
+ }
+ else
+ {
+ if (this.InvokeRequired)
+ {
+ this.Invoke(new Action(() =>
+ {
+ // 鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowSuccess("瀵煎叆鎴愬姛!");
+ }));
+ }
+ else
+ {
+ // 鐩存帴鏇存柊UI鎺т欢
+ MessageBoxHelper.ShowSuccess("瀵煎叆鎴愬姛!");
+ }
+ }
+ }
+ }
}
//鍦板浘鍔犺浇瀹屾垚
@@ -126,7 +205,5 @@
}
this.txtAddress.EditValue = obj.Address;
}
-
-
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3