WCS

dengjunjie

2024-10-17 a38b50675f2cf8e813bd337ca2f9d9456cc421d3

WCS

 .gitignore

@@ -8,3 +8,6 @@
/项目代码/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

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
340163bc8b1ee6dc816c387424b7ca208f9336c9bb736c86fb1a5d38109b6f89
78fb043b4fbd17a50e787c19f6106156f588d61de3527232995db3fb9888992f

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache

@@ -1 +1 @@
a3a305ebf35481fff37f4748bb902524946684e4d5f029a7bdadec49b4eaee54
539c4c2c6af92f304207d5c4dbd33f91775b6211c5be20cbed68f77593fda0d6

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ConveyorLineEnum/ConveyorStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,43 @@
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,
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/ConveyorLineEnum/Specification.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
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,
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/StackerCraneEnum/OnlineStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,26 @@
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,
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/StackerCraneEnum/RunStatus.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
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,
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/WIDESEAWCS_Common.csproj

@@ -6,4 +6,8 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

  <ItemGroup>
    <Folder Include="ShuttleCarEnum\" />
  </ItemGroup>

</Project>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/WIDESEAWCS_Common.AssemblyInfoInputs.cache

@@ -1 +1 @@
bd19097bf3382ce4aa3a43e8a3317ca615a6f64eaa50ff42d77751b3e5ffffb5
408de5532503b2cfd2e4b5f097f000709cfa533fc822a42e41c2671fdabd9e6d

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/AGVInfo/ConveyorLineDTO.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
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; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache

@@ -1 +1 @@
35bd8241a5faf815274afc1b1053949f557a9b2b0d5c816b8d41043235e6d138
2f740b687f5039e289ebbb18d9edd3c5457255e62467b0b79304020786c1187e

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
362509bbd750469b7b5a173a3a44deadd456b3a70335c5d2f7978664e1b2cbe5
b011ea5d486befaee3a5f96a33c872937bfa8aa2dec3db5a97f6829331c83cd6

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache

@@ -1 +1 @@
aebb2dfe028de9e71ce8d9dff2e3447214311ef12abc9c2840811c793d67c736
0b796ce708123ebd0f4879f4affb4434afda0eeced46d82b60270b5cfa163d17

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
eb60db6a411779fbea5de449cd9dce6dee0645e7f6a36eb4b466626a41312f60
3433b78531174a08fd65fd5fada3cdfc07a4e87934d7c47350fe713dc0adb707

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache

@@ -1 +1 @@
e1068d91621c6461aba107bc3408b4ad323d680babd1f9db5d3a31c769fce18f
63f33664d5112ac54dbfa73d16cb5390d21f6db8f85ff9ab4babba3823332b11

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
dec1776d4f57cfb43f75e9ba766f42996fac6ae674a015879e935d53e7acf709
7e2aeed86ca3b7de4b3616b98aba0e5adb602dc3b37fe37243282a6e2d6a4545

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache

@@ -1 +1 @@
a77e8ce640571c0fec1bd6e1ded1b148ec2306cd0ecd284a2076f605d1b46be3
23e361bf633ed481105799b3c06cdd035fbf741f32b0e4e6ad8e610bb5c73c76

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache

@@ -1 +1 @@
d319813b5f08e632b6b13fc9777caba6d31e264a7ee05eb66d7af8083a5d288a
131f5d8bada5bbb235292caf19e656b91861f60dc98e270d28a7952da735f20a

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Equipment/AGVController.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,31 @@
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);
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs

@@ -20,8 +20,9 @@
        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));
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.exe

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.assets.cache

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/apphost.exe

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/WIDESEAWCS_Server.csproj.nuget.dgspec.json

@@ -1125,7 +1125,7 @@
          "dependencies": {
            "WIDESEAWCS_QuartzJob": {
              "target": "Package",
              "version": "[1.0.0, )"
              "version": "[2.0.0, )"
            }
          },
          "imports": [

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/project.assets.json

@@ -3311,12 +3311,12 @@
          "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": {}
@@ -3526,7 +3526,7 @@
        "type": "project",
        "framework": ".NETCoreApp,Version=v6.0",
        "dependencies": {
          "WIDESEAWCS_QuartzJob": "1.0.0",
          "WIDESEAWCS_QuartzJob": "2.0.0",
          "WIDESEAWCS_TaskInfoService": "1.0.0"
        },
        "compile": {
@@ -10057,14 +10057,14 @@
        "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"
      ]
    },

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/project.nuget.cache

