Merge branch 'master' into Liudl

bklLiudl

2024-09-07 8c6e292c508312eca0aef4c203e5857c4fc3094c

 Wms/Wms/Controllers/PdaSoController.cs

@@ -10,7 +10,6 @@
using Model.ModelVm.PdaVm;
using WMS.IBLL.IPdaServer;
using Model.ModelDto;
using Model.ModelVm;
using Wms.Tools;
using Utility;
using System.Security.Cryptography;
@@ -49,7 +48,7 @@
        }

        /// <summary>
        /// 获取单据列表
        /// 根据托盘号获取单据列表
        /// </summary>
        /// <param name="model">PalletNo:托盘号</param> 
        /// <returns></returns>
@@ -60,14 +59,25 @@
        }

        /// <summary>
        /// 获取PDA平库出库单据列表
        /// </summary>
        /// <param name="type"></param> 
        /// <returns></returns>
        [HttpPost]
        public async Task<List<string>> GetRunNoticeList(PdaSoVm model)
        {
            return await _pdaSoSvc.GetRunNoticeList(model.Type);
        }

        /// <summary>
        /// 获取物料-批次信息
        /// </summary>
        /// <param name="model">PalletNo:托盘码、SoNo:单据号</param> 
        /// <returns></returns>
        [HttpPost]
        public async Task GetSoSkuLotNoListByPallet(PdaSoVm model)
        public async Task<List<DetailIdSkuLotNo>> GetSoSkuLotNoListByPallet(PdaSoVm model)
        {
            var models = await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
           return await _pdaSoSvc.GetSoSkuLotNoListByPallet(model.PalletNo, model.SoNo);
        }

        /// <summary>
@@ -89,18 +99,20 @@
        [HttpPost]
        public async Task<OutPdaInfo> GetPlanAndFinishQty(PdaSoVm model)
        {
            return await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
            var data = await _pdaSoSvc.GetPlanAndFinishQty(model.SoDetailId);
            return data;
        }

        /// <summary>
        /// 获取箱码信息（根据箱码在库存箱码明细中查询）
        /// </summary>
        /// <param name="model">BoxNo:箱码号</param> 
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public async Task<dynamic> GetDataComBoxInfo(PdaSoVm model)
        public async Task<List<BoxInfo>> GetDataComBoxInfo(PdaSoVm model)
        {
            return await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
            var data = await _pdaSoSvc.GetDataComBoxInfo(model.SoDetailId, model.PalletNo, model.BoxNo, model.BoxNo3);
            return data;
        }

        /// <summary>
@@ -109,7 +121,7 @@
        /// <param name="model">BoxNo:箱码号</param> 
        /// <returns></returns>
        [HttpPost]
        public async Task<dynamic> GetAllotPlnInfo(PdaSoVm model)
        public async Task<List<BoxInfo>> GetAllotPlnInfo(PdaSoVm model)
        {
            return await _pdaSoSvc.GetAllotPlnInfo(model.SoDetailId, model.PalletNo);
        }
@@ -157,12 +169,26 @@
        /// <param name="palletNo">托盘号</param>
        /// <returns></returns>
        [HttpGet]
        public async Task<dynamic> GetPingKuInfoByPallet(string soNo, string palletNo)
        public async Task<List<BoxInfo>> GetPingKuInfoByPallet(string soNo, string palletNo)
        {
            return await _pdaSoSvc.GetPingKuInfoByPallet(soNo, palletNo);
        }

        /// <summary>
        /// 获取平库托盘位置信息
        /// </summary>
        /// <param name="soNo">出库单号</param>
        ///  <param name="SkuNo">物料编码</param>
        ///  <param name="LotNo">批次</param>
        /// <returns></returns>
        [HttpGet]
        public async Task<List<BoxInfo>> GetPingKuLocationInfo(string soNo,string SkuNo,string LotNo)
        {
            return await _pdaSoSvc.GetPingKuLocationInfo(soNo, SkuNo, LotNo);
        }


        /// <summary>
        /// 平库出库
        /// </summary>
        /// <param name="soNo">出库单号</param>