增加出库单历史 库存历史查询功能

duyongjia

2024-12-28 6be2bc8324ca81145830b758c110255d9dfdc00b

 ÏîÄ¿´úÂë/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
{
@@ -120,11 +121,12 @@
        /// ç©ºæ‰˜å‡ºåº“
        /// </summary>
        /// <param name="PalletCode">托盘号</param>
        /// <param name="trayType">托盘类型，1，小托盘 2，大托盘</param>
        /// <returns></returns>
        [HttpPost, Route("EmptyOutBound"), AllowAnonymous]
        public WebResponseContent EmptyOutBound()
        [HttpGet, Route("EmptyOutBound"), AllowAnonymous]
        public WebResponseContent EmptyOutBound(string trayType)
        {
            return _taskService.PalletOutboundTask("R01", "R01-001-023-001");
            return _taskService.PalletOutboundTask("R01", "R01-001-023-001",trayType);

        }

@@ -134,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);
        }

@@ -144,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);
@@ -155,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);
@@ -166,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);
        }