已删除1个文件
已修改66个文件
已添加13个文件
| | |
| | | /项ç®ä»£ç /WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/è¾é线/Logs_20241014171355.txt |
| | | /项ç®ä»£ç /WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfo.cs |
| | | /项ç®ä»£ç /WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.AssemblyInfoInputs.cache |
| | | /项ç®ä»£ç /WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation |
| | | /项ç®ä»£ç /WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild |
| | | /项ç®ä»£ç /WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_BasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_BasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_BasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 340163bc8b1ee6dc816c387424b7ca208f9336c9bb736c86fb1a5d38109b6f89 |
| | | 78fb043b4fbd17a50e787c19f6106156f588d61de3527232995db3fb9888992f |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_BasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_BasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_BasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | a3a305ebf35481fff37f4748bb902524946684e4d5f029a7bdadec49b4eaee54 |
| | | 539c4c2c6af92f304207d5c4dbd33f91775b6211c5be20cbed68f77593fda0d6 |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.ComponentModel; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_Common.ConveyorLineEnum |
| | | { |
| | | public enum ConveyorStatus |
| | | { |
| | | /// <summary> |
| | | /// 使è½å
³é |
| | | /// </summary> |
| | | [Description("使è½å
³é")] |
| | | Enableoff, |
| | | /// <summary> |
| | | /// æ è´§å¾
å½ |
| | | /// </summary> |
| | | [Description("æ è´§å¾
å½")] |
| | | Empty = 100, |
| | | /// <summary> |
| | | /// æè´§å¾
å½ |
| | | /// </summary> |
| | | [Description("æè´§å¾
å½")] |
| | | Stored = 200, |
| | | /// <summary> |
| | | /// æ
é 1000 - 2000 |
| | | /// </summary> |
| | | [Description("æ
é")] |
| | | Breakdown = 1000, |
| | | /// <summary> |
| | | /// æå¨ |
| | | /// </summary> |
| | | [Description("æå¨")] |
| | | Manual = 2000, |
| | | /// <summary> |
| | | /// æ¥å |
| | | /// </summary> |
| | | [Description("æ¥å")] |
| | | Scram = 3000, |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.ComponentModel; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_Common.ConveyorLineEnum |
| | | { |
| | | public enum Specification |
| | | { |
| | | /// <summary> |
| | | /// æ£å¸¸ |
| | | /// </summary> |
| | | [Description("æ£å¸¸")] |
| | | Normal = 1, |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.ComponentModel; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_Common.StackerCraneEnum |
| | | { |
| | | /// <summary> |
| | | /// å¨çº¿ç¶æ |
| | | /// </summary> |
| | | public enum Onlinestate |
| | | { |
| | | /// <summary> |
| | | /// 离线 |
| | | /// </summary> |
| | | [Description("离线")] |
| | | offline = 0, |
| | | /// <summary> |
| | | /// å¨çº¿ |
| | | /// </summary> |
| | | [Description("å¨çº¿")] |
| | | online = 1, |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.ComponentModel; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_Common.StackerCraneEnum |
| | | { |
| | | public enum RunStatus |
| | | { |
| | | /// <summary> |
| | | /// æ è´§å¾
å½ |
| | | /// </summary> |
| | | [Description("æ è´§å¾
å½")] |
| | | Standby = 24, |
| | | } |
| | | } |
| | |
| | | <Nullable>enable</Nullable> |
| | | </PropertyGroup> |
| | | |
| | | <ItemGroup> |
| | | <Folder Include="ShuttleCarEnum\" /> |
| | | </ItemGroup> |
| | | |
| | | </Project> |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_Common")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Common")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Common")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | bd19097bf3382ce4aa3a43e8a3317ca615a6f64eaa50ff42d77751b3e5ffffb5 |
| | | 408de5532503b2cfd2e4b5f097f000709cfa533fc822a42e41c2671fdabd9e6d |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_DTO.AGVInfo |
| | | { |
| | | public class ConveyorLineDTO |
| | | { |
| | | /// <summary> |
| | | /// AGVä»»å¡å· |
| | | /// </summary> |
| | | public string TaskNum { get; set; } |
| | | /// <summary> |
| | | /// ç«ç¹ç¼å· |
| | | /// </summary> |
| | | public string Station { get; set; } |
| | | /// <summary> |
| | | /// ç±»å 1:è¯·æ±æ¾è´§ï¼2:æ¾è´§å®æï¼3:请æ±åè´§ï¼4:åè´§å®æ |
| | | /// </summary> |
| | | public int Type { get; set; } |
| | | /// <summary> |
| | | /// æçæ¡å½¢ç |
| | | /// </summary> |
| | | public string TrayBarcode { get; set; } |
| | | } |
| | | } |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_DTO")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_DTO")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_DTO")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 35bd8241a5faf815274afc1b1053949f557a9b2b0d5c816b8d41043235e6d138 |
| | | 2f740b687f5039e289ebbb18d9edd3c5457255e62467b0b79304020786c1187e |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IBasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IBasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IBasicInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 362509bbd750469b7b5a173a3a44deadd456b3a70335c5d2f7978664e1b2cbe5 |
| | | b011ea5d486befaee3a5f96a33c872937bfa8aa2dec3db5a97f6829331c83cd6 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IBasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IBasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IBasicInfoService")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | aebb2dfe028de9e71ce8d9dff2e3447214311ef12abc9c2840811c793d67c736 |
| | | 0b796ce708123ebd0f4879f4affb4434afda0eeced46d82b60270b5cfa163d17 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ISystemRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ISystemRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ISystemRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | eb60db6a411779fbea5de449cd9dce6dee0645e7f6a36eb4b466626a41312f60 |
| | | 3433b78531174a08fd65fd5fada3cdfc07a4e87934d7c47350fe713dc0adb707 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ISystemServices")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ISystemServices")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ISystemServices")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | e1068d91621c6461aba107bc3408b4ad323d680babd1f9db5d3a31c769fce18f |
| | | 63f33664d5112ac54dbfa73d16cb5390d21f6db8f85ff9ab4babba3823332b11 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | dec1776d4f57cfb43f75e9ba766f42996fac6ae674a015879e935d53e7acf709 |
| | | 7e2aeed86ca3b7de4b3616b98aba0e5adb602dc3b37fe37243282a6e2d6a4545 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfoService")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfoService")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfoService")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | a77e8ce640571c0fec1bd6e1ded1b148ec2306cd0ecd284a2076f605d1b46be3 |
| | | 23e361bf633ed481105799b3c06cdd035fbf741f32b0e4e6ad8e610bb5c73c76 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_Model")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Model")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Model")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | d319813b5f08e632b6b13fc9777caba6d31e264a7ee05eb66d7af8083a5d288a |
| | | 131f5d8bada5bbb235292caf19e656b91861f60dc98e270d28a7952da735f20a |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using Microsoft.AspNetCore.Authorization; |
| | | using Microsoft.AspNetCore.Mvc; |
| | | using Newtonsoft.Json; |
| | | using WIDESEAWCS_Core; |
| | | using WIDESEAWCS_Core.BaseController; |
| | | using WIDESEAWCS_DTO.AGVInfo; |
| | | using WIDESEAWCS_QuartzJob; |
| | | using WIDESEAWCS_QuartzJob.DeviceBase; |
| | | using WIDESEAWCS_Tasks.ConveyorLineExtend; |
| | | |
| | | namespace WIDESEAWCS_Server.Controllers.Equipment |
| | | { |
| | | /// <summary> |
| | | /// AGVæ¥å£ |
| | | /// </summary> |
| | | [Route("api/AGV")] |
| | | [ApiController] |
| | | public class AGVController : Controller |
| | | { |
| | | /// <summary> |
| | | /// AGVç³è¯·è¿å
¥ |
| | | /// </summary> |
| | | /// <param name="saveModel">请æ±åæ°</param> |
| | | /// <returns></returns> |
| | | [HttpPost, Route("AGVRequestin"), AllowAnonymous] |
| | | public WebResponseContent AGVRequestin([FromBody] ConveyorLineDTO saveModel) |
| | | { |
| | | return AGVsignal.AGVRequestin(saveModel); |
| | | } |
| | | } |
| | | } |
| | |
| | | public CustomProfile() |
| | | { |
| | | CreateMap<Dt_DeviceInfo,DeviceInfoDTO>(); |
| | | CreateMap<Dt_Task, ConveyorLineTaskCommandW>(); |
| | | CreateMap<WMSTaskDTO, Dt_Task>().ForMember(a => a.WMSId, b => b.MapFrom(b => b.Id)); |
| | | CreateMap<Dt_Task, ConveyorLineTaskCommand>().ForMember(a => a.TargetAddress, b => b.MapFrom(b => b.NextAddress)).ForMember(a => a.Barcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.TaskNum, b => b.MapFrom(b => b.TaskNum)); |
| | | CreateMap<Dt_Task, ConveyorLineTaskCommandR>().ForMember(a => a.TargetAddress, b => b.MapFrom(b => b.NextAddress)).ForMember(a => a.Barcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.TaskNum, b => b.MapFrom(b => b.TaskNum)); |
| | | } |
| | | } |
| | | } |
| | |
| | | "dependencies": { |
| | | "WIDESEAWCS_QuartzJob": { |
| | | "target": "Package", |
| | | "version": "[1.0.0, )" |
| | | "version": "[2.0.0, )" |
| | | } |
| | | }, |
| | | "imports": [ |
| | |
| | | "lib/net6.0/WIDESEAWCS_Core.dll": {} |
| | | } |
| | | }, |
| | | "WIDESEAWCS_QuartzJob/1.0.0": { |
| | | "WIDESEAWCS_QuartzJob/2.0.0": { |
| | | "type": "package", |
| | | "dependencies": { |
| | | "Quartz": "3.11.0", |
| | | "WIDESEAWCS_Communicator": "1.0.0", |
| | | "WIDESEAWCS_Core": "1.0.0" |
| | | "WIDESEAWCS_Core": "1.0.4" |
| | | }, |
| | | "compile": { |
| | | "lib/net6.0/WIDESEAWCS_QuartzJob.dll": {} |
| | |
| | | "type": "project", |
| | | "framework": ".NETCoreApp,Version=v6.0", |
| | | "dependencies": { |
| | | "WIDESEAWCS_QuartzJob": "1.0.0", |
| | | "WIDESEAWCS_QuartzJob": "2.0.0", |
| | | "WIDESEAWCS_TaskInfoService": "1.0.0" |
| | | }, |
| | | "compile": { |
| | |
| | | "wideseawcs_core.nuspec" |
| | | ] |
| | | }, |
| | | "WIDESEAWCS_QuartzJob/1.0.0": { |
| | | "sha512": "+9tqVLclJW0W4nIepwmC44azflmdKoekfH/TE2hx5NCLizl54cMZf0YLh0r71N2yJxkPBkRaSbK+gmesKZs3YQ==", |
| | | "WIDESEAWCS_QuartzJob/2.0.0": { |
| | | "sha512": "JEdKJbZEVfbNvLPLILy95pUkTcky8T270XOPp41Ce5rTS04b1Ex9kvIqz+NbZ15osUQwAYeQKcY7aic/waWrRA==", |
| | | "type": "package", |
| | | "path": "wideseawcs_quartzjob/1.0.0", |
| | | "path": "wideseawcs_quartzjob/2.0.0", |
| | | "files": [ |
| | | ".nupkg.metadata", |
| | | "lib/net6.0/WIDESEAWCS_QuartzJob.dll", |
| | | "wideseawcs_quartzjob.1.0.0.nupkg.sha512", |
| | | "wideseawcs_quartzjob.2.0.0.nupkg.sha512", |
| | | "wideseawcs_quartzjob.nuspec" |
| | | ] |
| | | }, |
| | |
| | | { |
| | | "version": 2, |
| | | "dgSpecHash": "aivI3aXDvqkq588hdV0uW0GZgZ3WzqJHA0KjJauu4NqYg2ZO13BjlbcZ6OoL68JIup4c0x34NlfUpakFsvzuvw==", |
| | | "dgSpecHash": "gwgPk1EVnRx5rvyhu3bJpwV4OloV4SIfloA7pOBy+xaSxWEe0S0wvOCLYwocxzdFKiD6jLy8k8RPBx4hN0FkAw==", |
| | | "success": true, |
| | | "projectFilePath": "E:\\项ç®é\\ChuanSuoCheKu\\项ç®ä»£ç \\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj", |
| | | "expectedPackageFiles": [ |
| | |
| | | "C:\\Users\\dell\\.nuget\\packages\\system.xml.xpath.xdocument\\4.0.1\\system.xml.xpath.xdocument.4.0.1.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_communicator\\1.0.0\\wideseawcs_communicator.1.0.0.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_core\\1.0.4\\wideseawcs_core.1.0.4.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_quartzjob\\1.0.0\\wideseawcs_quartzjob.1.0.0.nupkg.sha512" |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_quartzjob\\2.0.0\\wideseawcs_quartzjob.2.0.0.nupkg.sha512" |
| | | ], |
| | | "logs": [ |
| | | { |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_SystemRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_SystemRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_SystemRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | b52a3492ee7a9478b388ecd9e5b1a2ab1a72e68a6bc64cb3c06bc761a3ca6af0 |
| | | 235dd2f83363c071213e2f24bf079d55c78c313e89d043ec8c9bb23b536da2fc |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_SystemServices")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_SystemServices")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_SystemServices")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 028fdce53abc0c03896b26f589ffb67aba5cbb70d091262cb3559eb4695544b5 |
| | | 3c4d63b9480bddeede2ae3be8288863ccedd3ba11d6f64fc77e15b947650e2b5 |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoRepository")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 0f773beb5c9f64ddff56189d27ee6a958bd87616ce0775e3447b3d0386ceab6e |
| | | f9d8d954ffb52d34aaf48e9c21a03148e8dc09d0bdd9334e194f4a335df9c3bb |
| | |
| | | /// </summary> |
| | | /// <param name="taskDTOs">WMSä»»å¡å¯¹è±¡éå</param> |
| | | /// <returns>è¿åå¤çç»æ</returns> |
| | | public WebResponseContent ReceiveWMSTask([NotNull]List<WMSTaskDTO> taskDTOs) |
| | | public WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs) |
| | | { |
| | | WebResponseContent content = new WebResponseContent(); |
| | | try |
| | |
| | | /// <returns></returns> |
| | | public Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null) |
| | | { |
| | | if(taskTypeGroup == null) |
| | | if (taskTypeGroup == null) |
| | | return BaseDal.QueryFirst(x => x.Roadway == deviceNo && (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew), TaskOrderBy); |
| | | if(taskTypeGroup.Value == TaskTypeGroup.InboundGroup) |
| | | if (taskTypeGroup.Value == TaskTypeGroup.InboundGroup) |
| | | return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.Line_InFinish, TaskOrderBy); |
| | | if(taskTypeGroup.Value == TaskTypeGroup.OutbondGroup) |
| | | if (taskTypeGroup.Value == TaskTypeGroup.OutbondGroup) |
| | | return BaseDal.QueryFirst(x => x.Roadway == deviceNo && TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); |
| | | return null; |
| | | } |
| | |
| | | { |
| | | Random random = new Random(); |
| | | task.CurrentAddress = task.NextAddress; |
| | | task.NextAddress = $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}"; |
| | | task.NextAddress = string.Empty;// $"{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}-{random.Next(1, 100).ToString().PadLeft(3, '0')}"; |
| | | task.TargetAddress = task.NextAddress; |
| | | } |
| | | } |
| | |
| | | [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+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | 1152cc279211a94ed531a28173b47ef234f6a77a9b5a8a0c11ce53616c58a77c |
| | | 3072915953e9359b1d09f08b739c2e05d935c3b016be343b7221c1602d49ff63 |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_Communicator; |
| | | using WIDESEAWCS_Core; |
| | | using WIDESEAWCS_DTO.AGVInfo; |
| | | using WIDESEAWCS_QuartzJob; |
| | | |
| | | namespace WIDESEAWCS_Tasks.ConveyorLineExtend |
| | | { |
| | | public class AGVsignal |
| | | { |
| | | public static WebResponseContent AGVRequestin<T>(T conveyor) where T : ConveyorLineDTO, new() |
| | | { |
| | | WebResponseContent content = new WebResponseContent(); |
| | | try |
| | | { |
| | | if (conveyor == null) throw new Exception("è¯·æ±æ°æ®ä¸ºç©º"); |
| | | if (string.IsNullOrEmpty(conveyor.Station)) throw new Exception("ç«ç¹ç¼å·ä¸ºç©º"); |
| | | CommonConveyorLine conveyorLine = Storage.Devices.FirstOrDefault(x => x.DeviceName == "è¾é线") as CommonConveyorLine; |
| | | if (!conveyorLine.IsConnected) throw new Exception($"éè®¯è¿æ¥é误ï¼è¯·æ£æ¥ç½ç»"); |
| | | switch (conveyor.Type) |
| | | { |
| | | case 1: |
| | | content.Status = conveyorLine.SetValue(ConveyorLine_AGV.WriteAGVRequestPut, true, conveyor.Station); |
| | | if (content.Status) content.Status = conveyorLine.GetValue<ConveyorLine_AGV, bool>(ConveyorLine_AGV.ConveyorLinePermitPut, conveyor.Station); |
| | | break; |
| | | case 2: |
| | | content.Status = conveyorLine.SetValue(ConveyorLine_AGV.WriteAGVPutComplete, true, conveyor.Station); |
| | | break; |
| | | case 3: |
| | | content.Status = conveyorLine.SetValue(ConveyorLine_AGV.WriteAGVRequestTake, true, conveyor.Station); |
| | | if (content.Status) content.Status = conveyorLine.GetValue<ConveyorLine_AGV, bool>(ConveyorLine_AGV.ConveyorLinePermitTake, conveyor.Station); |
| | | break; |
| | | case 4: |
| | | content.Status = conveyorLine.SetValue(ConveyorLine_AGV.WriteAGVTakeComplete, true, conveyor.Station); |
| | | break; |
| | | default: throw new Exception($"ç±»åæè¯¯[Typeï¼{conveyor.Type}]"); |
| | | } |
| | | content = content.Status ? content.OK() : content.Error(); |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | content.Error(ex.Message); |
| | | } |
| | | return content; |
| | | } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | #region << ç æ¬ 注 é >> |
| | | /*---------------------------------------------------------------- |
| | | * å½å空é´ï¼WIDESEAWCS_Tasks.ConveyorLineJob |
| | | * å建è
ï¼è¡ç«¥åº |
| | | * å建æ¶é´ï¼2024/8/2 16:13:36 |
| | | * çæ¬ï¼V1.0.0 |
| | | * æè¿°ï¼ |
| | | * |
| | | * ---------------------------------------------------------------- |
| | | * ä¿®æ¹äººï¼ |
| | | * ä¿®æ¹æ¶é´ï¼ |
| | | * çæ¬ï¼V1.0.1 |
| | | * ä¿®æ¹è¯´æï¼ |
| | | * |
| | | *----------------------------------------------------------------*/ |
| | | #endregion << ç æ¬ 注 é >> |
| | | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | |
| | | namespace WIDESEAWCS_Tasks.ConveyorLineExtend |
| | | { |
| | | public enum ConveyorLine_AGV |
| | | { |
| | | /// <summary> |
| | | /// è¾é线å
许æ¾è´§ |
| | | /// </summary> |
| | | ConveyorLinePermitPut, |
| | | /// <summary> |
| | | /// è¾é线å
许åè´§ |
| | | /// </summary> |
| | | ConveyorLinePermitTake, |
| | | |
| | | /// <summary> |
| | | /// AGVè¯·æ±æ¾è´§ |
| | | /// </summary> |
| | | WriteAGVRequestPut, |
| | | /// <summary> |
| | | /// AGVæ¾è´§å®æ |
| | | /// </summary> |
| | | WriteAGVPutComplete, |
| | | /// <summary> |
| | | /// AGV请æ±åè´§ |
| | | /// </summary> |
| | | WriteAGVRequestTake, |
| | | /// <summary> |
| | | /// AGVåè´§å®æ |
| | | /// </summary> |
| | | WriteAGVTakeComplete |
| | | } |
| | | } |
| | |
| | | using System.Reflection; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_Common.ConveyorLineEnum; |
| | | using WIDESEAWCS_Core; |
| | | using WIDESEAWCS_Core.Helper; |
| | | using WIDESEAWCS_ITaskInfoService; |
| | | using WIDESEAWCS_Model.Models; |
| | | using WIDESEAWCS_QuartzJob; |
| | | using WIDESEAWCS_QuartzJob.ConveyorLine.Enum; |
| | | using WIDESEAWCS_QuartzJob.DTO; |
| | | using WIDESEAWCS_QuartzJob.Service; |
| | | using WIDESEAWCS_Tasks.ConveyorLineJob; |
| | |
| | | |
| | | public Task Execute(IJobExecutionContext context) |
| | | { |
| | | Console.Out.WriteLine(DateTime.Now); |
| | | try |
| | | { |
| | | CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams"); |
| | |
| | | List<Task> tasks = new List<Task>(); |
| | | foreach (string childDeviceCode in childDeviceCodes) |
| | | { |
| | | //Task task = Task.Run(() => |
| | | //{ |
| | | ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode); |
| | | if (command != null) |
| | | ConveyorLineTaskCommandR command = conveyorLine.ReadCustomer<ConveyorLineTaskCommandR>(childDeviceCode); |
| | | if (command != null && command.Status == (ushort)ConveyorStatus.Stored)//æ·»å è¾éçº¿ç¶æConveyorLineStatus enum |
| | | { |
| | | switch (childDeviceCode) |
| | | { |
| | | DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString() && x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal)); |
| | | if (deviceProtocolDetail != null) |
| | | { |
| | | MethodInfo? method = GetType().GetMethod(deviceProtocolDetail.ProtocolDetailType); |
| | | if (method != null) |
| | | { |
| | | method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode }); |
| | | } |
| | | else |
| | | { |
| | | //todo æªæ¾å°æ¹æ³æ¶ |
| | | } |
| | | } |
| | | case "102": |
| | | RequestInbound(conveyorLine, command, childDeviceCode); |
| | | break; |
| | | case "104": |
| | | ConveyorLineInFinish(conveyorLine, command, childDeviceCode); |
| | | break; |
| | | case "105": |
| | | RequestOutbound(conveyorLine, command, childDeviceCode); |
| | | break; |
| | | case "108": |
| | | ConveyorLineOutFinish(conveyorLine, command, childDeviceCode); |
| | | break; |
| | | default: |
| | | RequestInNextAddress(conveyorLine, command, childDeviceCode); |
| | | RequestOutNextAddress(conveyorLine, command, childDeviceCode); |
| | | break; |
| | | } |
| | | //}); |
| | | //tasks.Add(task); |
| | | } |
| | | } |
| | | |
| | | Task.WaitAll(tasks.ToArray()); |
| | | } |
| | | |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | |
| | | } |
| | | finally |
| | | { |
| | | Console.Out.WriteLine(DateTime.Now); |
| | | //Console.Out.WriteLine(DateTime.Now); |
| | | } |
| | | return Task.CompletedTask; |
| | | } |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command,string childDeviceCode) |
| | | public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | if (_taskService.RequestWMSTask(command.Barcode, childDeviceCode).Status) |
| | | { |
| | | Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); |
| | | taskCommand.InteractiveSignal = command.InteractiveSignal; |
| | | ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task); |
| | | |
| | | conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | |
| | | _taskService.UpdateTaskStatusToNext(task); |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) |
| | | public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress); |
| | | if (newTask != null) |
| | | { |
| | | ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask); |
| | | taskCommand.InteractiveSignal = command.InteractiveSignal; |
| | | conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | } |
| | | //if (newTask != null) |
| | | //{ |
| | | // ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(newTask); |
| | | |
| | | // conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | //} |
| | | } |
| | | } |
| | | |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) |
| | | public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); |
| | | //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); |
| | | WebResponseContent content = _taskService.UpdateTaskStatusToNext(task); |
| | | Console.Out.WriteLine(content.Serialize()); |
| | | //Console.Out.WriteLine(content.Serialize()); |
| | | } |
| | | } |
| | | |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) |
| | | public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task); |
| | | taskCommand.InteractiveSignal = command.InteractiveSignal; |
| | | ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task); |
| | | |
| | | conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | |
| | | _taskService.UpdateTaskStatusToNext(task); |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) |
| | | public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress); |
| | | if (newTask != null) |
| | | { |
| | | ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask); |
| | | taskCommand.InteractiveSignal = command.InteractiveSignal; |
| | | conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | } |
| | | //if (newTask != null) |
| | | //{ |
| | | // ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(newTask); |
| | | |
| | | // conveyorLine.SendCommand(taskCommand, childDeviceCode); |
| | | //} |
| | | } |
| | | } |
| | | |
| | |
| | | /// <param name="conveyorLine">è¾é线å®ä¾å¯¹è±¡</param> |
| | | /// <param name="command">读åç请æ±ä¿¡æ¯</param> |
| | | /// <param name="childDeviceCode">å设å¤ç¼å·</param> |
| | | public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode) |
| | | public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode) |
| | | { |
| | | Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode); |
| | | if (task != null) |
| | | { |
| | | conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); |
| | | //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode); |
| | | WebResponseContent content = _taskService.UpdateTaskStatusToNext(task); |
| | | Console.Out.WriteLine(content.Serialize()); |
| | | //Console.Out.WriteLine(content.Serialize()); |
| | | } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | #region << ç æ¬ 注 é >> |
| | | /*---------------------------------------------------------------- |
| | | * å½å空é´ï¼WIDESEAWCS_Tasks.ConveyorLineJob |
| | | * å建è
ï¼è¡ç«¥åº |
| | | * å建æ¶é´ï¼2024/8/2 16:13:36 |
| | | * çæ¬ï¼V1.0.0 |
| | | * æè¿°ï¼ |
| | | * |
| | | * ---------------------------------------------------------------- |
| | | * ä¿®æ¹äººï¼ |
| | | * ä¿®æ¹æ¶é´ï¼ |
| | | * çæ¬ï¼V1.0.1 |
| | | * ä¿®æ¹è¯´æï¼ |
| | | * |
| | | *----------------------------------------------------------------*/ |
| | | #endregion << ç æ¬ 注 é >> |
| | | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_QuartzJob.DeviceBase; |
| | | |
| | | namespace WIDESEAWCS_Tasks.ConveyorLineJob |
| | | { |
| | | public class ConveyorLineTaskCommandR : DeviceCommand |
| | | { |
| | | /// <summary> |
| | | /// è¾éçº¿ç¶æ |
| | | /// </summary> |
| | | public ushort Status { get; set; } |
| | | /// <summary> |
| | | /// ä»»å¡å· |
| | | /// </summary> |
| | | public int TaskNum { get; set; } |
| | | /// <summary> |
| | | /// æçå· |
| | | /// </summary> |
| | | [DataLength(16)] |
| | | public string Barcode { get; set; } |
| | | /// <summary> |
| | | /// èµ·å§å°å |
| | | /// </summary> |
| | | public ushort SourceAddress { get; set; } |
| | | /// <summary> |
| | | /// ç®çå°å |
| | | /// </summary> |
| | | public ushort TargetAddress { get; set; } |
| | | /// <summary> |
| | | /// éé |
| | | /// </summary> |
| | | public ushort Weight { get; set; } |
| | | /// <summary> |
| | | /// è´§ç©è§æ ¼ |
| | | /// </summary> |
| | | public int Spec { get; set; } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | #region << ç æ¬ 注 é >> |
| | | /*---------------------------------------------------------------- |
| | | * å½å空é´ï¼WIDESEAWCS_Tasks.ConveyorLineJob |
| | | * å建è
ï¼è¡ç«¥åº |
| | | * å建æ¶é´ï¼2024/8/2 16:13:36 |
| | | * çæ¬ï¼V1.0.0 |
| | | * æè¿°ï¼ |
| | | * |
| | | * ---------------------------------------------------------------- |
| | | * ä¿®æ¹äººï¼ |
| | | * ä¿®æ¹æ¶é´ï¼ |
| | | * çæ¬ï¼V1.0.1 |
| | | * ä¿®æ¹è¯´æï¼ |
| | | * |
| | | *----------------------------------------------------------------*/ |
| | | #endregion << ç æ¬ 注 é >> |
| | | |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_QuartzJob.DeviceBase; |
| | | |
| | | namespace WIDESEAWCS_Tasks.ConveyorLineJob |
| | | { |
| | | public class ConveyorLineTaskCommandW : DeviceCommand |
| | | { |
| | | /// <summary> |
| | | /// ä»»å¡å· |
| | | /// </summary> |
| | | public int TaskNum { get; set; } |
| | | |
| | | /// <summary> |
| | | /// 容卿¡ç |
| | | /// </summary> |
| | | [DataLength(16)] |
| | | public string PalletCode { get; set; } |
| | | /// <summary> |
| | | /// èµ·å§å°å |
| | | /// </summary> |
| | | public short CurrentAddress { get; set; } |
| | | /// <summary> |
| | | /// ç®çå°å |
| | | /// </summary> |
| | | public short NextAddress { get; set; } |
| | | } |
| | | } |
¶Ô±ÈÐÂÎļþ |
| | |
| | | using AutoMapper; |
| | | using Quartz; |
| | | using System; |
| | | using System.Collections.Generic; |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_ITaskInfoService; |
| | | using WIDESEAWCS_QuartzJob; |
| | | using WIDESEAWCS_QuartzJob.Service; |
| | | using WIDESEAWCS_QuartzJob.StackerCrane.Enum; |
| | | |
| | | namespace WIDESEAWCS_Tasks |
| | | { |
| | | [DisallowConcurrentExecution] |
| | | public class ShuttleCarJob : IJob |
| | | { |
| | | private readonly ITaskService _taskService; |
| | | private readonly ITaskExecuteDetailService _taskExecuteDetailService; |
| | | private readonly IRouterService _routerService; |
| | | private readonly IMapper _mapper; |
| | | |
| | | public ShuttleCarJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper) |
| | | { |
| | | _taskService = taskService; |
| | | _taskExecuteDetailService = taskExecuteDetailService; |
| | | _routerService = routerService; |
| | | _mapper = mapper; |
| | | } |
| | | |
| | | public Task Execute(IJobExecutionContext context) |
| | | { |
| | | try |
| | | { |
| | | ShuttleCar shuttleCar = (ShuttleCar)context.JobDetail.JobDataMap.Get("JobParams"); |
| | | if (shuttleCar != null) |
| | | { |
| | | |
| | | } |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | | |
| | | } |
| | | finally |
| | | { |
| | | |
| | | } |
| | | return Task.CompletedTask; |
| | | } |
| | | } |
| | | } |
| | |
| | | using System.Linq; |
| | | using System.Text; |
| | | using System.Threading.Tasks; |
| | | using WIDESEAWCS_Common.StackerCraneEnum; |
| | | using WIDESEAWCS_Core.Enums; |
| | | using WIDESEAWCS_ITaskInfoRepository; |
| | | using WIDESEAWCS_ITaskInfoService; |
| | |
| | | { |
| | | try |
| | | { |
| | | CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams"); |
| | | if (commonStackerCrane != null) |
| | | SpeStackerCrane commonStackerCrane1 = (SpeStackerCrane)context.JobDetail.JobDataMap.Get("JobParams"); |
| | | if (commonStackerCrane1.GetStackerCraneStatus<StackerCraneAutoStatus>() == StackerCraneAutoStatus.Automatic && commonStackerCrane1.GetStackerCraneStatus<Onlinestate>() == Onlinestate.online) |
| | | { |
| | | if (!commonStackerCrane.IsEventSubscribed) |
| | | { |
| | | commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//订é
ä»»å¡å®æäºä»¶ |
| | | } |
| | | |
| | | if (commonStackerCrane.StackerCraneAutoStatusValue == StackerCraneAutoStatus.Automatic && commonStackerCrane.StackerCraneStatusValue == StackerCraneStatus.Normal) |
| | | { |
| | | commonStackerCrane.CheckStackerCraneTaskCompleted();//鲿¢ä»»å¡å®æäºä»¶çæµè¶
æ¶ï¼åæå¨è§¦å䏿¬¡ |
| | | |
| | | if (commonStackerCrane.StackerCraneWorkStatusValue == StackerCraneWorkStatus.Standby) |
| | | { |
| | | Dt_Task? task = GetTask(commonStackerCrane); |
| | | if (task != null) |
| | | { |
| | | StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task); |
| | | if (stackerCraneTaskCommand != null) |
| | | { |
| | | bool sendFlag = commonStackerCrane.SendCommand(stackerCraneTaskCommand); |
| | | if (sendFlag) |
| | | { |
| | | commonStackerCrane.LastTaskType = task.TaskType; |
| | | _taskService.UpdateTaskStatusToNext(task.TaskNum); |
| | | } |
| | | } |
| | | } |
| | | } |
| | | } |
| | | } |
| | | |
| | | } |
| | | catch (Exception ex) |
| | | { |
| | |
| | | private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e) |
| | | { |
| | | CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane; |
| | | SpeStackerCrane? commonStackerCrane1 = sender as SpeStackerCrane; |
| | | commonStackerCrane1.GetStackerCraneStatus<StackerCraneDBName>(); |
| | | if (commonStackerCrane != null) |
| | | { |
| | | if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5) |
| | |
| | | </PropertyGroup> |
| | | |
| | | <ItemGroup> |
| | | <PackageReference Include="WIDESEAWCS_QuartzJob" Version="1.0.0" /> |
| | | <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.0.0" /> |
| | | </ItemGroup> |
| | | |
| | | <ItemGroup> |
| | |
| | | [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_Tasks")] |
| | | [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] |
| | | [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1618dc05ba25286d0643f1a946b60cee6987f014")] |
| | | [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] |
| | | [assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Tasks")] |
| | | [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Tasks")] |
| | | [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] |
| | |
| | | a24133d4050e1980e4dbdba955f7a8cec227a0776fc660c8143262ff8a56f965 |
| | | 39a3bb642acc0086c0dbff8faa7a99e829b46a518cfa480d4f7f86c7e3fb6948 |
| | |
| | | 718ef9c5613fd2b2bacc0a7787fc45d151d547e79d9be7aaea9bfa1b88ca5ca8 |
| | | 70060dd203a48ae2d55b81c221fdcc3bc2015e8ef9d3c3e116ee3ac28db6c045 |
| | |
| | | "dependencies": { |
| | | "WIDESEAWCS_QuartzJob": { |
| | | "target": "Package", |
| | | "version": "[1.0.0, )" |
| | | "version": "[2.0.0, )" |
| | | } |
| | | }, |
| | | "imports": [ |
| | |
| | | "lib/net6.0/WIDESEAWCS_Core.dll": {} |
| | | } |
| | | }, |
| | | "WIDESEAWCS_QuartzJob/1.0.0": { |
| | | "WIDESEAWCS_QuartzJob/2.0.0": { |
| | | "type": "package", |
| | | "dependencies": { |
| | | "Quartz": "3.11.0", |
| | | "WIDESEAWCS_Communicator": "1.0.0", |
| | | "WIDESEAWCS_Core": "1.0.0" |
| | | "WIDESEAWCS_Core": "1.0.4" |
| | | }, |
| | | "compile": { |
| | | "lib/net6.0/WIDESEAWCS_QuartzJob.dll": {} |
| | |
| | | "wideseawcs_core.nuspec" |
| | | ] |
| | | }, |
| | | "WIDESEAWCS_QuartzJob/1.0.0": { |
| | | "sha512": "+9tqVLclJW0W4nIepwmC44azflmdKoekfH/TE2hx5NCLizl54cMZf0YLh0r71N2yJxkPBkRaSbK+gmesKZs3YQ==", |
| | | "WIDESEAWCS_QuartzJob/2.0.0": { |
| | | "sha512": "JEdKJbZEVfbNvLPLILy95pUkTcky8T270XOPp41Ce5rTS04b1Ex9kvIqz+NbZ15osUQwAYeQKcY7aic/waWrRA==", |
| | | "type": "package", |
| | | "path": "wideseawcs_quartzjob/1.0.0", |
| | | "path": "wideseawcs_quartzjob/2.0.0", |
| | | "files": [ |
| | | ".nupkg.metadata", |
| | | "lib/net6.0/WIDESEAWCS_QuartzJob.dll", |
| | | "wideseawcs_quartzjob.1.0.0.nupkg.sha512", |
| | | "wideseawcs_quartzjob.2.0.0.nupkg.sha512", |
| | | "wideseawcs_quartzjob.nuspec" |
| | | ] |
| | | }, |
| | |
| | | }, |
| | | "projectFileDependencyGroups": { |
| | | "net6.0": [ |
| | | "WIDESEAWCS_QuartzJob >= 1.0.0", |
| | | "WIDESEAWCS_QuartzJob >= 2.0.0", |
| | | "WIDESEAWCS_TaskInfoService >= 1.0.0" |
| | | ] |
| | | }, |
| | |
| | | "dependencies": { |
| | | "WIDESEAWCS_QuartzJob": { |
| | | "target": "Package", |
| | | "version": "[1.0.0, )" |
| | | "version": "[2.0.0, )" |
| | | } |
| | | }, |
| | | "imports": [ |
| | |
| | | { |
| | | "version": 2, |
| | | "dgSpecHash": "2BbXBs1kXI8EYeH390nrTYT5uzXpGrKhsdbOpspkRyZj4KSmRFpLc7rTyHHTeVmbi29UY7u5Z6qT6552kSmqsQ==", |
| | | "dgSpecHash": "vVriv1xL5xL3rIovVyE2CWgllGVKd6sbFlb4i7M53HhyPRL7QsgaZjBmVuCqCpJjrp4y510oHhY/YXPpZ5F6yA==", |
| | | "success": true, |
| | | "projectFilePath": "E:\\项ç®é\\ChuanSuoCheKu\\项ç®ä»£ç \\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj", |
| | | "expectedPackageFiles": [ |
| | |
| | | "C:\\Users\\dell\\.nuget\\packages\\system.xml.xpath.xdocument\\4.0.1\\system.xml.xpath.xdocument.4.0.1.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_communicator\\1.0.0\\wideseawcs_communicator.1.0.0.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_core\\1.0.4\\wideseawcs_core.1.0.4.nupkg.sha512", |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_quartzjob\\1.0.0\\wideseawcs_quartzjob.1.0.0.nupkg.sha512" |
| | | "C:\\Users\\dell\\.nuget\\packages\\wideseawcs_quartzjob\\2.0.0\\wideseawcs_quartzjob.2.0.0.nupkg.sha512" |
| | | ], |
| | | "logs": [ |
| | | { |