no message

移动系统liao

2025-02-11 23518b1198cfb79c5a8f9d7d7921fb888c48a692

no message

 .gitignore

@@ -64,3 +64,4 @@
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
CoreCms.Net.Uni-App/bin/
数据库/
CoreCms.Net.Web.WebApi/Properties/

 CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs

@@ -232,6 +232,8 @@
        [SugarColumn(IsIgnore = true)]
        public string DeliveryMoble { get; set; }

      

    }



 CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs

@@ -7,7 +7,7 @@
namespace EC_SeckillInfo
{
    ///<summary>
    ///
    ///配送单
    ///</summary>
    [SugarTable("CoreDeliverOrder")]
    public partial class CoreDeliverOrder
@@ -110,7 +110,7 @@
        public DateTime? MakeTime { get;set;}

        /// <summary>
        /// 预约时间
        /// 开始时间
        /// </summary>
        public DateTime? StartTime { get; set; }
        /// <summary>

 CoreCms.Net.Services/CYOAServices/CyinOAService.cs

@@ -1073,11 +1073,15 @@
                      deliverOrder = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
                    && x.OrderState != CoreDeliverOrderType.Faile
                    && x.OrderState != CoreDeliverOrderType.Completed
                    && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First()
                    && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First(),
                      MakeTime = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
                    && x.OrderState != CoreDeliverOrderType.Faile
                    && x.OrderState != CoreDeliverOrderType.Completed
                    && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).Select(x=>x.MakeTime)
                  },

                  true
                  ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
                  ).MergeTable().Where(where).OrderBy(n=>n.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);

            var data = dlist.Select(x => new
            {
@@ -1210,7 +1214,7 @@
                  }

                  , true
                  ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
                  ).MergeTable().Where(where).OrderBy(x=>x.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);

            var deliveryList = await _CyDbClient.Queryable<OA_Staff>().Where(x => x.Status == "在职" && x.BF_IsDriver == true).Select(x => new
            {

 CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props

@@ -7,7 +7,7 @@
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion>
    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.3</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
    <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />

 CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user

File was deleted