1
czw
3 天以前 0f3260be7627e68f2cea255e362dd54559b3b63c
1
2个文件已修改
52 ■■■■■ 已修改文件
2025年6月12日/AuxAllWCS/Build/Project/AuxAllWCS.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/AuxAllWCS.csproj
@@ -4,7 +4,7 @@
    <Platform Condition="'$(Configuration)' == ''">AnyCPU</Platform>
    <OutputType>Exe</OutputType>
    <RootNamespace>GZ.Projects.AuxAllWCS</RootNamespace>
    <AssemblyName>AuxAllWCS</AssemblyName>
    <AssemblyName>AuxAllWCSClient</AssemblyName>
    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <ProjectGuid>{D55A8F58-C2AA-442E-93D3-7537992A4993}</ProjectGuid>
    <NuGetPackageImportStamp>
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/AutoThread.cs
@@ -31,6 +31,8 @@
using System.Windows.Documents;
using System.Text.RegularExpressions;
using GZ.Device.PLC;
using System.Runtime.CompilerServices;
using ServiceStack.Text;
namespace GZ.Projects.AuxAllWCS
{
@@ -59,6 +61,12 @@
    }
    public partial class AutoThread
    {
        /// <summary>
        ///  1 åªå¼€çº¿ç¨‹  Device Client
        ///  2 åªå¼€è®¾å¤‡  Device Server
        ///  3 å…¨å¼€
        /// </summary>
        public static readonly int _type = 1;
        private static AutoThread _instance;
@@ -84,6 +92,12 @@
        public static object InvokeMethod(object instance, string methodName, params object[] args)
        {
            var cacheKey = $"{instance.GetType().FullName}_{methodName}";
            if (AutoThread._type % 2 == 0)
            {
                Console.WriteLine($"{AutoThread._type}> å½“前是 Device Server æ¨¡å¼ã€‚");
                return null;
            }
            try
            {
@@ -229,6 +243,7 @@
            tasks.Add(GetTask(taskssss1, tag, 3000));
            tasks.Add(GetTask(taskssss2, tag, 3000));
            tasks.Add(GetTask(taskssss3, tag, 3000));
            tasks.Add(GetTask(task20132027, tag, 3000));
            //tasks.Add(GetTask(sa1022, tag, 3000));
            //tasks.Add(GetTask(sa1025, tag, 3000));
            //tasks.Add(GetTask(sa1030, tag, 3000));
@@ -263,6 +278,27 @@
            //}
        }
        void task20132027(Tag tag)
        {
            if (tag.ssx输送线.s2027.wTaskNo > 0 && tag.ssx输送线.s2020.w托盘码 != tag.ssx输送线.s2027.R托盘码)
            {
                tag.ssx输送线.s2027.wEbit = 0;
                tag.ssx输送线.s2027.w托盘码 = "";
                tag.ssx输送线.s2027.wTaskNo = 0;
            }
            if (tag.ssx输送线.s2020.wTaskNo > 0 && tag.ssx输送线.s2020.w托盘码 != tag.ssx输送线.s2020.R托盘码)
            {
                tag.ssx输送线.s2020.wEbit = 0;
                tag.ssx输送线.s2020.w托盘码 = "";
                tag.ssx输送线.s2020.wTaskNo = 0;
            }
            if (tag.ssx输送线.s2013.wTaskNo > 0 && tag.ssx输送线.s2013.w托盘码 != tag.ssx输送线.s2013.R托盘码)
            {
                tag.ssx输送线.s2013.wEbit = 0;
                tag.ssx输送线.s2013.w托盘码 = "";
                tag.ssx输送线.s2013.wTaskNo = 0;
            }
        }
        void taskssss1(Tag tag)
        {
            sa1025(tag);
@@ -2471,6 +2507,14 @@
            var rdisTcode = RedisHelper.Get<string>($"Arrive{2008}BarcodeLast", out string msg);
            var ntr = tag.ssx输送线.s2008.R托盘码;
            LogHelper.Info($"2008 æ‰˜ç›˜å·{ntr}  redis Arrive{2008}BarcodeLast托盘号:{rdisTcode} åŒ¹é…æ ¡éªŒã€‚");
            if (rdisTcode != ntr && tag.ssx输送线.s2008.wTaskNo > 0)
            {
                LogHelper.Info($"2008 æ‰˜ç›˜å·{ntr}  åˆ‡æ¢æ‰˜ç›˜å·ï¼ˆä¹Ÿå¯èƒ½æ¸…空了),清除任务数据。wTaskNo,wEbit=0,R托盘码=空");
                tag.ssx输送线.s2008.wEbit = 0;
                tag.ssx输送线.s2008.R托盘码 = "";
                tag.ssx输送线.s2008.wTaskNo = 0;
                RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
            }
            if (!string.IsNullOrEmpty(ntr) && rdisTcode != ntr)
            {
                var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new
@@ -2481,11 +2525,12 @@
                var strr = JsonConvert.DeserializeObject<MES2234>(str);
                if (strr.success && strr.data != null)
                {
                    var end = (strr.data.lineNum == 1 ? 2027
                    var end = (ushort)(strr.data.lineNum == 1 ? 2027
                                : strr.data.lineNum == 2 ? 2020 : 2013);
                    tag.ssx输送线.s2008.wTaskNo = (uint)(20080000 + end);
                    tag.ssx输送线.s2008.wEbit = 2027;
                    tag.ssx输送线.s2008.wEbit = end;
                    tag.ssx输送线.s2008.R托盘码 = ntr;
                    LogHelper.Info($"2008 æ‰˜ç›˜å·{ntr}  å†™ä»»åŠ¡ï¼ŒwTaskNo={(uint)(20080000 + end)}  wEbit={end} R托盘码={ntr} Arrive{2008}BarcodeLast={ntr} ");
                    RedisHelper.Add<string>($"Arrive{2008}BarcodeLast", ntr, out msg);
                }
            }
@@ -2784,6 +2829,7 @@
                                                    continue;
                                                }
                                            }
                                            if (!string.IsNullOrEmpty(tag.ssx输送线.s2013.R托盘码))
                                            {
                                                var str = Settings.apiHelper.Post(Settings.MESbaseUrl + "mom-basic/dataTransmission/json/service/224", JsonConvert.SerializeObject(new