From 6be2bc8324ca81145830b758c110255d9dfdc00b Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期六, 28 十二月 2024 17:13:44 +0800
Subject: [PATCH] 增加出库单历史 库存历史查询功能
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/PDAController.cs | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 deletions(-)
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 74357b7..4c6cbb2 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"
@@ -11,6 +11,7 @@
using System.IO;
using WIDESEA_Model.Models;
using System;
+using Newtonsoft.Json;
namespace WIDESEA_WMSServer.Controllers
{
@@ -122,7 +123,7 @@
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <param name="trayType">鎵樼洏绫诲瀷锛�1锛屽皬鎵樼洏 2锛屽ぇ鎵樼洏</param>
/// <returns></returns>
- [HttpPost, Route("EmptyOutBound"), AllowAnonymous]
+ [HttpGet, Route("EmptyOutBound"), AllowAnonymous]
public WebResponseContent EmptyOutBound(string trayType)
{
return _taskService.PalletOutboundTask("R01", "R01-001-023-001",trayType);
@@ -135,8 +136,41 @@
/// <param name="materielGroupDTO"></param>
/// <returns></returns>
[HttpPost, Route("MaterielGroup"), AllowAnonymous]
- public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
+ public WebResponseContent MaterielGroup([FromBody] SaveModel saveModel)
{
+ string PalletCode = saveModel.MainData["PalletCode"].ToString();
+ string ReceviveSN = saveModel.MainData["SerialNumbers"].ToString();
+ List<string> OldSerialNumbers = JsonConvert.DeserializeObject<List<string>>(ReceviveSN);
+ List<string> SerialNumbers = new List<string>();
+ foreach (var number in OldSerialNumbers)
+ {
+ if (number.Contains("S:"))
+ {
+ List<string> nums = number.Split(';').ToList();
+ foreach (var item in nums)
+ {
+ if(item.Contains("S:"))
+ {
+ string SerialNumber = item.Replace("S:", "");
+ if (!string.IsNullOrEmpty(SerialNumber))
+ {
+ SerialNumbers.Add(SerialNumber);
+ }
+
+ }
+ }
+
+ }
+ else
+ {
+ SerialNumbers.Add(number);
+ }
+ }
+
+ MaterielGroupDTO materielGroupDTO = new MaterielGroupDTO();
+ materielGroupDTO.SerialNumbers = SerialNumbers;
+ materielGroupDTO.OrderNo = "";
+ materielGroupDTO.PalletCode = PalletCode;
return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
}
@@ -145,7 +179,7 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielInBoundConfirm"), AllowAnonymous]
+ [HttpGet, Route("MaterielInBoundConfirm"), AllowAnonymous]
public WebResponseContent MaterielInBoundConfirm(string palletCode)
{
return _taskService.InboundRequest("R01-001-023-001", palletCode);
@@ -156,7 +190,7 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielGroupRevoke"), AllowAnonymous]
+ [HttpGet, Route("MaterielGroupRevoke"), AllowAnonymous]
public WebResponseContent MaterielGroupRevoke(string PalletCode)
{
return _inboundService.InbounOrderService.MaterielGroupRevoke(PalletCode);
@@ -167,10 +201,10 @@
/// </summary>
/// <param name="PalletCode">鎵樼洏鍙�</param>
/// <returns></returns>
- [HttpPost, Route("MaterielInBoundReturnConfirm"), AllowAnonymous]
- public WebResponseContent MaterielInBoundReturnConfirm([FromBody] string PalletCode)
+ [HttpGet, Route("MaterielInBoundReturnConfirm"), AllowAnonymous]
+ public WebResponseContent MaterielInBoundReturnConfirm( string PalletCode)
{
- return null;
+ return _taskService.ReturnInboundRequest("R01-001-023-001", PalletCode);
}
--
Gitblit v1.9.3