From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 26 六月 2025 16:36:13 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 84 +++++++++++++++++++++++++++++++++++-------
1 files changed, 70 insertions(+), 14 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 6e4397e..df150d9 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"
@@ -11,6 +11,7 @@
using System.IO;
using WIDESEA_Model.Models;
using System;
+using System.Net;
namespace WIDESEA_WMSServer.Controllers
{
@@ -28,25 +29,80 @@
_outboundService = outboundService;
_taskService = taskService;
}
-
- [HttpPost, Route("CallMateriel"), AllowAnonymous]
- public WebResponseContent CallMateriel([FromBody] string endPoint)
+ /// <summary>
+ /// 缁戝畾璐т綅
+ /// </summary>
+ /// <param name="qty"></param>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ [HttpPost, Route("Bind"), AllowAnonymous]
+ public WebResponseContent Bind(string qty, string point)
{
- return _taskService.CallMateriel(endPoint);
+ return _taskService.Bind(qty, point);
}
-
- [HttpPost, Route("MaterielCarry"), AllowAnonymous]
- public WebResponseContent MaterielCarry([FromBody] string startPoint)
+ /// <summary>
+ /// 閲婃斁缂撳瓨鐐�
+ /// </summary>
+ /// <param name="point"></param>
+ /// <returns></returns>
+ [HttpPost, Route("AcrossFloorCallMat"), AllowAnonymous]
+ public WebResponseContent AcrossFloorCallMat(string point)
{
- return _taskService.MaterielCarry(startPoint);
+ return _taskService.AcrossFloorCallMat(point);
+ }
+ /// <summary>
+ /// 鍙枡
+ /// </summary>
+ /// <param name="endPoint"></param>
+ /// <returns></returns>
+ [HttpPost, Route("CallMateriel"), AllowAnonymous]
+ public WebResponseContent CallMateriel(string endPoint, string startPoint)
+ {
+ return _taskService.CallMateriel(endPoint, startPoint);
+ }
+ /// <summary>
+ /// 鎼繍
+ /// </summary>
+ /// <param name="startPoint"></param>
+ /// <returns></returns>
+ [HttpPost, Route("MaterielCarry"), AllowAnonymous]
+ public WebResponseContent MaterielCarry(string startPoint, string endPoint)
+ {
+ return _taskService.MaterielCarry(startPoint, endPoint);
}
[HttpPost, Route("MaterielGroup")]
- public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
+ public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
{
- return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
+ return _inboundService.InbounOrderService.MaterielGroup(saveModel);
}
-
+ /// <summary>
+ /// 鏌ヨ鍏ュ簱鍗曡鎯�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
+ [HttpPost, Route("QueryOrderDetailInfo")]
+ public WebResponseContent QueryOrderDetailInfo(int pageNo, string orderNo)
+ {
+ return _inboundService.InbounOrderService.QueryOrderDetailInfo(pageNo, orderNo);
+ }
+ /// <summary>
+ /// 缁勭洏
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ //[HttpPost, Route("MaterielGroup")]
+ //public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
+ //{
+ // return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
+ //}
+ /// <summary>
+ /// 鏌ヨ鍏ュ簱鍗�
+ /// </summary>
+ /// <param name="pageNo"></param>
+ /// <param name="orderNo"></param>
+ /// <returns></returns>
[HttpPost, Route("QueryOrderInfo")]
public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
{
@@ -55,7 +111,7 @@
[HttpPost, HttpGet, Route("UploadApp"), AllowAnonymous]
public async Task<WebResponseContent> UploadApk(IEnumerable<IFormFile> fileInput)
- {
+ {
// 妫�鏌ユ槸鍚︽湁鏂囦欢涓婁紶
if (fileInput == null || !fileInput.Any())
{
@@ -64,7 +120,7 @@
var formFile = fileInput.First();
var uploadFolder = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "Upload");
- Directory.CreateDirectory(uploadFolder);
+ Directory.CreateDirectory(uploadFolder);
var fileName = $"WMS-PDA.apk";
var filePath = Path.Combine(uploadFolder, fileName);
@@ -105,7 +161,7 @@
}
memory.Position = 0;
var ext = Path.GetExtension(filePath).ToLowerInvariant();
- return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath));
+ return File(memory, new Dictionary<string, string> { { ".apk", "application/vnd.android.package-archive" } }[ext], Path.GetFileName(filePath));
}
}
}
--
Gitblit v1.9.3