From 94b11f93e7985e8ca499465af228f78301fd6e86 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 11 三月 2025 17:32:27 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs | 2
.gitignore | 12 ++++
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 104 +++++++++++++++++-----------------
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs | 2
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs | 2
6 files changed, 68 insertions(+), 56 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4a3be4d..0cb5898 100644
--- a/.gitignore
+++ b/.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
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index 186c642..90ddf48 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
index 5673650..76b8535 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
index cafe2b3..29e40a2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_DictionaryListController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
index ef53e67..561db83 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleAuthController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
index bf6c025..a15436b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/System/Sys_RoleController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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]
--
Gitblit v1.9.3