From b1a419c2886666934da6499ee552516d0769562e Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 16 四月 2026 13:40:56 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215
---
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
index bb8786c..e01b90c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_BasicService/LocationInfoService.cs"
@@ -139,7 +139,7 @@
}
List<string> lockLocationCodes = locationCaches.Select(x => x.LocationCode).ToList();
-
+
//Dictionary<string, SqlSugar.OrderByType> orderBy = new Dictionary<string, OrderByType>()
//{
// { nameof(Dt_LocationInfo.RoadwayNo),OrderByType.Asc },
@@ -156,7 +156,6 @@
{ nameof(Dt_LocationInfo.Row),OrderByType.Asc },
{ nameof(Dt_LocationInfo.Column),OrderByType.Asc },
{ nameof(Dt_LocationInfo.Depth),OrderByType.Desc },
-
};
@@ -164,15 +163,39 @@
if (first != null)
{
locationCaches.Add(new LocationCache { LocationCode = first?.LocationCode, DateTime = DateTime.Now });
- Db.Updateable<Dt_LocationInfo>().SetColumns(x => new Dt_LocationInfo
+
+ using (var sugarClient = new SqlSugarClient(new ConnectionConfig
{
- LocationStatus = (int)LocationStatusEnum.InStockLock,
- }).Where(x => x.Id == first.Id).ExecuteCommand();
+ ConnectionString = DBContext.ConnectionString,
+ DbType = DBContext.DbType,
+ IsAutoCloseConnection = true,
+ InitKeyType = InitKeyType.Attribute
+ }))
+ {
+ sugarClient.Updateable<Dt_LocationInfo>().SetColumns(x => new Dt_LocationInfo
+ {
+ LocationStatus = (int)LocationStatusEnum.InStockLock,
+ }).Where(x => x.Id == first.Id).ExecuteCommand();
+ }
+
}
return first;
}
}
+
+ public bool QueryLocationCount(int locationType)
+ {
+ try
+ {
+ return BaseDal.QueryData(x => x.LocationType == locationType && x.LocationStatus == (int)LocationStatusEnum.Free && x.EnableStatus == (int)EnableStatusEnum.Normal).Any();
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+
+ }
public Dt_LocationInfo? AssignLocation()
{
lock (_locker)
--
Gitblit v1.9.3