1

dengjunjie

2025-03-11 94b11f93e7985e8ca499465af228f78301fd6e86

1

 .gitignore

@@ -80,3 +80,15 @@
/项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll
/项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb
/项目代码/DB
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_BasicRepository.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_BasicRepository.pdb
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Common.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Common.pdb
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Core.pdb
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_DTO.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_DTO.pdb
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_IBasicRepository.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_IBasicRepository.pdb
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Model.dll
/项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/bin/Debug/net6.0/WIDESEA_Model.pdb

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs

@@ -32,62 +32,62 @@
        /// ä¸‹è½½PDA
        /// </summary>
        /// <returns></returns>
        //[HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
        //public virtual ActionResult DownLoadApp()
        //{
        //    string path = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
        //    if (!Directory.Exists(path)) Directory.CreateDirectory(path);
        //    path += "WMS-PDA.apk";
        [HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
        public virtual ActionResult DownLoadApp()
        {
            string path = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
            if (!Directory.Exists(path)) Directory.CreateDirectory(path);
            path += "WMS-PDA.apk";

        //    if (System.IO.File.Exists(path))
        //    {
        //        byte[] fileBytes = System.IO.File.ReadAllBytes(path);
        //        return File(
        //                fileBytes,
        //                System.Net.Mime.MediaTypeNames.Application.Octet,
        //                System.IO.Path.GetFileName(path)
        //            );
        //    }
        //    else
        //    {
        //        return Json(WebResponseContent.Instance.Error($"未找到安装包"));
        //    }
            if (System.IO.File.Exists(path))
            {
                byte[] fileBytes = System.IO.File.ReadAllBytes(path);
                return File(
                        fileBytes,
                        System.Net.Mime.MediaTypeNames.Application.Octet,
                        System.IO.Path.GetFileName(path)
                    );
            }
            else
            {
                return Json(WebResponseContent.Instance.Error($"未找到安装包"));
            }

        //}
        }

        ///// <summary>
        ///// ä¸Šä¼ PDA
        ///// </summary>
        ///// <param name="fileInput"></param>
        ///// <returns></returns>
        //[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
        //[Consumes("multipart/form-data")]
        //public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
        //{
        //    try
        //    {
        //        List<IFormFile> files = fileInput.ToList();
        //        if (files == null || files.Count() == 0)
        //            return new WebResponseContent { Status = true, Message = "请选择上传的文件" };
        //        IFormFile formFile = files[0];
        //        string dicPath = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
        //        if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
        //        string path = $"{dicPath}WMS-PDA{DateTime.Now:yyyyMMddhhmmss}.apk";
        //        dicPath = $"{dicPath}WMS-PDA.apk";
        //        if (System.IO.File.Exists(dicPath))
        //            System.IO.File.Move(dicPath, path);
        /// <summary>
        /// ä¸Šä¼ PDA
        /// </summary>
        /// <param name="fileInput"></param>
        /// <returns></returns>
        [HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
        [Consumes("multipart/form-data")]
        public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
        {
            try
            {
                List<IFormFile> files = fileInput.ToList();
                if (files == null || files.Count() == 0)
                    return new WebResponseContent { Status = true, Message = "请选择上传的文件" };
                IFormFile formFile = files[0];
                string dicPath = $"{AppDomain.CurrentDomain.BaseDirectory}Upload/App/";
                if (!Directory.Exists(dicPath)) Directory.CreateDirectory(dicPath);
                string path = $"{dicPath}WMS-PDA{DateTime.Now:yyyyMMddhhmmss}.apk";
                dicPath = $"{dicPath}WMS-PDA.apk";
                if (System.IO.File.Exists(dicPath))
                    System.IO.File.Move(dicPath, path);

        //        using (var stream = new FileStream(dicPath, FileMode.Create))
        //        {
        //            formFile.CopyTo(stream);
        //        }
        //        return new WebResponseContent { Status = true, Message = "文件上传成功" };
        //    }
        //    catch (Exception ex)
        //    {
        //        return WebResponseContent.Instance.Error(ex.Message);
        //    }
        //}
                using (var stream = new FileStream(dicPath, FileMode.Create))
                {
                    formFile.CopyTo(stream);
                }
                return new WebResponseContent { Status = true, Message = "文件上传成功" };
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
        public WebResponseContent GetPDAVersion(string version)

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs

@@ -7,7 +7,7 @@
using WIDESEA_Model.Models;
using WIDESEA_DTO.System;

namespace WIDESEA_WMSServer.Controllers.System
namespace WIDESEA_WMSServer.Controllers
{
    [Route("api/Sys_Dictionary")]
    [ApiController]

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs

@@ -3,7 +3,7 @@
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;

namespace WIDESEA_WMSServer.Controllers.System
namespace WIDESEA_WMSServer.Controllers
{
    [Route("api/Sys_DictionaryList")]
    [ApiController]

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs

@@ -4,7 +4,7 @@
using WIDESEA_ISystemService;
using WIDESEA_Model.Models;

namespace WIDESEA_WMSServer.Controllers.System
namespace WIDESEA_WMSServer.Controllers
{
    [Route("api/Sys_RoleAuth")]
    [ApiController]

 ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs

@@ -9,7 +9,7 @@
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.System;

namespace WIDESEA_WMSServer.Controllers.System
namespace WIDESEA_WMSServer.Controllers
{
    [Route("api/Sys_Role")]
    [ApiController]