冲突缺少文件补充

duheng

2024-09-23 651d1f87d2e0e26021c20f3667e1db7b1349b478

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/03-MapLocation/SetXhsProjectMapLocationWizardPage.cs

@@ -1,4 +1,5 @@
using NPOI.HSSF.Record;
using HStation.Vmo;
using NPOI.HSSF.Record;

namespace HStation.WinFrmUI
{
@@ -26,16 +27,16 @@
            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;
            }
            /*  if (!InputXhsProjectInfoWizardPage.AllowImport)
              {
                  AllowNext = false;
                  AllowComplete = true;
              }
              else
              {
                  AllowNext = true;
                  AllowComplete = false;
              }*/
            PageStateChangedEvent.Invoke();
        }

@@ -64,8 +65,8 @@
        /// </summary>
        public bool AllowNext
        {
            get;
            set;
            get { return true; }
            set { }
        }

        /// <summary>
@@ -81,8 +82,8 @@
        /// </summary>
        public bool AllowComplete
        {
            get;
            set;
            get { return false; }
            set { }
        }

        /// <summary>
@@ -122,7 +123,7 @@
        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;
@@ -130,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
                }
@@ -142,7 +143,7 @@
                _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;