@@ -1,6 +1,6 @@
{
  "version": 2,
  "dgSpecHash": "aivI3aXDvqkq588hdV0uW0GZgZ3WzqJHA0KjJauu4NqYg2ZO13BjlbcZ6OoL68JIup4c0x34NlfUpakFsvzuvw==",
  "dgSpecHash": "gwgPk1EVnRx5rvyhu3bJpwV4OloV4SIfloA7pOBy+xaSxWEe0S0wvOCLYwocxzdFKiD6jLy8k8RPBx4hN0FkAw==",
  "success": true,
  "projectFilePath": "E:\\项目集\\ChuanSuoCheKu\\项目代码\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj",
  "expectedPackageFiles": [
@@ -187,7 +187,7 @@
    "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": [
    {

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
b52a3492ee7a9478b388ecd9e5b1a2ab1a72e68a6bc64cb3c06bc761a3ca6af0
235dd2f83363c071213e2f24bf079d55c78c313e89d043ec8c9bb23b536da2fc

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache

@@ -1 +1 @@
028fdce53abc0c03896b26f589ffb67aba5cbb70d091262cb3559eb4695544b5
3c4d63b9480bddeede2ae3be8288863ccedd3ba11d6f64fc77e15b947650e2b5

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache

@@ -1 +1 @@
0f773beb5c9f64ddff56189d27ee6a958bd87616ce0775e3447b3d0386ceab6e
f9d8d954ffb52d34aaf48e9c21a03148e8dc09d0bdd9334e194f4a335df9c3bb

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -362,7 +362,7 @@
                    {
                        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;
                    }
                }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache

@@ -1 +1 @@
1152cc279211a94ed531a28173b47ef234f6a77a9b5a8a0c11ce53616c58a77c
3072915953e9359b1d09f08b739c2e05d935c3b016be343b7221c1602d49ff63

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineExtend/AGVsignal.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
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;
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineExtend/ConveyorLineDBName.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
#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
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs

@@ -24,11 +24,13 @@
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;
@@ -53,7 +55,6 @@

        public Task Execute(IJobExecutionContext context)
        {
            Console.Out.WriteLine(DateTime.Now);
            try
            {
                CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
@@ -63,32 +64,32 @@
                    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
                            {
                                DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString() && x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal));
                                if (deviceProtocolDetail != null)
                            switch (childDeviceCode)
                                {
                                    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)
            {
@@ -96,7 +97,7 @@
            }
            finally
            {
                Console.Out.WriteLine(DateTime.Now);
                //Console.Out.WriteLine(DateTime.Now);
            }
            return Task.CompletedTask;
        }
@@ -107,15 +108,15 @@
        /// <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);
@@ -129,18 +130,18 @@
        /// <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);
                //}
            }
        }

@@ -150,14 +151,14 @@
        /// <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());
            }
        }

@@ -167,13 +168,13 @@
        /// <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);
@@ -186,18 +187,18 @@
        /// <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);
                //}
            }
        }

@@ -207,14 +208,14 @@
        /// <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());
            }
        }
    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs

ÎļþÒÑɾ³ý

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandR.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,59 @@
#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; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandW.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,48 @@
#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; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ShuttleCarJob/ShuttleCarJob.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,52 @@
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;
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.StackerCraneEnum;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -39,37 +40,12 @@
        {
            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)
            {
@@ -86,6 +62,8 @@
        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)

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/WIDESEAWCS_Tasks.csproj

@@ -7,7 +7,7 @@
    </PropertyGroup>

    <ItemGroup>
      <PackageReference Include="WIDESEAWCS_QuartzJob" Version="1.0.0" />
      <PackageReference Include="WIDESEAWCS_QuartzJob" Version="2.0.0" />
    </ItemGroup>

    <ItemGroup>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs

@@ -14,7 +14,7 @@
[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")]

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache

@@ -1 +1 @@
a24133d4050e1980e4dbdba955f7a8cec227a0776fc660c8143262ff8a56f965
39a3bb642acc0086c0dbff8faa7a99e829b46a518cfa480d4f7f86c7e3fb6948

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.assets.cache

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
718ef9c5613fd2b2bacc0a7787fc45d151d547e79d9be7aaea9bfa1b88ca5ca8
70060dd203a48ae2d55b81c221fdcc3bc2015e8ef9d3c3e116ee3ac28db6c045

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref/WIDESEAWCS_Tasks.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint/WIDESEAWCS_Tasks.dll

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/WIDESEAWCS_Tasks.csproj.nuget.dgspec.json

@@ -785,7 +785,7 @@
          "dependencies": {
            "WIDESEAWCS_QuartzJob": {
              "target": "Package",
              "version": "[1.0.0, )"
              "version": "[2.0.0, )"
            }
          },
          "imports": [

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/project.assets.json

@@ -3309,12 +3309,12 @@
          "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": {}
@@ -9989,14 +9989,14 @@
        "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"
      ]
    },
@@ -10058,7 +10058,7 @@
  },
  "projectFileDependencyGroups": {
    "net6.0": [
      "WIDESEAWCS_QuartzJob >= 1.0.0",
      "WIDESEAWCS_QuartzJob >= 2.0.0",
      "WIDESEAWCS_TaskInfoService >= 1.0.0"
    ]
  },
@@ -10114,7 +10114,7 @@
        "dependencies": {
          "WIDESEAWCS_QuartzJob": {
            "target": "Package",
            "version": "[1.0.0, )"
            "version": "[2.0.0, )"
          }
        },
        "imports": [

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/project.nuget.cache

@@ -1,6 +1,6 @@
{
  "version": 2,
  "dgSpecHash": "2BbXBs1kXI8EYeH390nrTYT5uzXpGrKhsdbOpspkRyZj4KSmRFpLc7rTyHHTeVmbi29UY7u5Z6qT6552kSmqsQ==",
  "dgSpecHash": "vVriv1xL5xL3rIovVyE2CWgllGVKd6sbFlb4i7M53HhyPRL7QsgaZjBmVuCqCpJjrp4y510oHhY/YXPpZ5F6yA==",
  "success": true,
  "projectFilePath": "E:\\项目集\\ChuanSuoCheKu\\项目代码\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj",
  "expectedPackageFiles": [
@@ -187,7 +187,7 @@
    "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": [
    {