From 43baedbcf347ab10c73d6e4fcda841a6719d31e1 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期五, 12 九月 2025 11:17:27 +0800
Subject: [PATCH] no message
---
cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs | 6 +++---
cylsg/cylsg.Web.Entry/appsettings.json | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs b/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
index ecaad95..84d657c 100644
--- a/cylsg/cylsg.Application/CyOS/CyOsDeliverManage.cs
+++ b/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涓嶈兘涓虹┖");
@@ -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
diff --git a/cylsg/cylsg.Web.Entry/appsettings.json b/cylsg/cylsg.Web.Entry/appsettings.json
index b74ca7c..fcf1993 100644
--- a/cylsg/cylsg.Web.Entry/appsettings.json
+++ b/cylsg/cylsg.Web.Entry/appsettings.json
@@ -23,7 +23,8 @@
//"IsAutoCloseConnection": true
- "ConnectionString": "Server=MS-FSEUTNLCXFDB\\SQLEXPRESS;Database=CyLsgDb; MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;integrated security=True;",
+ // "ConnectionString": "Server=192.168.0.31;Database=CyLsgDb; MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;integrated security=True;",
+ "ConnectionString": "Server=192.168.18.15;Database=CyLsgDb; MultipleActiveResultSets=true;pooling=true;min pool size=5;max pool size=32767;connect timeout=20;Encrypt=True;TrustServerCertificate=True;User Id=SA;Password=123456;",
"DbType": "SqlServer", // "SqlServer" ,mysql,
"IsAutoCloseConnection": true
}
@@ -35,8 +36,8 @@
//"IsAutoCloseConnection": true
- "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!@#;",
+ "ConnectionString": "Server=192.168.18.15;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=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"
--
Gitblit v1.9.1