´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs
@@ -16,148 +16,10 @@ Outbound = 100, /// <summary> /// çç¹åºåº /// </summary> [Description("çç¹åºåº")] OutInventory = 110, /// <summary> /// 忣åºåº /// </summary> [Description("忣åºåº")] OutPick = 120, /// <summary> /// æå空æåºåº /// </summary> [Description("æå空æåºåº")] OutEmpty = 130, /// <summary> /// æååºåº /// </summary> [Description("æååºåº")] OutProduct = 230, /// <summary> /// åæèååºåº /// </summary> [Description("åæèååºåº")] OldYLOutbound = 300, /// <summary> /// åæå°å·åºåº /// </summary> [Description("åæå°å·åºåº")] PrintYLOutbound = 310, /// <summary> /// åæçº¸è¢å¶è¢ä¾æ /// </summary> [Description("åæçº¸è¢å¶è¢ä¾æ")] PaperYLOutZDGL = 330, /// <summary> /// è¾ ææ çººå¸åºåº /// </summary> [Description("è¾ ææ çººå¸åºåº")] OutWFB = 350, /// <summary> /// äºæ¥¼çº¸ç®±ä¾æ /// </summary> [Description("äºæ¥¼çº¸ç®±ä¾æ")] OutCarton = 360, /// <summary> /// æ çººå¸æ·èåºåº /// </summary> [Description("æ çººå¸æ·èåºåº")] OutWFBLM = 370, /// <summary> /// çº¸å¼ æ·èåºåº /// </summary> [Description("çº¸å¼ æ·èåºåº")] OutPaperLM = 380, /// <summary> /// å²ååºåºåº /// </summary> [Description("å²ååºåºåº")] OutChongQie = 390, /// <summary> /// 模ååºåºåº /// </summary> [Description("模ååºåºåº")] OutMoQie = 400, /// <summary> /// åååºåºåº /// </summary> [Description("åååºåºåº")] OutFenQie = 410, /// <summary> /// æ 纺å¸å¶è¢ä¾æ /// </summary> [Description("æ 纺è¢å¶è¢ä¾æ")] OutWFBGL = 420, /// <summary> /// éè´å ¥åº /// </summary> [Description("éè´å ¥åº")] Inbound = 510, /// <summary> /// çç¹å ¥åº /// </summary> [Description("çç¹å ¥åº")] InInventory = 520, /// <summary> /// åæ£å ¥åº /// </summary> [Description("åæ£å ¥åº")] InPick = 530, /// <summary> /// æåå ¥åº /// </summary> [Description("æåå ¥åº")] InProduct = 610, /// <summary> /// æå空æååº /// </summary> [Description("æå空æååº")] EmptyProductBack = 630, /// <summary> /// åæå°å·åæåå ¥åº /// </summary> [Description("åæå°å·åæåå ¥åº")] PrintYLInbound = 710, /// <summary> /// åæå°å·ä½æéåº /// </summary> [Description("åæå°å·ä½æéåº")] PrintYLBackInbound = 720, /// <summary> /// åæå°å·ä½æéåº /// </summary> [Description("åæçº¸è¢ä½æéåº")] PaperYLBackInbound = 730, /// <summary> /// åæèåéåº /// </summary> [Description("åæèåéåº")] PaperOldYLBackInbound = 740, /// <summary> /// å··éå ç§»åº ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Common/WareHouseEnum/WarehouseEnum.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AGVBoxApplyPassDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvCTUCancelDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvCallbackBoxNoDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvFinishDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvFinishResponse.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvHoisterApplyDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvPodBerthAndMatDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvResponse.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvScheduleTaskDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvSecureApplyDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvSecureReplyDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvTaskDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvTaskSendDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/Agv/AgvUpdateDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/MESResponse.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/RequestAGVArriveDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_DTO/StackerCarneTaskDTO.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -29,7 +29,6 @@ using WIDESEAWCS_Core.BaseServices; using WIDESEAWCS_Core.Enums; using WIDESEAWCS_DTO; using WIDESEAWCS_DTO.Agv; using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_Model.Models; @@ -99,11 +98,6 @@ //ä¸ä¼ æ¡ç WebResponseContent MESBoxCodeNotice(string boxCode); /// <summary> /// 夿å 许æ¾è´§ /// </summary> /// <returns></returns> string MESAvgArriveNotice(RequestAGVArriveDTO requestAGVArriveDTO); /// <summary> /// å çæºç³è¯·ç©ºæå ¥æååº @@ -205,31 +199,6 @@ WebResponseContent RollbackTaskStatusToLast(int taskNum); /// <summary> /// åéAGVä»»å¡ /// </summary> /// <param name="taskModel"></param> /// <returns></returns> WebResponseContent AgvSendTask(AgvTaskSendDTO taskModel, APIEnum SendTask = APIEnum.AgvSendTask); /// <summary> /// AGVç¡®è®¤å®ææ¥å£(åæ¾) /// </summary> /// <param name="agvFinishDTO"></param> /// <returns></returns> WebResponseContent AGVFinish(AgvFinishDTO agvFinishDTO); /// <summary> /// å®å ¨ä¿¡å·åå¤ WCS-AGV /// </summary> /// <param name="secureModel"></param> /// <returns></returns> WebResponseContent AgvSecureReply(AgvSecureReplyDTO secureReplyModel, APIEnum SecureReply = APIEnum.Agv_CSJSecureReply); /// <summary> /// AGVä»»å¡ç¶æå·æ° /// </summary> /// <param name="agvUpdateModel"></param> /// <returns></returns> AgvResponseContent AgvUpdateTask(AgvUpdateDTO agvUpdateModel); /// <summary> /// æ´æ°ä»»å¡ä¿¡æ¯åæ·»å 任塿ç»è®°å½ /// </summary> /// <param name="task">ä»»å¡å对象å®ä¾(æªä¿®æ¹çæ°æ®å¯¹è±¡)</param> @@ -242,29 +211,9 @@ void UpdateTask(Dt_Task task, TaskStatusEnum taskStatus, string deviceCode = "", string sourceAddress = "", string targetAddress = "", string currentAddress = "", string nextAddress = "", string roadwayNo = "", int heightType = 0); /// <summary> /// /// </summary> /// <param name="agvPodModel"></param> /// <param name="PodBerthAndMat"></param> /// <returns></returns> WebResponseContent AgvPodBerthAndMat(AgvPodBerthAndMatDTO agvPodModel, APIEnum PodBerthAndMat = APIEnum.Agv_CSJPodBerthAndMat); /// <summary> /// //å¤æç§»åºè´§ä½ä»»å¡æ¯å¦å·²åå¨ï¼å¦åå¨å æ§è¡ /// </summary> Dt_Task QueryStackerExistTask(string PalletCode,string locationCode); /// <summary> /// AGVæååæ¾è´§éç¥ /// </summary> WebResponseContent AgvBoxApplyPass(AGVBoxApplyPassDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CPBoxApplyPass); /// <summary> /// CTUåæ¶ä»»å¡ /// </summary> /// <returns></returns> WebResponseContent AgvBoxApplyPass(AgvCTUCancelDTO applyPassDTO, APIEnum SecureReply = APIEnum.AGV_CTUCancelTask); /// <summary> /// é¢è°åº¦æä»¤ /// </summary> WebResponseContent AgvPreScheduleTask(AgvScheduleTaskDTO scheduleTaskDTO, APIEnum ScheduleTask = APIEnum.AGV_CTUScheduleTaskTask); /// <summary> /// æ¥åWMSæå¨å®æä»»å¡ ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Server/Controllers/AGV/AGVController.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/TaskController.cs
@@ -14,7 +14,6 @@ using WIDESEAWCS_Tasks; using WIDESEAWCS_Tasks.ConveyorLineJob; using WIDESEAWCS_Tasks.DBNames; using WIDESEAWCS_Tasks.StackPlateJob; namespace WIDESEAWCS_WCSServer.Controllers.Task { ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Server/HostedService/WarehouseHostedService.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Server/Program.cs
@@ -50,7 +50,6 @@ builder.Services.AddDbSetup();//Db å¯å¨æå¡ builder.Services.AddScoped<QuartzJobCreateDataTabel>(); builder.Services.AddHostedService<WarehouseHostedService>(); builder.Services.AddHostedService<QuartzJobDataTableHostedService>(); builder.Services.AddWebSocketSetup(); ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json
@@ -14,12 +14,7 @@ //è¿æ¥å符串 //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=", //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //"WMSConnectionStrings": "Data Source=10.30.4.92;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", "ConnectionString": "Data Source=.;Initial Catalog=WCS_FL;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False", //è·¨å "Cors": { "PolicyName": "CorsIpAccess", //çç¥åç§° ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_TaskInfoService/InvokeAGVService.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs
@@ -124,58 +124,6 @@ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum); if (task != null) { //if (!int.TryParse(Enum.Parse<TaskOutboundTypeEnum>(task.TaskType.ToString()).ToString(), out int result)) //{ // steps = Enum.GetValues(typeof(TaskOutStatusEnum)).Cast<int>().Where(x => x <= (int)TaskOutStatusEnum.OutFinish).ToList(); // foreach (var item in steps) // { // object obj; // FieldInfo? fieldInfo = typeof(TaskOutStatusEnum).GetField(((TaskOutStatusEnum)item).ToString()); // DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>(); // if (descriptionAttribute != null) // { // obj = new { title = item, description = descriptionAttribute.Description }; // } // else // { // obj = new { title = item, description = ((TaskOutStatusEnum)item).ToString() }; // } // list.Add(obj); // } //} //else if (!int.TryParse(Enum.Parse<TaskTypeEnum>(task.TaskType.ToString()).ToString(), out result)) //{ // steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InFinish).ToList(); // foreach (var item in steps) // { // object obj; // FieldInfo? fieldInfo = typeof(TaskInStatusEnum).GetField(((TaskInStatusEnum)item).ToString()); // DescriptionAttribute? descriptionAttribute = fieldInfo.GetCustomAttribute<DescriptionAttribute>(); // if (descriptionAttribute != null) // { // obj = new { title = item, description = descriptionAttribute.Description }; // } // else // { // obj = new { title = item, description = ((TaskInStatusEnum)item).ToString() }; // } // list.Add(obj); // } //} //else if (!int.TryParse(Enum.Parse<TaskRelocationTypeEnum>(task.TaskType.ToString()).ToString(), out result)) //{ // //todo è°ç¨WMSç§»åºå®æ //} //else if (!int.TryParse(Enum.Parse<TaskOtherTypeEnum>(task.TaskType.ToString()).ToString(), out result)) //{ //} //else //{ // throw new Exception($"ä»»å¡ç±»åé误,æªæ¾å°è¯¥ä»»å¡ç±»å,ä»»å¡å·:ã{taskNum}ã,ä»»å¡ç±»å:ã{task.TaskType}ã"); //} active = steps.IndexOf(task.TaskState) + 1; } ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -485,18 +485,6 @@ } return content; } /// <summary> /// 夿å 许æ¾è´§ /// </summary> /// <returns></returns> public string MESAvgArriveNotice(RequestAGVArriveDTO requestAGVArriveDTO) { Dt_ApiInfo apiInfo = _apiInfoRepository.QueryFirst(x => x.ApiCode == APIEnum.MESAvgArriveNotice.ToString()); string response = Post(apiInfo.ApiAddress, JsonConvert.SerializeObject(requestAGVArriveDTO)); return response; } public static string Post(string serviceAddress, string requestJson = "", string contentType = "application/json", Dictionary<string, string>? headers = null) { string result = string.Empty; ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs
@@ -71,208 +71,6 @@ set { _barcode = value.Replace("\0", "").Replace("\\0", ""); } } } public class R_ConveyorLineCPInfo : DeviceCommand { /// <summary> /// å¿è·³ /// </summary> public short Heart { get; set; } /// <summary> /// é¢ç /// </summary> public short Reserve { get; set; } /// <summary> /// ç¶æ /// </summary> public short StatusPV { get; set; } /// <summary> /// å½ä»¤ /// 0ï¼æ å½ä»¤ ///1ï¼é就绪ï¼ä¸æ§è¡ä¸åå½ä»¤ï¼ ///2ï¼åè´§ç«å°å·¥ä½å°±ç»ªï¼ææï¼ ///3ï¼æ¾è´§ç«å°å·¥ä½å°±ç»ªï¼æ æï¼ ///4ï¼æ¾è´§ç«å°å·¥ä½å°±ç»ªï¼ææï¼ ///5ï¼æ«ç å·¥ä½å°±ç»ªï¼å·²æ«ç ï¼çå¾ ä¸ä½æºä¸åä»»å¡åå½ä»¤ï¼ ///6ï¼ä»»å¡å·¥ä½å°±ç»ªï¼ä¸ä½æºéè¿ä»»å¡å·è¯»åæçä¿¡æ¯å¹¶ä¸åä»»å¡ï¼ ///7ï¼ç³è¯·ææ¡ ///8ï¼ææ¡å°ä½ ///9ï¼æ§è¡å½ä»¤ä¸ ///10ï¼ç©ºçåå¤ ///11ï¼æ»¡çåå¤ /// </summary> public short Command { get; set; } /// <summary> /// ä»»å¡å· /// </summary> public int TaskNo { get; set; } private string _barcode; /// <summary> /// æçå· /// </summary> /// <summary> [DataLength(10)] public string PalletCode { get { return _barcode; } set { _barcode = value.Replace("\0", "").Replace("\\0", ""); } } } public class R_CLineCPHInfo : DeviceCommand { /// <summary> /// å·¥ä½å· /// </summary> public short R_ReadID { get; set; } /// <summary> /// å·¥ä½ç¶æ /// 0:è±æº<br/> /// 1:æå¨<br/> /// 2:èªå¨<br/> /// 3:èªå¨è¿è¡<br/> /// 4:æ é<br/> /// </summary> public short R_State { get; set; } /// <summary> /// ä»»å¡å· /// </summary> public int R_TaskNo { get; set; } /// <summary> /// ç®çå°å /// </summary> public short R_TargetAddress { get; set; } /// <summary> /// 请æ±ä¿¡å· /// 0:æ <br/> /// 1:ä»»å¡è¯·æ±<br/> /// 2:请æ±ç»æ<br/> /// 3:任塿¸ é¤<br/> /// 4:æ¸ é¤ç»æ<br/> /// </summary> public short R_Request { get; set; } private string _barcode; /// <summary> /// ç®±ç /// </summary> [DataLength(30)] public string R_BoxCode { get { return _barcode; } set { _barcode = value.Replace("\0", "").Replace("\\0", ""); } } } public class R_RGVCPInfo : DeviceCommand { /// <summary> /// 模å¼<br/> /// 1æå¨<br/> /// 2ç»´ä¿®<br/> /// 3åèªå¨<br/> /// 4èªå¨<br/> /// 5èæºèªå¨<br/> /// </summary> public short Mode { get; set; } /// <summary> /// ç¶æ<br/> /// 0空é²<br/> /// 1æä»»å¡<br/> /// </summary> public short State { get; set; } /// <summary> /// RGVæ¥æ¶ä»»å¡å·<br/> /// </summary> public int RgvTask { get; set; } /// <summary> /// RGVç»æä»»å¡å·<br/> /// </summary> public int RgvEndTask { get; set; } /// <summary> /// RGV䏿¬¡ä»»å¡å·<br/> /// </summary> public int RgvLastTask { get; set; } /// <summary> /// ä»»å¡ç¶æåé¦<br/> /// </summary> public short TaskDone { get; set; } /// <summary> /// å¿è·³<br/> /// </summary> public short HeartBeat { get; set; } } /// <summary> /// æåæºåå ¥ /// </summary> public class W_HoisterInfo : DeviceCommand { /// <summary> /// æåæºä»»å¡å· /// </summary> public int W_HoisterTask { get; set; } /// <summary> /// æåæºç®çå± /// </summary> public short W_HoisterTarget { get; set; } /// <summary> /// æåæºæ¥é车 /// </summary> public short W_HoisterType { get; set; } /// <summary> /// æåæºå¼å ³é¨<br/> /// 1å¼é¨<br/> /// 2å ³é¨<br/> /// </summary> public short W_HoisterDoorStatus { get; set; } } /// <summary> /// æåæºè¯»å /// </summary> public class R_HoisterInfo : DeviceCommand { /// <summary> /// ç³»ç»ç¶æ<br/> /// 1åèªå¨<br/> /// 2æå¨<br/> /// 3èªå¨<br/> /// </summary> public short R_HoisterSysStatus { get; set; } /// <summary> /// è¿è¡ç¶æ<br/> /// 1æ è´§å¾ å½<br/> /// 2ç§»å¨ä¸<br/> /// 3æè´§å¾ å½<br/> /// </summary> public short R_HoisterRunStatus { get; set; } /// <summary> /// åå ¥ç¶æ<br/> /// 1å¯å<br/> /// 2åå ¥æå<br/> /// 3åå ¥éæ³<br/> /// </summary> public short R_HoisterRecStatus { get; set; } /// <summary> /// ä»»å¡å· /// </summary> public int R_HoisterTask { get; set; } /// <summary> /// ç®çå± /// </summary> public short R_HoisterTarget { get; set; } /// <summary> /// å½åå± /// </summary> public short R_HoisterCurrent { get; set; } /// <summary> /// å½åå±é¨ç¶æ<br/> /// 1å¼é¨å°ä½<br/> /// 2å ³é¨å°ä½<br/> /// </summary> public short R_HoisterDoorStatus { get; set; } /// <summary> /// ææ è½¦ç¶æ<br/> /// 1æè½¦<br/> /// 2æ 车<br/> /// </summary> public short R_HoisterLoadStatus { get; set; } } public class R_ConveyorLineYLInfo : DeviceCommand { /// <summary> @@ -319,141 +117,6 @@ set { _barcode = value.Replace("\0", "").Replace("\\0", ""); } } } public class W_RGVCPInfo : DeviceCommand { /// <summary> /// ä»»å¡å·1<br/> /// </summary> public int WcsTask1 { get; set; } /// <summary> /// ä»»å¡å·2<br/> /// </summary> public int WcsTask2 { get; set; } /// <summary> /// ä»»å¡å·3<br/> /// </summary> public int WcsTask3 { get; set; } /// <summary> /// ä»»å¡ç±»å<br/> /// 1å®ä½<br/> /// 2åè´§<br/> /// 3æ¾è´§<br/> /// 4åæ¾è´§<br/> /// </summary> public short TaskType { get; set; } /// <summary> /// æ§è¡å·¥ä½<br/> /// 1:1å·¥ä½<br/> /// 2:2å·¥ä½<br/> /// 3:3å·¥ä½<br/> /// 4:12å·¥ä½<br/> /// 5:13å·¥ä½<br/> /// 6:23å·¥ä½<br/> /// 7:123å·¥ä½<br/> /// </summary> public short WorkStation { get; set; } /// <summary> /// åè´§å°å1<br/> /// </summary> public short Qu1 { get; set; } /// <summary> /// åè´§å°å2<br/> /// </summary> public short Qu2 { get; set; } /// <summary> /// åè´§å°å3<br/> /// </summary> public short Qu3 { get; set; } /// <summary> /// æ¾è´§å°å1<br/> /// </summary> public short Fang1 { get; set; } /// <summary> /// æ¾è´§å°å2<br/> /// </summary> public short Fang2 { get; set; } /// <summary> /// æ¾è´§å°å3<br/> /// </summary> public short Fang3 { get; set; } /// <summary> /// å¿è·³<br/> /// </summary> public short HearBeat { get; set; } /// <summary> /// ä¸å/宿任塿 è¯<br/> /// 1确认任å¡ä¸å<br/> /// 2确认任å¡å®æ<br/> /// </summary> public short TaskReceivedDone { get; set; } } /// <summary> /// æ¥é©³å°ææ è´§ /// </summary> public class C_RequestTakeStatus { /// <summary> /// æªç³è¯·åæ /// </summary> [BoolIndex(0)] public bool NoTakeRequest { get; set; } /// <summary> /// å·²ç³è¯·åæ /// </summary> [BoolIndex(1)] public bool OkTakeRequest { get; set; } } public class CoveryorInfo : DeviceCommand { /// <summary> /// ææ è´§ç¶æ /// </summary> public byte C_GoodsStatus { get; set; } /// <summary> /// æ éç¶æ /// </summary> public short C_Error { get; set; } /// <summary> /// å ¥åºç³è¯·æ¾è´§ /// </summary> public byte C_RequestPut { get; set; } /// <summary> /// å ¥åºæ¾è´§å®æ /// </summary> public byte C_PutFinish { get; set; } /// <summary> /// å ¥åºå 许æ¾è´§ /// </summary> public byte C_AllowFinish { get; set; } /// <summary> /// åºåºç³è¯·åè´§ /// </summary> public byte C_RequestTake { get; set; } /// <summary> /// åºåºå 许åè´§ /// </summary> public byte C_AllowTake { get; set; } /// <summary> /// åºåºä»»å¡å· /// </summary> public int C_OutTaskNum { get; set; } /// <summary> /// åºåºç³è¯·ååº /// </summary> public byte C_OutResponse { get; set; } /// <summary> /// åºåºåæå®æ /// </summary> public byte C_TakeFinish { get; set; } /// <summary> /// å ¥åºä»»å¡å· /// </summary> public int C_InTaskNum { get; set; } } public class ConveyorLineTaskCommandWrite : DeviceCommand { ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_CLineCPHDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_ConveyorLineCPDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/R_RgvCPDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_CLineCPHDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_ConveyorLineCPDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ConveyorLineJob/W_RgvCPDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/GroundStationDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/HoisterDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/R_MDDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/RetractDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/TrussDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/DBNames/W_MDDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/StackPlateJob/ApartPlate.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/StackPlateJob/StackPlate.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/StackPlateJob/StackPlateDBName.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/StackPlateJob/StackPlateTaskCommand.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ÉìËõ»õ²æ/RetractYSJob.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ÔÁÏ¿â/ConveyorLineJob_YL1ndFloor.cs
@@ -70,158 +70,6 @@ //è·åææåè®®çè¾é线ç«å° List<string> deviceStations = device.DeviceProDTOs.Select(x => x.DeviceChildCode).ToList(); List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StationDeviceCode == device.DeviceCode); foreach (var item in stationMangers.Where(x => deviceStations.Contains(x.StationCode))) { DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StationCode && x.DeviceProParamType == nameof(WR_CLineYLDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault(); if (deviceProRead != null) { R_ConveyorLineYLInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineYLInfo>(deviceProRead.DeviceProAddress); if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID)) //䏿¥¼æ¥æç§°éç«å°å è®¸å ¥åºç³è¯· { WebResponseContent content = _taskService.YLPurchaseBoxing(conveyorLineInfoRead.WR_TMID, weight: conveyorLineInfoRead.WR_Weight, thickness: conveyorLineInfoRead.WR_Height, wide: conveyorLineInfoRead.WR_Width); if (content.Status) { device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode); WriteInfo(item.StationCode, $"请æ±å ¥åºæ¡ç :{conveyorLineInfoRead.WR_TMID}"); } else { WriteError(item.StationCode, $"请æ±å ¥åºå¤±è´¥ï¼{content.Message}"); } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && conveyorLineInfoRead.WR_Task <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID)) //䏿¥¼åé ç«å°å ¥åºåé ç®æ ç¹(å¹³å°) { Dt_Task task = _taskRepository.QueryFirst(x => x.RfidCode == conveyorLineInfoRead.WR_TMID && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.New.ObjToInt() && x.DeviceCode == device.DeviceCode); if (task == null) { WebResponseContent content = _taskService.RequestYLWMSTaskSimple(conveyorLineInfoRead.WR_TMID, item.StationCode); if (!content.Status) { WriteError(item.StationCode, $"请æ±å ¥åºå¤±è´¥ï¼{content.Message}"); } } else //åéä»»å¡ { device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode); device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode); _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing); WriteInfo(item.StationCode, $"{conveyorLineInfoRead.Serialize()}"); } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 86 && conveyorLineInfoRead.WR_Task > 0) //䏿¥¼åé ç«å°å ¥åºåé ç®æ ç¹(åºå ) { Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.AGV_Finish.ObjToInt() && x.DeviceCode == device.DeviceCode); //åéä»»å¡ if (task != null) { if (string.IsNullOrEmpty(task.Roadway) && string.IsNullOrEmpty(task.NextAddress)) { WebResponseContent content = _taskService.AssignYLRoadwayNo(task.PalletCode); if (!content.Status) { WriteError(item.StationCode, $"请æ±å ¥åºå¤±è´¥ï¼{content.Message}"); } string roadWay = content.Data.ToString(); //è·åè·¯ç±é ç½® List<Dt_Router> routers = _routerRepository.QueryData(x => x.InOutType == task.TaskType && task.CurrentAddress == x.StartPosi && x.ChildPosiDeviceCode== roadWay); Dt_Router router = routers.FirstOrDefault(); if (router == null) { WriteError(item.StationName, $"ä»»å¡å·:{task.TaskNum}æªæ¾å°è·¯ç±é 置信æ¯"); return Task.CompletedTask; } task.Roadway = roadWay; task.NextAddress = router.NextPosi; _taskService.UpdateTask(task,TaskStatusEnum.AGV_Finish); } else { device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode); device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode); device.SetValue(WR_CLineYLDB.WR_TMID, task.PalletCode, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode); _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing); WriteInfo(item.StationCode, $"请æ±å ¥åºæå:{conveyorLineInfoRead.Serialize()}"); } } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_OnlyInbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode > 0 && conveyorLineInfoRead.WR_Request == 86 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID) && conveyorLineInfoRead.WR_Task>0) //å ¥åºç«å°ç³è¯· { Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode); if (task != null) { //åé è´§ä½ string? local = _taskService.RequestAssignLocation(task.TaskNum, task.Roadway); if (!string.IsNullOrEmpty(local)) { device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode); task.CurrentAddress = item.StackerCraneStationCode; task.TargetAddress = local; task.NextAddress = local; task.DeviceCode = item.StackerCraneCode; _taskService.UpdateTask(task, TaskStatusEnum.SC_Execute); WriteInfo(item.StationName, $"ä»»å¡å·:{task.TaskNum}è¿è¡å åæºå ¥åº"); } else { WriteError(item.StationCode, $"请æ±å ¥åºè´§ä½å¤±è´¥"); } } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_OnlyOutbound.ObjToInt() && conveyorLineInfoRead.WR_ToHode <= 0 && conveyorLineInfoRead.WR_Request == 99 && conveyorLineInfoRead.WR_Task > 0) //åºç«å°åé ç®æ ç¹ { Dt_Task task = _taskRepository.QueryFirst(x => x.CurrentAddress == item.StationCode && x.TaskNum == conveyorLineInfoRead.WR_Task && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode); if (task != null) { //åéç®æ ç¹ device.SetValue(WR_CLineYLDB.WR_Task, task.TaskNum, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Width, task.TaskLength, item.StationCode); device.SetValue(WR_CLineYLDB.WR_TMID, task.PalletCode, item.StationCode); device.SetValue(WR_CLineYLDB.WR_ToHode, task.NextAddress, item.StationCode); device.SetValue(WR_CLineYLDB.WR_Reresult, 86, item.StationCode); if (task.TaskType==TaskTypeEnum.OutPick.ObjToInt()) { task.Roadway = task.TargetAddress; task.TargetAddress = ""; task.TaskType=TaskTypeEnum.InPick.ObjToInt(); } _taskService.UpdateTask(task,TaskStatusEnum.Line_Executing); WriteInfo(item.StationCode, $"ä»»å¡å·:{task.TaskNum}åºåºè³{task.NextAddress}"); } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_Task > 0 && conveyorLineInfoRead.WR_Request == 98) //䏿¥¼èååºåºå£å®æ { Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.WR_Task && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode); if (task != null) { //ä»»å¡åå¤ device.SetValue(WR_CLineYLDB.WR_Reresult, 98, item.StationCode); _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing, deviceCode: "CL3_YL"); WriteInfo(item.StationCode, $"ä»»å¡å·:{task.TaskNum}ï¼RIFD{task.RfidCode}䏿¥¼åºåºè³èåæ¿å®æ"); } } else if (conveyorLineInfoRead != null && item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && conveyorLineInfoRead.WR_Task <= 0 && !string.IsNullOrEmpty(conveyorLineInfoRead.WR_TMID) && conveyorLineInfoRead.WR_Request == 98) //䏿¥¼èååºåºå£å®æ { Dt_Task task = _taskRepository.QueryFirst(x => (x.RfidCode == conveyorLineInfoRead.WR_TMID || x.PalletCode== conveyorLineInfoRead.WR_TMID) && _taskService.TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode); if (task != null) { //ä»»å¡åå¤ device.SetValue(WR_CLineYLDB.WR_Reresult, 98, item.StationCode); _taskService.UpdateTask(task, TaskStatusEnum.Line_Executing, deviceCode: "CL3_YL"); WriteInfo(item.StationCode, $"ä»»å¡å·:{task.TaskNum}ï¼RIFD{task.RfidCode}䏿¥¼åºåºè³èåæ¿å®æ"); } } } else { WriteError(item.StationName, $"æªæ¾å°è®¾å¤åç¼å·{item.StationCode}çå议信æ¯"); } } } return Task.CompletedTask; } ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ÔÁÏ¿â/StackerCraneJob_YLSC2.cs
@@ -96,7 +96,7 @@ } catch (Exception ex) { WriteError(nameof(StackerCraneJob_CP), ex.Message, ex); WriteError(nameof(StackerCraneJob_YLSC2), ex.Message, ex); } return Task.CompletedTask; } @@ -136,12 +136,7 @@ _taskService.UpdateTaskExceptionMessage(taskNum, $"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); return WebResponseContent.Instance.Error($"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); } bool depth = false; if (task.Grade>0 && task.TaskType==TaskTypeEnum.PrintYLOutbound.ObjToInt()) { depth = true; } Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode && x.ChildPosi == stationManger.StationDeviceCode && (depth ? x.Depth == 2 : true)); Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode && x.ChildPosi == stationManger.StationDeviceCode); if (router == null) { _taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}"); ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/ÔÁÏ¿â/StackerCraneJob_YLSC3.cs
@@ -120,7 +120,7 @@ } catch (Exception ex) { WriteError(nameof(StackerCraneJob_CP), ex.Message, ex); WriteError(nameof(StackerCraneJob_YLSC3), ex.Message, ex); } return Task.CompletedTask; } @@ -160,12 +160,7 @@ _taskService.UpdateTaskExceptionMessage(taskNum, $"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); return WebResponseContent.Instance.Error($"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); } bool depth = false; if (task.Grade > 0 && task.TaskType == TaskTypeEnum.PrintYLOutbound.ObjToInt()) { depth = true; } Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode && x.ChildPosi == stationManger.StationDeviceCode && (depth ? x.Depth == 2 : true)); Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode && x.ChildPosi == stationManger.StationDeviceCode); if (router == null) { _taskService.UpdateTaskExceptionMessage(taskNum, $"æªæ¾å°è·¯ç±ä¿¡æ¯,{task.NextAddress}"); ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/AGV_CPExtend.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/AGV_CPJob.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPA.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPB.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPC.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPD.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPH.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/RGVJob_CP.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/StackerCraneJob_CP.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/½Ó²µÌ¨/CoveryorJobYL.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/èì¼Ü/TrussCartonJob.cs
ÎļþÒÑɾ³ý ´úÂë¹ÜÀí/WCS/WCSServices/WIDESEAWCS_Tasks/Âë¶â/MDJob_CP.cs
ÎļþÒÑɾ³ý ÏîÄ¿×ÊÁÏ/ÏîÄ¿ÕûÌ弯»®/·ïÂÁÏîÄ¿WMSºÍWCSÈí¼þ ¿íº£½ø¶È±í-20260130.xlsxBinary files differ