From 0abfbb5e458b2a2e14631dbf907f4ec96f1a60d4 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 06 12月 2024 16:13:10 +0800
Subject: [PATCH] 22
---
CC/iWareSql/DataAccess/StationHandler.cs | 44 ++++++++++++++++++++------------------------
1 files changed, 20 insertions(+), 24 deletions(-)
diff --git a/CC/iWareSql/DataAccess/StationHandler.cs b/CC/iWareSql/DataAccess/StationHandler.cs
index acf6db3..88c75ce 100644
--- a/CC/iWareSql/DataAccess/StationHandler.cs
+++ b/CC/iWareSql/DataAccess/StationHandler.cs
@@ -16,6 +16,7 @@
using iWareModel;
using iWareCommon.Common.Globle;
using XiGang.Core.Model;
+using iWareSql.WmsDBModel;
namespace iWareSql.DataAccess
{
@@ -112,30 +113,7 @@
}
#region 閿佸畾搴撲綅鐨勬柟娉�
- /// <summary>
- /// 鍒ゆ柇瀵绘壘鍒扮殑搴撲綅鏄惁琚攣瀹氫簡( 渚� 閰嶆澘浣欐枡鍥炲簱绾跨▼銆丷GV鎻愬墠閰嶆澘浠诲姟鍒涘缓鏃讹紝鎴愬搧鏂欏洖搴撶嚎绋嬨�佸師鏂欏叆搴撶嚎绋嬩娇鐢�)
- /// </summary>
- /// <returns></returns>
- private static bool ValidateFindPlaceIsLocked(Base_Station validatePlace, string lockReason)
- {
- lock (lockObject)
- {
- if (validatePlace == null)
- {
- return false;
- }
- if (lockPlaceDict.ContainsKey(validatePlace.Id))
- {
- Log4NetHelper.WriteInfoLog(LogType.SrmTheadService, "lockPlaceDict宸茬粡鏈夎閿佷簡,validatePlace.Id:" + validatePlace.Id + ",瀛楀吀涓殑鍘熷洜鏄�:" + lockPlaceDict[validatePlace.Id] + "锛屾湰娆″師鍥犳槸锛�" + lockReason);
- return true;
- }
- else
- {
- lockPlaceDict.Add(validatePlace.Id, lockReason + ",搴撲綅鍙�:" + validatePlace.SrmStationCode);
- return false;
- }
- }
- }
+
/// <summary>
/// 鍦ㄤ簨鍔″鐞嗗畬姣曞悗锛岄噴鏀捐閿佸畾鐨勫簱浣�( 渚� 閰嶆澘浣欐枡鍥炲簱绾跨▼銆丷GV鎻愬墠閰嶆澘浠诲姟鍒涘缓鏃讹紝鎴愬搧鏂欏洖搴撶嚎绋嬨�佸師鏂欏叆搴撶嚎绋嬩娇鐢�)
/// 涓�瀹氳鏀惧埌finaly閲屾墽琛�
@@ -737,6 +715,24 @@
return edm.Base_Station.Where(x => x.Id == placeId).FirstOrDefault();
}
+ /// <summary>
+ /// 鏍规嵁搴撲綅ID鏌ユ壘搴撲綅瀵硅薄
+ /// </summary>
+ /// <returns></returns>
+ public static wms_base_place GetPlaceByPlaceId(long placeId, WmsDBModel.WmsDBModel edm)
+ {
+ return edm.wms_base_place.Where(x => x.Id == placeId).FirstOrDefault();
+ }
+
+ /// <summary>
+ /// 鏍规嵁搴撲綅缂栧彿鏌ユ壘搴撲綅瀵硅薄
+ /// </summary>
+ /// <returns></returns>
+ public static wms_base_place GetPlaceByPlaceCode(string placeCode, WmsDBModel.WmsDBModel edm)
+ {
+ return edm.wms_base_place.Where(x => x.PlaceCode == placeCode).FirstOrDefault();
+ }
+
/// <summary>
/// 鏍规嵁搴撲綅鍙锋煡鎵惧簱浣嶅璞�
--
Gitblit v1.9.3