From fe941b73b9496f6cfab1a8957f319f74ea09fe1d Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期一, 04 十一月 2024 17:34:32 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 65 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 10 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
index ef4b831..3e3820d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs"
@@ -1,34 +1,42 @@
-锘縰sing Microsoft.AspNetCore.Http;
+锘縰sing Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Inbound;
using WIDESEA_IInboundService;
+using WIDESEA_IOutboundService;
using WIDESEA_ITaskInfoService;
using WIDESEA_Model.Models;
namespace WIDESEA_WMSServer.Controllers
{
[Route("api/PDA")]
- [ApiController]
- public class PDAController : ApiBaseController<ITaskService, Dt_Task>
+ [Authorize, ApiController]
+ public class PDAController : Controller
{
private readonly IInboundService _inboundService;
- public PDAController(ITaskService service, IInboundService inboundService) : base(service)
+ private readonly IOutboundService _outboundService;
+ private readonly ITaskService _taskService;
+
+ public PDAController(ITaskService taskService, IInboundService inboundService,IOutboundService outboundService)
{
_inboundService = inboundService;
+ _outboundService = outboundService;
+ _taskService = taskService;
}
- [HttpPost, Route("CallMateriel")]
- public WebResponseContent CallMateriel(string endPoint)
+ [HttpPost, Route("CallMateriel"), AllowAnonymous]
+ public WebResponseContent CallMateriel([FromBody] string endPoint)
{
- return Service.CallMateriel(endPoint);
+ return _taskService.CallMateriel(endPoint);
}
- [HttpPost, Route("MaterielCarry")]
- public WebResponseContent MaterielCarry(string startPoint)
+ [HttpPost, Route("MaterielCarry"), AllowAnonymous]
+ public WebResponseContent MaterielCarry([FromBody] string startPoint)
{
- return Service.MaterielCarry(startPoint);
+ return _taskService.MaterielCarry(startPoint);
}
[HttpPost, Route("MaterielGroup")]
@@ -42,5 +50,42 @@
{
return _inboundService.InbounOrderService.QueryOrderInfo(pageNo, orderNo);
}
+
+ //[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
+ //public WebResponseContent UploadApp(IEnumerable<IFormFile> fileInput)
+ //{
+
+ // //return PDAOperate.UploadApp(Request.Form.Files.ToList());
+ //}
+
+ [HttpPost, HttpGet, Route("GetPDAVersion"), AllowAnonymous]
+ public WebResponseContent GetPDAVersion(string version)
+ {
+ try
+ {
+ string versionPDA = AppSettings.Configuration["PDAVersion"];
+ if (Convert.ToInt32(versionPDA) > Convert.ToInt32(version))
+ return WebResponseContent.Instance.OK(data: true);
+ else return WebResponseContent.Instance.OK(data: false);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
+ }
+ //[HttpPost, HttpGet, Route("DownLoadApp"), AllowAnonymous]
+ //public virtual ActionResult DownLoadApp()
+ //{
+ // string path = $"Upload/App/".MapPath();
+ // if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+ // path += "WMS-PDA.apk";
+ // byte[] fileBytes = System.IO.File.ReadAllBytes(path);
+ // return File(
+ // fileBytes,
+ // System.Net.Mime.MediaTypeNames.Application.Octet,
+ // System.IO.Path.GetFileName(path)
+ // );
+ //}
}
}
--
Gitblit v1.9.3