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 | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 5 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 6e4397e..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
{
@@ -41,11 +42,7 @@
return _taskService.MaterielCarry(startPoint);
}
- [HttpPost, Route("MaterielGroup")]
- public WebResponseContent MaterielGroup([FromBody] MaterielGroupDTO materielGroupDTO)
- {
- return _inboundService.InbounOrderService.MaterielGroup(materielGroupDTO);
- }
+
[HttpPost, Route("QueryOrderInfo")]
public WebResponseContent QueryOrderInfo(int pageNo, string orderNo)
@@ -107,5 +104,112 @@
var ext = Path.GetExtension(filePath).ToLowerInvariant();
return File(memory, new Dictionary<string, string>{{ ".apk", "application/vnd.android.package-archive" }}[ext], Path.GetFileName(filePath));
}
+
+ /// <summary>
+ /// 绌烘墭鍏ュ簱
+ /// </summary>
+ /// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpPost, Route("EmptyInBound"), AllowAnonymous]
+ public WebResponseContent EmptyInBound(string PalletCode)
+ {
+ return _taskService.PalletInboundRequest("R01-001-023-001",PalletCode);
+ }
+
+
+ /// <summary>
+ /// 绌烘墭鍑哄簱
+ /// </summary>
+ /// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <param name="trayType">鎵樼洏绫诲瀷锛�1锛屽皬鎵樼洏 2锛屽ぇ鎵樼洏</param>
+ /// <returns></returns>
+ [HttpGet, Route("EmptyOutBound"), AllowAnonymous]
+ public WebResponseContent EmptyOutBound(string trayType)
+ {
+ return _taskService.PalletOutboundTask("R01", "R01-001-023-001",trayType);
+
+ }
+
+ /// <summary>
+ /// 缁勭洏
+ /// </summary>
+ /// <param name="materielGroupDTO"></param>
+ /// <returns></returns>
+ [HttpPost, Route("MaterielGroup"), AllowAnonymous]
+ 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);
+ }
+
+ /// <summary>
+ /// 鍘熸枡鍏ュ簱纭
+ /// </summary>
+ /// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet, Route("MaterielInBoundConfirm"), AllowAnonymous]
+ public WebResponseContent MaterielInBoundConfirm(string palletCode)
+ {
+ return _taskService.InboundRequest("R01-001-023-001", palletCode);
+ }
+
+ /// <summary>
+ /// 缁勭洏鎾ら攢
+ /// </summary>
+ /// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet, Route("MaterielGroupRevoke"), AllowAnonymous]
+ public WebResponseContent MaterielGroupRevoke(string PalletCode)
+ {
+ return _inboundService.InbounOrderService.MaterielGroupRevoke(PalletCode);
+ }
+
+ /// <summary>
+ /// 浣欐枡鍥為��鍏ュ簱纭
+ /// </summary>
+ /// <param name="PalletCode">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ [HttpGet, Route("MaterielInBoundReturnConfirm"), AllowAnonymous]
+ public WebResponseContent MaterielInBoundReturnConfirm( string PalletCode)
+ {
+ return _taskService.ReturnInboundRequest("R01-001-023-001", PalletCode);
+ }
+
+
+
+
+
}
}
--
Gitblit v1.9.3