1
czw
1 天以前 1cd9ee1a2b74a47e48c637482555388e20bb4eab
1
4个文件已修改
34 ■■■■ 已修改文件
2025年6月12日/AuxAllWCS/Build/Project/代码/VS自定义类/AutoThread.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Devices.rar 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Devices/PlcConfig 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025年6月12日/AuxAllWCS/Devices/设备通信.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/VS×Ô¶¨ÒåÀà/AutoThread.cs
@@ -282,7 +282,7 @@
            if (VERX != null)
            {
                LogHelper.Info($"{VERX.deviceName} D1212>{tag.Js1.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
                LogHelper.Info($"{VERX.deviceName}时间戳 {RedisHelper.Get<string>("Js捷顺1#Timestamp", out string mg)} D1212>{tag.Js1.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js1.D1212, 2)} D1212_LAST>{tag.Js1.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js1.D1212, 3)} D1213_LAST>{tag.Js1.D1213_LAST}");
                if (tag.Js1.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js1.D1212, 2) == 1)
                {
                    var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -340,7 +340,7 @@
            if (VERX != null)
            {
                LogHelper.Info($"{VERX.deviceName} D1212>{tag.Js2.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
                LogHelper.Info($"{VERX.deviceName} æ—¶é—´æˆ³ {RedisHelper.Get<string>("Js捷顺2#Timestamp", out string mg)} D1212>{tag.Js2.D1212} å·¦æ»¡ä¿¡å·:{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1212_LAST>{tag.Js2.D1212_LAST} å³æ»¡ä¿¡å·>{TcpServer.GetBitdata(tag.Js2.D1212, 2)} D1213_LAST>{tag.Js2.D1213_LAST}");
                if (tag.Js2.D1212_LAST == 0 && TcpServer.GetBitdata(tag.Js2.D1212, 2) == 1)
                {
@@ -1974,6 +1974,7 @@
        public void ThreadFNK1Over(Tag tag)
        {
            Console.WriteLine($"ThreadFNK1Over    =====>");
            LogHelper.Info($" FN1 æ—¶é—´æˆ³ {RedisHelper.Get<string>("p发那科1下线#Timestamp", out string mg)}");
            LogHelper.Info($" FN1 D2217>{tag.FNK1.D2217} D2217LAST>{tag.FNK1.D2217_LAST} D2215>{tag.FNK1.D2215} D2216>{tag.FNK1.D2216} D2218>{tag.FNK1.D2218}");
            //LogHelper.Info($" FN1 .D2217=1,2217_LAST=0 å†™ 2215=0,D2217_LAST=1,WRelease1005=1 RArrive1005_LAST=0");
            if (tag.FNK1.D2217 == 1 && tag.FNK1.D2217_LAST == 0)
@@ -2037,6 +2038,7 @@
        public void ThreadFNK2Over(Tag tag)
        {
            Console.WriteLine($"ThreadFNK2Over    =====>");
            LogHelper.Info($" FN2 æ—¶é—´æˆ³ {RedisHelper.Get<string>("p发那科2下线#Timestamp", out string mg)}");
            LogHelper.Info($" FN2 D2217>{tag.FNK2.D2217} D2217LAST>{tag.FNK2.D2217_LAST} D2215>{tag.FNK2.D2215} D2216>{tag.FNK2.D2216} D2218>{tag.FNK2.D2218}");
            if (tag.FNK2.D2217 == 1 && tag.FNK2.D2217_LAST == 0)
            {
@@ -3165,7 +3167,7 @@
                LogHelper.Info("定子1号线 deviceType 5 æ²¡æœ‰é…ç½®ã€‚");
                return;
            }
            LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST}  D2226>{tag.DZ1.D2226}  D2226_LAST>{tag.DZ1.D2226_LAST}");
            LogHelper.Info($" {VERX.deviceName} æ—¶é—´æˆ³ {RedisHelper.Get<string>("D定子1号机械手#Timestamp", out string mg)} D2221>{tag.DZ1.D2221} D2221_LAST>{tag.DZ1.D2221_LAST}  D2226>{tag.DZ1.D2226}  D2226_LAST>{tag.DZ1.D2226_LAST}");
            if (tag.DZ1.D2221 == 1 && tag.DZ1.D2221_LAST == 0)
            {
                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
@@ -3226,7 +3228,7 @@
                LogHelper.Info("定子2号线 deviceType 5 æ²¡æœ‰é…ç½®ã€‚");
                return;
            }
            LogHelper.Info($" {VERX.deviceName} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST}  D2226>{tag.DZ2.D2226}  D2226_LAST>{tag.DZ2.D2226_LAST}");
            LogHelper.Info($" {VERX.deviceName} æ—¶é—´æˆ³ {RedisHelper.Get<string>("D定子2号机械手#Timestamp", out string mg)} D2221>{tag.DZ2.D2221} D2221_LAST>{tag.DZ2.D2221_LAST}  D2226>{tag.DZ2.D2226}  D2226_LAST>{tag.DZ2.D2226_LAST}");
            if (tag.DZ2.D2221 == 1 && tag.DZ2.D2221_LAST == 0)
            {
                var str = Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/200", JsonConvert.SerializeObject(new
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Devices.rar
Binary files differ
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Devices/PlcConfig
@@ -1507,7 +1507,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "D214",
          "Address": "D2214",
          "AddrType": "",
          "Length": 1,
          "Desc": "",
@@ -4958,7 +4958,7 @@
          "DataType": "System.UInt32",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2172",
          "Address": "DB100.2102",
          "AddrType": "",
          "Length": 2,
          "Desc": "执行任务号",
@@ -4975,7 +4975,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2176",
          "Address": "DB100.2106",
          "AddrType": "",
          "Length": 1,
          "Desc": "起始地址",
@@ -4992,7 +4992,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2178",
          "Address": "DB100.2108",
          "AddrType": "",
          "Length": 1,
          "Desc": "目标地址",
@@ -5009,7 +5009,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2180",
          "Address": "DB100.2110",
          "AddrType": "",
          "Length": 1,
          "Desc": "工作模式 0-无效,1-手动,2-联机,3-脱机   ",
@@ -5026,7 +5026,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2182",
          "Address": "DB100.2112",
          "AddrType": "",
          "Length": 1,
          "Desc": "状态标志",
@@ -5043,7 +5043,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2184",
          "Address": "DB100.2114",
          "AddrType": "",
          "Length": 1,
          "Desc": "0-无效,1-任务申请,2-任务接收完成,3-申请RGV任务 4-申请agv任务",
@@ -5060,7 +5060,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2210",
          "Address": "DB100.2140",
          "AddrType": "",
          "Length": 1,
          "Desc": "0-无效,5-空闲状态",
@@ -5077,7 +5077,7 @@
          "DataType": "System.String",
          "DataValue": "",
          "SetValue": "",
          "Address": "DB100.2212",
          "Address": "DB100.2142",
          "AddrType": "",
          "Length": 10,
          "Desc": "托盘码",
@@ -6335,7 +6335,7 @@
          "DataType": "System.UInt16",
          "DataValue": "",
          "SetValue": "",
          "Address": "D214",
          "Address": "D2214",
          "AddrType": "",
          "Length": 1,
          "Desc": "",
@@ -9523,5 +9523,5 @@
    }
  ],
  "CreationTime": "2025-02-26 15:31:23",
  "LastWriteTime": "2025-07-15 10:35:06"
  "LastWriteTime": "2025-07-17 11:13:08"
}
2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Devices/É豸ͨÐÅ.json
@@ -2,5 +2,5 @@
  "ProjectSn": "1",
  "DeviceList": [],
  "CreationTime": "2025-02-26 15:31:23",
  "LastWriteTime": "2025-07-15 10:35:06"
  "LastWriteTime": "2025-07-17 11:13:08"
}