解决冲突

bklLiudl

2024-08-23 62b3bf8205277b9bdceaa83f0d7e5d73312e1780

 Wms/WMS.IBLL/IBllSoServer/ICompleteDetailServer.cs

@@ -1,7 +1,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Model.ModelDto.BllSoDto;
using Model.ModelVm.BllSoVm;
using SqlSugar;

namespace WMS.IBLL.IBllSoServer
{
@@ -15,7 +18,7 @@
        /// <param name="limit"></param>
        /// <param name="count"></param>
        /// <returns></returns>
        List<CompleteDetailDto> GetCompleteDetailList(int id, int page, int limit, out int count);
        Task<List<CompleteDetailDto>> GetCompleteDetailList(GetCompleteDetailVm model, RefAsync<int> count);

        /// <summary>
        /// 获取拣货明细中详细箱支信息 根据箱码\支码