移动系统liao
2025-03-20 63eb28a9ba7aa9c549bc99f9c68d0a4c051453ba
修正sugsql导航更新加配置的bug
4个文件已修改
62 ■■■■ 已修改文件
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cylsg/cylsg.Core/cylsg.Core.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
cylsg/cylsg.Web.Entry/appsettings.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
cylsg/cylsg.Application/CyOS/CyOSSDriver.cs
@@ -209,14 +209,28 @@
            a.Deliveredstatus= Param.Deliveredstatus;
            a.Attachments = Param.Attachments;
            return await _client.UpdateNav(a).Include(x=>x.Attachments,new SqlSugar.UpdateNavOptions()
                {
                   OneToManyInsertOrUpdate = true,//配置启用 插入、更新或删除模式
                }).Include(x=>x.DeliverPlans,new UpdateNavOptions()
                {
                    OneToManyInsertOrUpdate=true,
                }
                ).ExecuteCommandAsync();
            return await _client.UpdateNav(a).Include(x=>x.Attachments).ExecuteCommandAsync();
            //await _client.AsTenant().BeginTranAsync();
            //try
            //{
            //    var id = await _client.Insertable(pram).ExecuteReturnIdentityAsync();
            //    if (pram.WorkPlanAttachments?.Count > 0)
            //    {
            //        foreach (var item in pram.WorkPlanAttachments)
            //        {
            //            item.OA_WorkPlanId = id;
            //        }
            //        await _client.Insertable(pram.WorkPlanAttachments).ExecuteCommandAsync();
            //    }
            //    await _client.AsTenant().CommitTranAsync();
            //}
            //catch (Exception)
            //{
            //    await _client.AsTenant().RollbackTranAsync();
            //    throw;
            //}
            //await _client.AsTenant().BeginTranAsync();
            //try
@@ -457,10 +471,7 @@
                //{
                //     OneToManyInsertOrUpdate = true,
                //})
                    .Include(x => x.CarConditionAttachments,new UpdateNavOptions
                {
                    OneToManyInsertOrUpdate = true,
                }).ExecuteCommandAsync();
                    .Include(x => x.CarConditionAttachments).ExecuteCommandAsync();
            }
           
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
@@ -350,15 +350,15 @@
                var car = await _client.Queryable<OA_CarManage>().Where(x => x.StaffID == Param.DriverId && x.MemberID == _oAServices.firmId).FirstAsync();
                data.CarId = car == null ? 0 : car.Keyid;
                foreach (var item in data.DeliverPlans)
                {
                    item.DriverId = Param.DriverId;
                    item.CarId = car == null ? 0 : car.Keyid;
                    item.Updater = Permissions.MemberId;
                    item.LastUpdateTime = DateTime.Now;
                    item.DeliverTime = Param.DeliverTime;
                //foreach (var item in data.DeliverPlans)
                //{
                //    item.DriverId = Param.DriverId;
                //    item.CarId = car == null ? 0 : car.Keyid;
                //    item.Updater = Permissions.MemberId;
                //    item.LastUpdateTime = DateTime.Now;
                //    item.DeliverTime = Param.DeliverTime;
                }
                //}
            }
   
@@ -386,13 +386,7 @@
                }
            data.Attachments = Param.Attachments;
            return await _client.UpdateNav(data).Include(x => x.Attachments, new UpdateNavOptions()
            {
                OneToManyInsertOrUpdate = true,
            }).Include(x => x.DeliverPlans, new UpdateNavOptions()
            {
                OneToManyInsertOrUpdate = true,
            }).ExecuteCommandAsync();
            return await _client.UpdateNav(data).Include(x => x.Attachments).ExecuteCommandAsync();
cylsg/cylsg.Core/cylsg.Core.csproj
@@ -17,7 +17,7 @@
        <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.5.3" />
        <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.5.3" />
        <PackageReference Include="Furion.Pure" Version="4.9.5.3" />
        <PackageReference Include="SqlSugarCore" Version="5.1.4.166" />
        <PackageReference Include="SqlSugarCore" Version="5.1.4.185" />
        <PackageReference Include="SugarRedis" Version="1.5.0" />
    </ItemGroup>
cylsg/cylsg.Web.Entry/appsettings.json
@@ -36,6 +36,7 @@
      "ConnectionString": "Server=192.168.0.31;Database=ECTEST; MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;User Id=SA;Password=123456;",
     // "ConnectionString": "Server=118.123.213.60;Database=ECTEST_NEW; MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;User Id=SA;Password=123qwe!@#;",
      "DbType": "SqlServer", // "SqlServer" ,mysql,
      "IsAutoCloseConnection": true,
      "ConfigId": "ECTESTOADB"