´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.binBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.binBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suoBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/HierarchyCache.v1.txtBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/AgvStationEnum.cs
@@ -7,7 +7,7 @@ namespace WIDESEAWCS_DTO.Enum { public enum AgvStationEnum /*public enum AgvStationEnum { /// <summary> /// å ¥åºå£ @@ -40,5 +40,6 @@ /// </summary> [Description("è¿éå ¥åºç«å°(å )")] Aisleplatform_Medial = 6, } }*/ } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/RGVStationEnum.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,34 @@ using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; namespace WIDESEAWCS_DTO.Enum { public enum RGVEquipment { /// <summary> /// å ¥åºå£RGV /// </summary> [Description("å ¥åºå£RGV")] InRGVForklift = 1, /// <summary> /// åºåºå£RGV /// </summary> [Description("åºåºå£RGV")] OutRGVForklift = 2, /// <summary> /// è¿éå车 /// </summary> [Description("è¿éå车")] Corridorcar = 3, /// <summary> /// æ¯è½¦æè½¦ /// </summary> [Description("æ¯è½¦æè½¦")] Mothertrailer = 4, } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache
@@ -1 +1 @@ a485f729d4153e19b1c608c982621dd91d3c3956 87e50b359fca00933c1e5072359aa27940b9949b ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/ref/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/refint/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/IAgvStationService.cs
@@ -34,26 +34,31 @@ public interface IAgvStationService : IService<AGVStation> { /// <summary> /// è·åå½åå°åç±»å /// æ ¹æ®è®¾å¤ä¿¡æ¯ï¼è·åå°è½¦å 容 /// </summary> /// <param name="Station_code"></param> /// <param name="ChildPosiDeviceCode">设å¤</param> /// <returns></returns> AGVStation GetAllStationByDeviceCode(int Station_code); AGVStation Corridorequipment(string ChildPosiDeviceCode); /// <summary> /// è·åæ¯è½¦çPLC /// æ ¹æ®åå°åï¼è·åæ¯è½¦è®¾å¤ä¿¡æ¯ /// </summary> /// <param name="Station_code"></param> /// <param name="ZicheMotAddres">åå°å</param> /// <returns></returns> AGVStation GetMothercarCode(string Station_code); AGVStation GetMothervehicle(int ZicheMotAddres); /// <summary> /// è·åå车å°å /// æ ¹æ®è¿éå°åï¼è·åè¿éå车设å¤ä¿¡æ¯ /// </summary> /// <param name="Station_code"></param> /// <param name="ZicheMotAddres">åå°å</param> /// <returns></returns> AGVStation GetZicheCode(string Station_code); AGVStation GetMotheaisle(int ZicheMotAddres); /// <summary> /// æ ¹æ®HCJç«å°æ¥æ¾å ä¾§å车设å¤ä¿¡æ¯ /// </summary> /// <param name="HCJAddres">HCJç«å°ç¼å·</param> /// <returns></returns> AGVStation GetZicheDeep(int HCJAddres); } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/ref/WIDESEAWCS_ISystemServices.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/refint/WIDESEAWCS_ISystemServices.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/System/AGVStation.cs
@@ -43,7 +43,7 @@ public int Station_enable { get; set; } /// <summary> /// åºå /// åºå(1:å¤ä¾§ 2:å ä¾§) /// </summary> [SugarColumn( ColumnDescription = "åºå",IsNullable =true)] public int Station_Area { get; set; } @@ -65,26 +65,33 @@ /// <summary> /// è¿éå°åæ¯1 /// </summary> [SugarColumn(Length = 255, ColumnDescription = "è¿éå°åæ¯1")] public string MotherCarDeviceCode { get; set; } [SugarColumn(Length = 50, ColumnDescription = "è¿éå°åæ¯1")] public int MotherCarDeviceCode { get; set; } /// <summary> /// è¿éå°åæ¯2 /// </summary> [SugarColumn(Length = 255, ColumnDescription = "è¿éå°åæ¯2")] public string MotherCardeputy { get; set; } [SugarColumn(Length = 50, ColumnDescription = "è¿éå°åæ¯2")] public int MotherCardeputy { get; set; } /// <summary> /// æ¯å°åï¼å¯¹æ å åæºåè´§å£ï¼ /// </summary> [SugarColumn(Length = 255, ColumnDescription = "æ¯å°å")] public string Motherinlaw { get; set; } [SugarColumn(Length = 50, ColumnDescription = "æ¯å°å")] public int Motherinlaw { get; set; } /// <summary> /// åå°åï¼å¯¹æ è¿éç«å°) /// </summary> [SugarColumn(Length = 255, ColumnDescription = "åå°å")] public string ZicheMotherinlaw { get; set; } [SugarColumn(Length = 50, ColumnDescription = "åå°å")] public int ZicheMotherinlaw { get; set; } /// <summary> /// HCJåæ¾ç¹ /// </summary> [SugarColumn(Length = 50, ColumnDescription = "HCJåæ¾ç¹")] public int HCJStorageaddress { get; set; } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/ref/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/refint/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
@@ -369,15 +369,15 @@ result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data }; } break; case "agvStationEnum": case "RGVEquipment": { List<object> data = new List<object>(); Type type = typeof(AgvStationEnum); List<int> enums = Enum.GetValues(typeof(AgvStationEnum)).Cast<int>().ToList(); Type type = typeof(RGVEquipment); List<int> enums = Enum.GetValues(typeof(RGVEquipment)).Cast<int>().ToList(); int index = 0; foreach (var item in enums) { FieldInfo? fieldInfo = typeof(AgvStationEnum).GetField(((AgvStationEnum)item).ToString()); FieldInfo? fieldInfo = typeof(RGVEquipment).GetField(((RGVEquipment)item).ToString()); DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>(); if (description != null) { ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/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); } } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs
@@ -11,12 +11,12 @@ using System; using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoService")] [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCs_TaskInfoService")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCs_TaskInfoService")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCs_TaskInfoService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] // ç± MSBuild WriteCodeFragment ç±»çæã ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache
@@ -1 +1 @@ 0c89bb1cae87ea43ac260fbf353d127eb2b5c7af 696e07e336e90b059d5a69ceac1b59c1567636d6 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig
@@ -7,5 +7,5 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = WIDESEAWCS_TaskInfoService build_property.ProjectDir = F:\项ç®\MingHeZhiNeng\åå ´RGV\9-18\JiaXingRGV\代ç 管ç\WCS\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\ build_property.RootNamespace = WIDESEAWCs_TaskInfoService build_property.ProjectDir = F:\项ç®\MingHeZhiNeng\åå ´RGV\9-18\JiaXingRGV\代ç 管ç\WCS\WCS\WIDESEAWCS_Server\WIDESEAWCs_TaskInfoService\ ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.assets.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cacheBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dllBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdbBinary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/LogJob.cs
@@ -1,216 +1,123 @@ using Quartz; using HslCommunication; using HslCommunication.Core; using Microsoft.AspNetCore.Http; using Microsoft.VisualBasic.FileIO; using Newtonsoft.Json; using Quartz; using SixLabors.ImageSharp.PixelFormats; using System; using System.IO; using System.Threading; using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Reflection; using System.Reflection.Metadata.Ecma335; using System.Text; using System.Threading.Tasks; using WIDESEA_Common.Log; using WIDESEAWCS_Communicator; using WIDESEAWCS_Core.Helper; using WIDESEAWCS_QuartzJob; using WIDESEAWCS_QuartzJob.DeviceBase; using WIDESEAWCS_QuartzJob.StackerCrane.Enum; namespace WIDESEAWCS_Tasks { [DisallowConcurrentExecution] public class LogJob : IJob { // å®ä¹å 许å é¤çæ ¹ç®å½ private static readonly string LogRootPath = Path.GetFullPath(Environment.CurrentDirectory + "/Log"); private static readonly string PlatformInfoPath = Path.GetFullPath(Environment.CurrentDirectory + "/Log/ç«å°è¯»åä¿¡æ¯è®°å½"); public Task Execute(IJobExecutionContext context) { try { Task.Run(() => { try { // æ¸ çæ¥å¿æä»¶ CleanLogFilesOnly(LogRootPath, TimeSpan.FromMinutes(43200)); CleanAllInPlatformInfo(PlatformInfoPath, TimeSpan.FromMinutes(43200)); Thread.Sleep(1000 * 10); // 10ç§å忬¡æ§è¡ WriteLog.GetLog("LogJob").Write($"æ¥å¿è®°å½ï¼{DateTime.Now}", "LogJob"); Run(10); Run2(10); Thread.Sleep(1000 * 10); } catch (Exception ex) { Console.WriteLine($"æ¥å¿ä»»å¡æ§è¡å¼å¸¸: {ex.Message}"); } catch { } }); } catch (Exception ex) { Console.WriteLine($"{nameof(LogJob)} åå§åå¼å¸¸: {ex.Message}"); Console.Out.WriteLine(nameof(LogJob) + ":" + ex.Message); } return Task.CompletedTask; } /// <summary> /// æ£æ¥è·¯å¾æ¯å¦å¨å 许å é¤çèå´å /// </summary> /// <param name="path">è¦æ£æ¥çè·¯å¾</param> /// <param name="allowedRoot">å è®¸çæ ¹ç®å½</param> /// <returns>æ¯å¦å 许å é¤</returns> private static bool IsPathAllowed(string path, string allowedRoot) private static void Run(int saveDays) { try var logPath = System.Environment.CurrentDirectory + "/log"; if (Directory.Exists(logPath)) { var fullPath = Path.GetFullPath(path); return fullPath.StartsWith(allowedRoot, StringComparison.OrdinalIgnoreCase); } catch { return false; } } var nowTime = DateTime.Now; var dayDir = Directory.GetDirectories(logPath, "20*", System.IO.SearchOption.AllDirectories); /// <summary> /// åªæ¸ çLogç®å½ä¸çæä»¶ /// </summary> /// <param name="directoryPath">è¦æ¸ ççç®å½è·¯å¾</param> /// <param name="maxAge">æä»¶æå¤§ä¿çæ¶é´</param> private static void CleanLogFilesOnly(string directoryPath, TimeSpan maxAge) { if (!Directory.Exists(directoryPath)) { //Console.WriteLine($"ç®å½ä¸åå¨: {directoryPath}"); return; } try { var now = DateTime.Now; // åªè·åå½åç®å½çæä»¶ï¼ä¸å å«åç®å½ var files = Directory.GetFiles(directoryPath, "*", SearchOption.TopDirectoryOnly); int deletedCount = 0; foreach (var file in files) foreach (var dirpath in dayDir) { try //æä»¶å¤¹å var dirName = Path.GetFileName(dirpath).Replace("_", "-"); DateTime targetDate = DateTime.ParseExact(dirName, "yyyyMMdd", null); if ((nowTime - targetDate).TotalDays >= saveDays) { // æ£æ¥æä»¶æ¯å¦å¨å 许å é¤çèå´å if (!IsPathAllowed(file, LogRootPath)) //å 餿件åæä»¶å¤¹ try { Console.WriteLine($"è·³è¿éLogç®å½æä»¶: {file}"); continue; var flies = Directory.GetFiles(dirpath); foreach (var item in flies) { File.Delete(item); } Directory.Delete(dirpath); } // è·åæä»¶å建æ¶é´ var creationTime = File.GetCreationTime(file); // æ£æ¥æä»¶æ¯å¦è¶ è¿æå®æ¶é´ if (now - creationTime > maxAge) { File.Delete(file); deletedCount++; //Console.WriteLine($"å·²å 餿件: {file}"); } } catch (Exception ex) { Console.WriteLine($"å 餿件 {file} æ¶åºé: {ex.Message}"); } } //Console.WriteLine($"ç®å½ {directoryPath} æ¸ ç宿ï¼å é¤äº {deletedCount} 个æä»¶"); } catch (Exception ex) { Console.WriteLine($"æ¸ çç®å½ {directoryPath} æ¶åºé: {ex.Message}"); } } /// <summary> /// æ¸ çç«å°è¯»åä¿¡æ¯è®°å½ç®å½ä¸çææå 容ååç®å½ /// </summary> /// <param name="directoryPath">è¦æ¸ ççç®å½è·¯å¾</param> /// <param name="maxAge">æä»¶æå¤§ä¿çæ¶é´</param> private static void CleanAllInPlatformInfo(string directoryPath, TimeSpan maxAge) { if (!Directory.Exists(directoryPath)) { //Console.WriteLine($"ç®å½ä¸åå¨: {directoryPath}"); return; } try { var now = DateTime.Now; int deletedCount = 0; // å 餿æè¿æçæä»¶ var files = Directory.GetFiles(directoryPath, "*", SearchOption.AllDirectories); foreach (var file in files) { try { // æ£æ¥æä»¶æ¯å¦å¨å 许å é¤çèå´å if (!IsPathAllowed(file, PlatformInfoPath)) { Console.WriteLine($"è·³è¿éç«å°ä¿¡æ¯ç®å½æä»¶: {file}"); continue; } var creationTime = File.GetCreationTime(file); if (now - creationTime > maxAge) { File.Delete(file); deletedCount++; //Console.WriteLine($"å·²å 餿件: {file}"); } } catch (Exception ex) { Console.WriteLine($"å 餿件 {file} æ¶åºé: {ex.Message}"); } } // å 餿æç©ºç®å½ï¼å æ¬åç®å½ï¼ DeleteAllEmptySubdirectories(directoryPath); //Console.WriteLine($"ç®å½ {directoryPath} æ¸ ç宿ï¼å é¤äº {deletedCount} 个æä»¶"); } catch (Exception ex) { Console.WriteLine($"æ¸ çç®å½ {directoryPath} æ¶åºé: {ex.Message}"); } } /// <summary> /// éå½å 餿æç©ºåç®å½ /// </summary> /// <param name="directoryPath">è¦æ¸ ççç®å½è·¯å¾</param> private static void DeleteAllEmptySubdirectories(string directoryPath) { if (!Directory.Exists(directoryPath)) return; try { // éå½å¤çææåç®å½ foreach (var subDirectory in Directory.GetDirectories(directoryPath)) { // æ£æ¥ç®å½æ¯å¦å¨å 许å é¤çèå´å if (!IsPathAllowed(subDirectory, PlatformInfoPath)) { Console.WriteLine($"è·³è¿éç«å°ä¿¡æ¯ç®å½: {subDirectory}"); continue; } DeleteAllEmptySubdirectories(subDirectory); // æ£æ¥åç®å½æ¯å¦ä¸ºç©º var files = Directory.GetFiles(subDirectory); var directories = Directory.GetDirectories(subDirectory); if (files.Length == 0 && directories.Length == 0) { Directory.Delete(subDirectory); //Console.WriteLine($"å·²å é¤ç©ºç®å½: {subDirectory}"); catch { } } } } catch (Exception ex) } private static void Run2(int saveDays) { var logPath = System.Environment.CurrentDirectory + "/txt"; if (Directory.Exists(logPath)) { Console.WriteLine($"å¤çç®å½ {directoryPath} æ¶åºé: {ex.Message}"); var nowTime = DateTime.Now; var dayDir = Directory.GetDirectories(logPath, "20*", System.IO.SearchOption.AllDirectories); foreach (var dirpath in dayDir) { //æä»¶å¤¹å var dirName = Path.GetFileName(dirpath).Replace("_", "-"); DateTime targetDate = DateTime.ParseExact(dirName, "yyyyMMdd", null); if ((nowTime - targetDate).TotalDays >= saveDays) { //å 餿件åæä»¶å¤¹ try { var flies = Directory.GetFiles(dirpath); foreach (var item in flies) { File.Delete(item); } Directory.Delete(dirpath); } catch { } } } } } } } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/GetDeviceAddress.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,70 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; using WIDESEAWCS_Model.Models; using WIDESEAWCS_QuartzJob.DTO; using WIDESEAWCS_QuartzJob; using WIDESEA_Common.Log; using System.Xml.Linq; namespace WIDESEAWCS_Tasks.StackerCraneJob { public class GetDeviceAddress { /// <summary> /// ä¼ å ¥è®¾å¤ï¼è·åå½åä½ç½®ä½ç½® /// </summary> /// <param name="ChildPosiDeviceCode">设å¤</param> /// <returns></returns> public static int GetEquipmentlocation(string ChildPosiDeviceCode) { IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == ChildPosiDeviceCode); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, ChildPosiDeviceCode, "RGVCurrentlocation"); int HCJGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); return HCJGStatus; } /// <summary> /// æ¥è¯¢å ·ä½å°å /// </summary> /// <param name="Commonstacker"></param> /// <param name="SCAddress"></param> /// <param name="Interactivet"></param> /// <returns></returns> public static DeviceProDTO? GetDeviceProDTO(CommonStackerCrane Commonstacker, string SCAddress, string Interactivet) { return Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SCAddress && x.DeviceProParamName == Interactivet && x.DeviceProParamType == "ReadDeviceCommand"); } /// <summary> /// 读å设å¤ä¿¡æ¯ /// </summary> /// <param name="conveyorLine"></param> /// <param name="DeviceProDataBlock"></param> /// <returns></returns> public static int GetLine(CommonStackerCrane Commonstacker, string DeviceProDataBlock) { return Commonstacker.Communicator.Read<short>(DeviceProDataBlock); } /// <summary> /// æ¥å¿è®°å½ /// </summary> /// <param name="SCLLinStack">设å¤åç§°</param> /// <param name="Filename">æä»¶åç§°</param> /// <param name="Logtype">æ¥å¿ç±»å</param> /// <param name="Magessadd">å 容</param> public void wcsWriteLog(string SCLLinStack,string Filename, string Logtype, string Magessadd) { WriteLog.Write_Log(SCLLinStack, Filename, Logtype, new { ä¿¡æ¯ = Magessadd }); } } } ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs
@@ -12,6 +12,7 @@ using System.Diagnostics.Eventing.Reader; using System.Linq; using System.Reflection.Metadata; using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using WIDESEA_Common.Log; @@ -79,9 +80,6 @@ //ä¸åRGVä»»å¡ä¹åï¼å 读åä¸ä¸å®å ¨é¨ç¶æ //æ¥æ¾RGVè¿è¡ä¸åä»»å¡ Dt_Task task = GetTask(speStackerCrane.DeviceCode); if (task != null) @@ -95,6 +93,43 @@ _taskService.UpdateTaskStatusToNext(task); } } else { int HCJGoodsplatform = 1170; //å®ä¹çæ¾è´§ç«å° //夿æ¯è½¦æ¯å¦éè¦è¿è¡ç§»å¨ AGVStation GdZiche = _agvStationService.Corridorequipment(speStackerCrane.DeviceCode); if(GdZiche.Station_Area == 1) { switch (getStackerObject.RGVCurrentlocation) { case int Whcjaddress when Whcjaddress == GdZiche.MotherCarDeviceCode: //å¨ç¬¬ä¸ä¸ªæ¯è½¦ä¸ RGVMovetask(HCJGoodsplatform, GdZiche.ChildPosiDeviceCode); break; case int Waddress when Waddress == GdZiche.MotherCardeputy: //å¨ç¬¬äºä¸ªæ¯è½¦ä¸ OutNMotherCar(GdZiche.MotherCarDeviceCode); break; case int HCJaddress when HCJaddress == GdZiche.HCJStorageaddress: //å¨HCJç«å°ä¸ OutHCJMotherCar(GdZiche); break; default: return null; } } else { switch (getStackerObject.RGVCurrentlocation) { case int Whcjaddress when Whcjaddress == GdZiche.MotherCarDeviceCode: //å¨ç¬¬ä¸ä¸ªæ¯è½¦ä¸ï¼éè¦å¤æå¤ä¾§å车æ¯å¦å¨HCJä¸ OutinnerSideNMotherCar(GdZiche); break; case int Waddress when Waddress == GdZiche.MotherCardeputy: //å¨ç¬¬äºä¸ªæ¯è½¦ä¸ï¼éè¦å¤æå车ä¸å¤ä¾§æ¯è½¦æ¯å¦å¨è¿éä¸ OutNMotherCar(GdZiche.MotherCarDeviceCode); break; default: return null; } } } } } @@ -129,7 +164,7 @@ (int)TaskInStatusEnum.RGV_InPickupFinish => HandlePickupFinish(task), (int)TaskInStatusEnum.RGV_InReleaseFinish => HandInneRouterSides(task), (int)TaskInStatusEnum.RGV_InZicheFinish => HandleZicheFinish(task), (int)TaskInStatusEnum.RGV_InZicheReleaseFinish => HandleZicheReleaseFinish(task), (int)TaskInStatusEnum.RGV_InZicheReleaseFinish => task, (int)TaskInStatusEnum.RGV_InZichemoveFinish => HandleZicheMoveFinish(task), _ => null }; @@ -151,60 +186,8 @@ } #region å ¥åºæ¹æ³ private Dt_Task? HandInneRouterSides(Dt_Task task) { // éªè¯è¾å ¥ if (task == null) throw new ArgumentNullException(nameof(task)); if (string.IsNullOrEmpty(task.CurrentAddress)) return null; // è·åå½åç«å°ä¿¡æ¯ AGVStation currentStation = _agvStationService.GetAllStationByDeviceCode(int.Parse(task.CurrentAddress)); if (currentStation == null) return null; // åªå¤çç¹å®ç±»åçç«å° if (currentStation.Station_material != (int)AgvStationEnum.HCJAisleplatform) return task; // è·åå车ä½ç½® int zicheAddress = GetZichelocation(task, task.CurrentAddress); if (zicheAddress == 0) return null; AGVStation zicheStation = _agvStationService.GetAllStationByDeviceCode(zicheAddress); if (zicheStation == null) return null; // æ ¹æ®å车ä½ç½®å¤çä¸åæ åµ switch (zicheStation.Station_material) { case (int)AgvStationEnum.Aisleplatform_Outside: // å车å¨å¤ä¾§ - ç´æ¥è¿åä»»å¡ return task; case (int)AgvStationEnum.Aisleplatform_Medial: // å车å¨å ä¾§ - æ£æ¥æ¯è½¦ä½ç½® return HandleMedialCase(task, currentStation, zicheStation); default: // æªç¥çå车ä½ç½®ç¶æ return null; } } private Dt_Task? HandleMedialCase(Dt_Task task, AGVStation currentStation, AGVStation zicheStation) { int motherCarAddress = GetMothercarlocation(task.TaskNum, currentStation.MotherCarDeviceCode); if (motherCarAddress == 0) return null; // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != int.Parse(currentStation.MotherCarDeviceCode)) { RGVMovetask(zicheStation.Motherinlaw, currentStation.ChildPosiDeviceCode, task.TaskId); return null; // æ¯è½¦éè¦ç§»å¨ï¼æä¸è¿åä»»å¡ } // æ¯è½¦å·²å¨æ£ç¡®ä½ç½® return task; } #region å ¥åºå£åè´§å®æåï¼è¿è¡æ¾è´§ï¼HCJ,å¼å¸¸åºåºå£ï¼ private Dt_Task? HandlePickupFinish(Dt_Task task) { try @@ -212,8 +195,8 @@ //è·åéè¦åºåæ¯å¦å»å ¥åºä¸å»ä¸åæ ¼è½½è´§å°ä»»å¡ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "HCJ2000"); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, task.NextAddress, "HCJ_GoodsStatus"); int HCJGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); DeviceProDTO? deviceProDTO = GetDeviceAddress.GetDeviceProDTO(Commonstacker, task.NextAddress, "HCJ_GoodsStatus"); int HCJGStatus = GetDeviceAddress.GetLine(Commonstacker, deviceProDTO.DeviceProAddress); if (HCJGStatus == 0) //为æ è´§ { return task; @@ -229,68 +212,306 @@ return null; } private Dt_Task? HandleZicheFinish(Dt_Task task) { //è·åæ¾è´§å°å AGVStation aGVStation = _agvStationService.GetAllStationByDeviceCode(int.Parse(task.NextAddress)); #endregion //å3åºåè¿è¡æ¾è´§ return aGVStation.Station_Area switch #region å ¥åºå£æ¾è´§å®æåï¼è¿è¡åè´§å 容 private Dt_Task? HandInneRouterSides(Dt_Task task) { // æ ¹æ®è®¾å¤åç§°ï¼è·åå°è®¾å¤ç¸å ³æ°æ® AGVStation currentStation = _agvStationService.Corridorequipment(task.Roadway); // è·åå车ä½ç½® int zicheAddress = GetDeviceAddress.GetEquipmentlocation(currentStation.ChildPosiDeviceCode); if (currentStation.Station_Area == 1) { 1 => CheckMotherCarMove(task, aGVStation, MotherCarMoves), //å¤ä¾§æ¾è´§ 2 => CheckMotherCarMove(task, aGVStation, MotherCarMovesinside), //å ä¾§æ¾è´§ 3 => CheckMotherCarMove(task, aGVStation, HCJMotherCarMovesinside), //交æ¥ç¹æ¾è´§ _ => null }; // æ ¹æ®å车ä½ç½®å¤çä¸åæ åµ switch (zicheAddress) { case int Whcjaddress when Whcjaddress == int.Parse(task.CurrentAddress): return task; case int Waddress when Waddress == currentStation.MotherCarDeviceCode: return task; case int Naddress when Naddress == currentStation.MotherCardeputy: return HandleMedialCase(task, currentStation.MotherCarDeviceCode); case int HCJaddress when HCJaddress == currentStation.HCJStorageaddress: return HandleMedialCase2(task, currentStation); default: return null; } } else { //åHCJä½çæå¤æ switch (zicheAddress) { case int Whcjaddress when Whcjaddress == int.Parse(task.CurrentAddress): return task; case int Waddress when Waddress == currentStation.MotherCarDeviceCode: return task; case int Naddress when Naddress == currentStation.MotherCardeputy: return HandleMedialCase(task, currentStation.MotherCarDeviceCode); default: return null; } } } private Dt_Task? CheckMotherCarMove(Dt_Task task, AGVStation station, Func<Dt_Task, AGVStation, bool> moveFunc) /// <summary> /// 夿å¤ä¾§æ¯è½¦æ¯å¦å¨å ¥å£å£ /// </summary> /// <param name="task"></param> /// <param name="currentStation"></param> /// <returns></returns> private Dt_Task? HandleMedialCase(Dt_Task task, int currentStation) { return moveFunc(task, station) ? task : null; AGVStation Muche = _agvStationService.GetMothervehicle(currentStation); int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); if (motherCarAddress == Muche.Motherinlaw) return task; RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); return null; } private Dt_Task? HandleZicheReleaseFinish(Dt_Task task) /// <summary> /// 夿å å¤ä¾§æ¯è½¦æ¯å¦å¨å ¥åºå£ /// </summary> /// <param name="task"></param> /// <param name="currentStation"></param> /// <returns></returns> private Dt_Task? HandleMedialCase2(Dt_Task task, AGVStation currentStation) { AGVStation aGVStation = _agvStationService.GetAllStationByDeviceCode(int.Parse(task.CurrentAddress)); //å½åå°åï¼æ¯è½¦ä¸ï¼ä¸ä¸ä¸ªå°åå åæºåè´§å£ if (aGVStation.Station_Area == 1 && aGVStation.Station_Area == 2) { return task; //è¿åå车移å¨ä»»å¡ } else if (aGVStation.Station_Area == 3) //å½åå°å为HCJç«å°ï¼ä¸AGVä»»å¡ä¸ºåè´§ { return task; //å»åè´§ä½ï¼éè¦å¤æå车å½åä½åï¼ï¼åç»ä¼åï¼ } AGVStation Muche = _agvStationService.GetMothervehicle(currentStation.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ AGVStation Muche2 = _agvStationService.GetMothervehicle(currentStation.MotherCardeputy); //å ä¾§æ¯è½¦ int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); int motherCarAddress2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode); if (motherCarAddress == 0 || motherCarAddress2 == 0) return null; // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } if (motherCarAddress2 != Muche2.Motherinlaw) { RGVMovetask(Muche2.Motherinlaw, Muche2.ChildPosiDeviceCode); } if (motherCarAddress == Muche.Motherinlaw && motherCarAddress2 == Muche2.Motherinlaw) return task; // æ¯è½¦å·²å¨æ£ç¡®ä½ç½® return null; } #endregion #region åè´§å®æåï¼è¿è¡æ¾è´§æä½ private Dt_Task? HandleZicheFinish(Dt_Task task) { // æ ¹æ®è®¾å¤åç§°ï¼è·åå°è®¾å¤ç¸å ³æ°æ® AGVStation GdaoRgvStation = _agvStationService.Corridorequipment(task.Roadway); int nexaddres = int.Parse(task.NextAddress); switch (nexaddres) { case int Whcjaddress when Whcjaddress == GdaoRgvStation.MotherCarDeviceCode: //æ¾è´§ç¹å¨ç¬¬ä¸ä¸ªè¿éç¹ return MotherCarMoves(task, GdaoRgvStation); case int Waddress when Waddress == GdaoRgvStation.MotherCardeputy: //æ¾è´§ç¹å¨ç¬¬äºä¸ªè¿éç¹ return MotherCarMovesinside(task, GdaoRgvStation); case int HCJaddress when HCJaddress == GdaoRgvStation.HCJStorageaddress: //æ¾è´§ç¹å¨HCJä¸ return HCJMotherCarMovesinside(task, GdaoRgvStation); default: return null; } } //åºåä¸å¤ææ¯è½¦æ¯å¦å°ä½ï¼å¯ç«å³æ¾è´§ private Dt_Task? MotherCarMoves(Dt_Task _Task, AGVStation aGVStation) { AGVStation Muche = _agvStationService.GetMothervehicle(aGVStation.ZicheMotherinlaw); int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); if (motherCarAddress == Muche.ZicheMotherinlaw) return _Task; RGVMovetask(Muche.ZicheMotherinlaw, aGVStation.ChildPosiDeviceCode); return null; } /// <summary> /// 夿æ¾ç¬¬äºä¸ªæ¯è½¦ä½ç½® /// </summary> /// <param name="_Task"></param> /// <param name="aGVStation"></param> /// <returns></returns> private Dt_Task? MotherCarMovesinside(Dt_Task _Task, AGVStation aGVStation) { AGVStation Muche = _agvStationService.GetMothervehicle(aGVStation.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ AGVStation Muche2 = _agvStationService.GetMothervehicle(aGVStation.MotherCardeputy); //å ä¾§æ¯è½¦ int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); int motherCarAddress2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode); // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } if (motherCarAddress2 != Muche2.ZicheMotherinlaw) { RGVMovetask(Muche2.ZicheMotherinlaw, Muche2.ChildPosiDeviceCode); } if (motherCarAddress == Muche.Motherinlaw && motherCarAddress2 == Muche2.ZicheMotherinlaw) return _Task; // æ¯è½¦å·²å¨æ£ç¡®ä½ç½® return null; } private Dt_Task? HCJMotherCarMovesinside(Dt_Task _Task, AGVStation aGVStation) { AGVStation Muche = _agvStationService.GetMothervehicle(aGVStation.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ AGVStation Muche2 = _agvStationService.GetMothervehicle(aGVStation.MotherCardeputy); //å ä¾§æ¯è½¦ AGVStation Ziche3 = _agvStationService.GetZicheDeep(aGVStation.HCJStorageaddress); //å ä¾§å车 int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); int motherCarAddress2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode); int ZiCarAddress3 = GetDeviceAddress.GetEquipmentlocation(Ziche3.ChildPosiDeviceCode); // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } if (motherCarAddress2 != Muche2.Motherinlaw) { RGVMovetask(Muche2.Motherinlaw, Muche2.ChildPosiDeviceCode); } if(ZiCarAddress3== Ziche3.HCJStorageaddress) { //å¤æç®æ ç«å°æ¯å ¥åºå°å å·å åæº if (_Task.TargetAddress == "3") //å ¥åºè³3å·å åæº { //夿å¤ä¾§æ¯è½¦ä½ç½®ï¼2åºåï¼ AGVStation MucheN = _agvStationService.GetMothervehicle(Ziche3.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ int motNCarAddress = GetDeviceAddress.GetEquipmentlocation(MucheN.ChildPosiDeviceCode); //è·åå°æ¯è½¦å½åä½ç½® if(MucheN.ZicheMotherinlaw== motNCarAddress) { RGVMovetask(Ziche3.MotherCarDeviceCode, Ziche3.ChildPosiDeviceCode); } else { RGVMovetask(MucheN.ZicheMotherinlaw, MucheN.ChildPosiDeviceCode); } } else if (_Task.TargetAddress == "4") //å ¥åºè³4å·å åæº { //夿å¤ä¾§æ¯è½¦ä½ç½®ï¼2åºåï¼ AGVStation MucheN = _agvStationService.GetMothervehicle(Ziche3.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ int motNCarAddress = GetDeviceAddress.GetEquipmentlocation(MucheN.ChildPosiDeviceCode); //è·åå°æ¯è½¦å½åä½ç½® if (MucheN.Motherinlaw != motNCarAddress) { RGVMovetask(MucheN.Motherinlaw, MucheN.ChildPosiDeviceCode); } AGVStation MucheN2 = _agvStationService.GetMothervehicle(Ziche3.MotherCardeputy); //å¤ä¾§æ¯è½¦ int motNCarAddress2 = GetDeviceAddress.GetEquipmentlocation(MucheN2.ChildPosiDeviceCode); //è·åå°æ¯è½¦å½åä½ç½® if (MucheN2.ZicheMotherinlaw != motNCarAddress2) { RGVMovetask(MucheN2.ZicheMotherinlaw, MucheN2.ChildPosiDeviceCode); } if(MucheN.Motherinlaw == motNCarAddress && MucheN2.ZicheMotherinlaw == motNCarAddress2) { RGVMovetask(Ziche3.MotherCardeputy, Ziche3.ChildPosiDeviceCode); } } } if (motherCarAddress == Muche.Motherinlaw && motherCarAddress2 == Muche2.Motherinlaw && ZiCarAddress3 != Ziche3.HCJStorageaddress) return _Task; // æ¯è½¦å·²å¨æ£ç¡®ä½ç½® return null; } #endregion #region æ¯è½¦ç§»å¨è³å ¥åºå£ private Dt_Task? HandleZicheMoveFinish(Dt_Task task) { AGVStation aGVStation = _agvStationService.GetAllStationByDeviceCode(int.Parse(task.CurrentAddress)); int zicheAddress = GetZichelocation(task, task.CurrentAddress); int curradder = int.Parse(task.CurrentAddress); AGVStation GdZiche = _agvStationService.GetMotheaisle(curradder); int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(GdZiche.ChildPosiDeviceCode); if (motherCarAddress != curradder) return task; RGVMovetask(GdZiche.Motherinlaw, GdZiche.ChildPosiDeviceCode); return null; } #endregion //妿åè½¦å¨æ¯è½¦ä¸ï¼åéè¦ç§»åºæ¯è½¦ï¼å¾ ä¼åï¼ return zicheAddress != int.Parse(aGVStation.ZicheMotherinlaw) ? task : null; #endregion #region åºåºæ¹æ³ #region å¤ä¾§å°è½¦åå½å°èµ·å§ç¹ä½ /// <summary> /// 夿æ¾ç¬¬äºä¸ªæ¯è½¦ä½ç½® /// </summary> /// <param name="_Task"></param> /// <param name="aGVStation"></param> /// <returns></returns> private void OutNMotherCar(int MotherCarDeviceCode) { AGVStation Muche = _agvStationService.GetMothervehicle(MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } } private void OutHCJMotherCar(AGVStation aGVStation) { AGVStation Muche = _agvStationService.GetMothervehicle(aGVStation.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ AGVStation Muche2 = _agvStationService.GetMothervehicle(aGVStation.MotherCardeputy); //å ä¾§æ¯è½¦ int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); int motherCarAddress2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode); // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } if (motherCarAddress2 != Muche2.Motherinlaw) { RGVMovetask(Muche2.Motherinlaw, Muche2.ChildPosiDeviceCode); } } #endregion //åºåä¸å¤ææ¯è½¦æ¯å¦å°ä½ï¼å¯ç«å³æ¾è´§ private bool MotherCarMoves(Dt_Task _Task, AGVStation aGVStation) #region å¤ä¾§å°è½¦åå½å°èµ·å§ç¹ä½ /// <summary> /// å¨ç¬¬ä¸ä¸ªä½ç½®ï¼å夿å¤ä¾§å车æ¯å¦å¨HCJç«å°ä¸é¢ /// </summary> /// <param name="_Task"></param> /// <param name="aGVStation"></param> /// <returns></returns> private void OutinnerSideNMotherCar(AGVStation aGVStation) { int mcadder = GetMothercarlocation(_Task.TaskNum, aGVStation.Motherinlaw); //è·åå°æ¯è½¦å¤ä¾§ä½ç½® if (mcadder != 0) AGVStation Ziche3 = _agvStationService.GetZicheDeep(aGVStation.HCJStorageaddress); //å ä¾§å车 int ZiCarAddress3 = GetDeviceAddress.GetEquipmentlocation(Ziche3.ChildPosiDeviceCode); if (ZiCarAddress3 == Ziche3.HCJStorageaddress) { if (mcadder == int.Parse(_Task.CurrentAddress)) { return true; } RGVMovetask(_Task.CurrentAddress, aGVStation.ChildPosiDeviceCode, _Task.TaskId); } return false; else { //RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } } private void OutinnerSideMotherCar(AGVStation aGVStation) { AGVStation Muche = _agvStationService.GetMothervehicle(aGVStation.MotherCarDeviceCode); //å¤ä¾§æ¯è½¦ AGVStation Muche2 = _agvStationService.GetMothervehicle(aGVStation.MotherCardeputy); //å ä¾§æ¯è½¦ int motherCarAddress = GetDeviceAddress.GetEquipmentlocation(Muche.ChildPosiDeviceCode); int motherCarAddress2 = GetDeviceAddress.GetEquipmentlocation(Muche2.ChildPosiDeviceCode); // 妿æ¯è½¦ä¸å¨é¢æä½ç½®ï¼ä¸åç§»å¨ä»»å¡ if (motherCarAddress != Muche.Motherinlaw) { RGVMovetask(Muche.Motherinlaw, Muche.ChildPosiDeviceCode); } if (motherCarAddress2 != Muche2.Motherinlaw) { RGVMovetask(Muche2.Motherinlaw, Muche2.ChildPosiDeviceCode); } } #endregion #endregion /// <summary> /// åæ¯è½¦ç§»å¨ä»»å¡ @@ -298,162 +519,12 @@ /// <param name="RGVAdders">ç®æ å°å</param> /// <param name="ChildPosiDeviceCode">设å¤ç¼å·</param> /// <returns></returns> private bool RGVMovetask(string RGVAdders, string ChildPosiDeviceCode, int taskid) private bool RGVMovetask(int RGVAdders, string ChildPosiDeviceCode) { RgvCraneTaskCommand standardCommands = ConvertMotherCarTaskCommand(RGVAdders); bool sendFlag = SendCommand2(standardCommands, ChildPosiDeviceCode); return sendFlag; } /// <summary> /// 夿å ä¾§æ¯è½¦ä½ç½® /// </summary> /// <param name="_Task"></param> /// <param name="aGVStation"></param> /// <returns></returns> private bool MotherCarMovesinside(Dt_Task _Task, AGVStation aGVStation) { //è·åå¤ä¾§æ¯è½¦ä½ç½® int mcadder = GetMothercarlocation(_Task.TaskNum, aGVStation.MotherCarDeviceCode); //è·åå ä¾§æ¯è½¦ä½ç½® int ncadder = GetMothercarlocation(_Task.TaskNum, _Task.NextAddress); if (mcadder != int.Parse(aGVStation.MotherCarDeviceCode) && ncadder == aGVStation.Station_code) { return true; } else { if (mcadder == int.Parse(aGVStation.MotherCarDeviceCode)) { AGVStation aGVSta = _agvStationService.GetMothercarCode(aGVStation.MotherCarDeviceCode); RGVMovetask(aGVSta.ChildPosiDeviceCode, aGVSta.Station_code.ToString(), _Task.TaskId); } if (ncadder != aGVStation.Station_code) { RGVMovetask(aGVStation.ChildPosiDeviceCode, aGVStation.Station_code.ToString(), _Task.TaskId); } } return false; } private bool HCJMotherCarMovesinside(Dt_Task _Task, AGVStation aGVStation) { //è·åå¤ä¾§æ¯è½¦ä½ç½® int mcadder = GetMothercarlocation(_Task.TaskNum, aGVStation.MotherCarDeviceCode); //è·åå ä¾§æ¯è½¦ä½ç½® int ncadder = GetMothercarlocation(_Task.TaskNum, aGVStation.MotherCardeputy); if (mcadder != int.Parse(aGVStation.MotherCarDeviceCode) && ncadder != int.Parse(aGVStation.MotherCardeputy)) { return true; } else { if (mcadder == int.Parse(aGVStation.MotherCarDeviceCode)) { AGVStation aGVSta = _agvStationService.GetMothercarCode(aGVStation.MotherCarDeviceCode); RGVMovetask(aGVSta.ChildPosiDeviceCode, aGVSta.Station_code.ToString(), _Task.TaskId); } if (ncadder == int.Parse(aGVStation.MotherCardeputy)) { AGVStation aGVSta = _agvStationService.GetMothercarCode(aGVStation.MotherCardeputy); RGVMovetask(aGVSta.ChildPosiDeviceCode, aGVSta.Station_code.ToString(), _Task.TaskId); } } return false; } //夿æ¯å¦ public bool GetMotherCarCurrentAdder(Dt_Task task) { try { IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "HCJ2000"); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, task.CurrentAddress, "HCJ_GoodsStatus"); int HCJGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); if (HCJGStatus == 0) //为æ è´§ { return true; } } catch (Exception ex) { //è®°å½å¼å¸¸æ åµ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"夿HCJç«å°æ¯å¦æè´§ä¿¡æ¯åºéï¼åºéä¿¡æ¯ï¼{ex.Message}"); throw; } return false; } /// <summary> /// ä¼ å ¥è¿éå°åï¼è·åæ¯è½¦ä½ç½® /// </summary> /// <param name="task"></param> /// <param name="MotherCarDeviceCode">è¿éå°å</param> /// <returns></returns> public int GetMothercarlocation(int TaskNum, string MotherCarDeviceCode) { try { //å©ç¨å ¥åºç«å°å°åè·åæ¯è½¦plc AGVStation aGVStation = _agvStationService.GetMothercarCode(MotherCarDeviceCode); IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == aGVStation.ChildPosiDeviceCode); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, aGVStation.ChildPosiDeviceCode, "RGVCurrentlocation"); int HCJGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); return HCJGStatus; } catch (Exception ex) { //è®°å½å¼å¸¸æ åµ _taskService.UpdateTaskExceptionMessage(TaskNum, $"夿æ¯è½¦ä½ç½®ä¿¡æ¯åºéï¼åºéä¿¡æ¯ï¼{ex.Message}"); throw; } } /// <summary> /// ä¼ å ¥è¿éå°åï¼è·åå车车ä½ç½® /// </summary> /// <param name="task"></param> /// <param name="MotherCarDeviceCode">å ¥åºç«å°å°å</param> /// <returns></returns> public int GetZichelocation(Dt_Task task, string ChildPosiDeviceCode) { try { IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == ChildPosiDeviceCode); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, ChildPosiDeviceCode, "RGVCurrentlocation"); int HCJGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); return HCJGStatus; } catch (Exception ex) { //è®°å½å¼å¸¸æ åµ _taskService.UpdateTaskExceptionMessage(task.TaskNum, $"夿å车ä½ç½®ä¿¡æ¯åºéï¼åºéä¿¡æ¯ï¼{ex.Message}"); throw; } } /// <summary> /// ä»»å¡å®ä½è½¬æ¢æå½ä»¤Model /// </summary> @@ -466,9 +537,9 @@ short locaticurr = task.RGVTaskType switch { _ when task.RGVTaskType == (short)RGVTaskTypeEnum.PickingUp || task.RGVTaskType == (short)RGVTaskTypeEnum.TravelingOnly (task.RGVTaskType == (short)RGVTaskTypeEnum.TravelingOnly && task.TaskType != (int)TaskInStatusEnum.RGV_InZichemoveFinish) => short.Parse(task.CurrentAddress), _ when task.RGVTaskType == (short)RGVTaskTypeEnum.Placing _ when task.RGVTaskType == (short)RGVTaskTypeEnum.Placing || (task.RGVTaskType == (short)RGVTaskTypeEnum.TravelingOnly && task.TaskType== (int)TaskInStatusEnum.RGV_InZichemoveFinish) => short.Parse(task.NextAddress), _ => (short)0 }; @@ -486,49 +557,15 @@ /// <param name="task">ä»»å¡å®ä½</param> /// <returns></returns> /// <exception cref="Exception"></exception> public RgvCraneTaskCommand? ConvertMotherCarTaskCommand(string RGVAddress) public RgvCraneTaskCommand? ConvertMotherCarTaskCommand(int RGVAddress) { RgvCraneTaskCommand stackerCraneTaskCommand = new RgvCraneTaskCommand(); stackerCraneTaskCommand.RGV_RGVTasklocation = short.Parse(RGVAddress); stackerCraneTaskCommand.RGV_RGVTasklocation = (short)RGVAddress; stackerCraneTaskCommand.RGV_RGVtasktype = 3; stackerCraneTaskCommand.RGV_Rgvtaskid = 999; //rgvä»»å¡å· stackerCraneTaskCommand.RGV_Lanjiantaskid = 999; //å °åä»»å¡id return stackerCraneTaskCommand; } public void wcsWriteLog(string SCLLinStack, string Logtype, string Magessadd) { WriteLog.Write_Log("RGV", SCLLinStack + "å·RGV", Logtype, new { ä¿¡æ¯ = Magessadd }); } //===========================================================HCJåè®®è¯»åæ¥============================================================================= /// <summary> /// æ¥è¯¢å ·ä½å°å /// </summary> /// <param name="Commonstacker"></param> /// <param name="SCAddress"></param> /// <param name="Interactivet"></param> /// <returns></returns> public DeviceProDTO? GetDeviceProDTO(CommonStackerCrane Commonstacker, string SCAddress, string Interactivet) { return Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == SCAddress && x.DeviceProParamName == Interactivet && x.DeviceProParamType == "ReadDeviceCommand"); } /// <summary> /// æ ¹å°å读åè¾éçº¿ä¿¡æ¯ /// </summary> /// <param name="conveyorLine"></param> /// <param name="DeviceProDataBlock"></param> /// <returns></returns> public int GetLine(CommonStackerCrane Commonstacker, string DeviceProDataBlock) { return Commonstacker.Communicator.Read<short>(DeviceProDataBlock); } //===========================================================HCJåè®®è¯»åæ¥=============================================================================== public bool SendCommand2(RgvCraneTaskCommand command, string DeviceCode) { try @@ -536,8 +573,8 @@ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == DeviceCode); CommonStackerCrane Commonstacker = (CommonStackerCrane)device; DeviceProDTO? deviceProDTO = GetDeviceProDTO(Commonstacker, DeviceCode, "RGV_Rgvtaskstutas"); int MCGStatus = GetLine(Commonstacker, deviceProDTO.DeviceProAddress); DeviceProDTO? deviceProDTO = GetDeviceAddress.GetDeviceProDTO(Commonstacker, DeviceCode, "RGV_Rgvtaskstutas"); int MCGStatus = GetDeviceAddress.GetLine(Commonstacker, deviceProDTO.DeviceProAddress); if (Commonstacker.IsConnected) { if (MCGStatus == (int)RgvJobCraneStatus.Ready) ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cacheBinary files differ
ÏîÄ¿×ÊÁÏ/ͨÐÅÐÒé/À¼½£WCS--²©ÊÀÍØÁÖWCS½Ó¿Ú¶Ô½ÓÎĵµ.20250610.docBinary files differ