解决冲突

bklLiudl

2024-08-23 5423ea50d00ce05c87ba443413037d86d7669638

 Wms/Wms/Controllers/PdaSoController.cs

@@ -158,7 +158,7 @@
        /// <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);
        }