From 6ba24a49c009cca01d9c02b9dae692a53b8be116 Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 24 九月 2025 13:58:30 +0800
Subject: [PATCH] 入库
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/AgvStationService.cs | 55 ++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 42 insertions(+), 13 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/AgvStationService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/AgvStationService.cs"
index 8cdce35..019462f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/AgvStationService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/AgvStationService.cs"
@@ -36,6 +36,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Comm.Http;
+using WIDESEA_Common.Log;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
@@ -52,28 +53,56 @@
{
public AgvStationService(IAgvStationRepository BaseDal) : base(BaseDal)
{
-
- }
-
- public AGVStation GetAllStationByDeviceCode(int Station_code)
- {
- return BaseDal.QueryFirst(x=>x.Station_code== Station_code);
}
-
- public AGVStation GetMothercarDeviceCode(string Station_code)
+ /// <summary>
+ /// 鏍规嵁璁惧淇℃伅锛岃幏鍙栧皬杞﹀唴瀹�
+ /// </summary>
+ /// <param name="ChildPosiDeviceCode">璁惧</param>
+ /// <returns></returns>
+ public AGVStation Corridorequipment(string ChildPosiDeviceCode)
{
- return BaseDal.QueryFirst(x => x.Station_code== int.Parse(Station_code));
+ return BaseDal.QueryFirst(x=>x.ChildPosiDeviceCode == ChildPosiDeviceCode && x.Station_enable==1);
}
- public AGVStation GetMothercarCode(string Station_code)
+ /// <summary>
+ /// 鏍规嵁瀛愬湴鍧�锛岃幏鍙栨瘝杞﹁澶囦俊鎭�
+ /// </summary>
+ /// <param name="ZicheMotAddres">瀛愬湴鍧�</param>
+ /// <returns></returns>
+ public AGVStation GetMothervehicle(int ZicheMotAddres)
{
- return BaseDal.QueryFirst(x => x.ZicheMotherinlaw == Station_code);
+ return BaseDal.QueryFirst(x => x.ZicheMotherinlaw == ZicheMotAddres && x.Station_enable == 1);
}
- public AGVStation GetZicheCode(string Station_code)
+ /// <summary>
+ /// 鏍规嵁杩囬亾鍦板潃锛岃幏鍙栬繃閬撳瓙杞﹁澶囦俊鎭�
+ /// </summary>
+ /// <param name="ZicheMotAddres">瀛愬湴鍧�</param>
+ /// <returns></returns>
+ public AGVStation GetMotheaisle(int ZicheMotAddres)
{
- return BaseDal.QueryFirst(x => x.Motherinlaw == Station_code);
+ return BaseDal.QueryFirst(x => (x.MotherCarDeviceCode == ZicheMotAddres || x.MotherCardeputy == ZicheMotAddres) && x.Station_enable == 1);
+ }
+
+ /// <summary>
+ /// 鏍规嵁HCJ绔欏彴鏌ユ壘鍐呬晶瀛愯溅璁惧淇℃伅
+ /// </summary>
+ /// <param name="HCJAddres">HCJ绔欏彴缂栧彿</param>
+ /// <returns></returns>
+ public AGVStation GetZicheDeep(int HCJAddres)
+ {
+ return BaseDal.QueryFirst(x => (x.HCJStorageaddress == HCJAddres || x.Station_Area == 2) && x.Station_enable == 1);
+ }
+
+ /// <summary>
+ /// 鏍规嵁HCJ绔欏彴鏌ユ壘鍐呬晶瀛愯溅璁惧淇℃伅
+ /// </summary>
+ /// <param name="HCJAddres">HCJ绔欏彴缂栧彿</param>
+ /// <returns></returns>
+ public AGVStation GetZicheDeep(int HCJAddres)
+ {
+ return BaseDal.QueryFirst(x => (x.HCJStorageaddress == HCJAddres || x.Station_Area == 2) && x.Station_enable == 1);
}
}
}
--
Gitblit v1.9.3