小飞侠
2026-04-07 24494c18efba9c7fbc952e5af35b961d648e3ecd
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
@@ -204,7 +204,7 @@
        [Obsolete]
        public async Task<int> AcceptAppointmentDeliver(int KeiId)
        {
            throw Oops.Oh("已经启用");
            throw Oops.Oh("已经弃用");
            if (!(KeiId > 0))
                throw Oops.Oh("Keyid不能为空");
@@ -246,7 +246,7 @@
            OA_DeliverTixing? tixing=null;
            if(Param.DeliverTixingId>0)
            {
                //是提醒订单,需要执行提醒单 状态干煸
                //是提醒订单,需要执行提醒单 状态
                tixing = await _client.Queryable<OA_DeliverTixing>().Where(x => x.Keyid == Param.DeliverTixingId).FirstAsync();
                if(tixing == null)
                {
@@ -292,7 +292,7 @@
                Dianhua = Param.Dianhua,
                Dizhi = Param.Dizhi,
                Remark = Param.Remark,
                BusinessManagerId = cor == null ? 0 : cor.BusinessManagerId,
                BusinessManagerId = cor == null ?  0 : cor.BusinessManagerId,
                Biddingcompany = cor == null ? 0 : (cor.Biddingcompany ?? 0),
                ShifouDelivery = 1,
                Lianxiren = Param.Lianxiren,
@@ -377,14 +377,14 @@
            //强制增加员工过滤
            RefAsync<int> totle = 0;
            var data = await _client.Queryable<OA_DeliverPlanPaiche>().Includes(x => x.Car,car=>car.Staff).Includes(x => x.SentStaff).Includes(x=>x.DeliverPlans)
                .Where(SearchList).OrderBy(x => x.DeliverTime).OrderBy(x => x.Sort).Mapper(x =>
                .Where(SearchList).OrderBy(x => x.DeliverTime).OrderBy(x => x.DriverId).Mapper(x =>
                {
                    if (x.Car?.Staff != null)
                    {
                        x.Car.CarNumber = x.Car.CarNumber + "(" + x.Car.Staff.Name + ")";
                        x.Car.Staff = null;
                    }
                }).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
                }).ToPageListAsync(Param.page.PageIndex, Param.page.PageSize, totle);
            Param.page.TotalCount = totle;
            return new DeliverOderPageRet