From ea04aef49691444ed8ac1e7e7b94feabcbb5326f Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周二, 23 9月 2025 08:10:32 +0800
Subject: [PATCH] 增加
---
DEmon/iWareCc/Service1.cs | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/DEmon/iWareCc/Service1.cs b/DEmon/iWareCc/Service1.cs
index 819f893..c8a4b4c 100644
--- a/DEmon/iWareCc/Service1.cs
+++ b/DEmon/iWareCc/Service1.cs
@@ -413,6 +413,8 @@
//ReSendThread.Name = "鍚慦IP閲嶆柊鎺ㄩ�佹姤鏂�";
//StartThread(ReSendThread);
+ //寮�鍚帹閫佺粰MES鐨勫嚭鍏ュ簱瀹屾垚绾跨▼ 銆怑ditby shaocx,2025-09-17銆�
+ new Thread(mesDataTranfficForRealMes.Handler).Start();
}
@@ -445,7 +447,7 @@
//缁撴潫鐢熸垚鍏ュ簱涓讳换鍔＄殑绾跨▼
CloseThread(CreatMainTaskInThread);
- //缁撴潫鐢熸垚鍑哄簱涓讳换鍔＄殑绾跨▼
+ //缁撴潫鐢熸垚鍑哄簱涓讳换鍔＄殑绾跨▼
CloseThread(CreatMainTaskOutThread);
//鍏抽棴鍒嗚В浠诲姟鐨勭嚎绋�
@@ -516,8 +518,8 @@
var s = (StackerEntity)stacker;
//LogTextHelper.WriteLine(Resources.LogDir, "鑾峰彇鍫嗗灈鏈簕0}鐘舵�佺嚎绋嬪凡寮�鍚�", s.Equipment.EquipName);
- var items = new string[]
- {
+ var items = new string[]
+ {
s.OpcReadItems.SrmNo,// 1Srm缂栧彿
s.OpcReadItems.Mode,// 2浠诲姟鍙�
s.OpcReadItems.Alarm,// 3鍛婅
@@ -857,7 +859,7 @@
{
gateService.HandleMsgSCReceive(gateService.ReadFromDatagramPoolSCReceive());
}
- else
+ else
{
gateService.HandleMsgReceive(gateService.ReadFromDatagramPoolReceive());
gateService.HandleMsgAlarmReceive(gateService.ReadFromDatagramPoolAlarmReceive());
@@ -928,20 +930,20 @@
/// </summary>
private void CreateMainInTask()
{
- var c = (ConveyorEntity)CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor1");
- var mainTaskContainer = new MainTaskContainer();
- var 鐢熸垚鍏ュ簱涓讳换鍔� = new 鏍规嵁鎵爜鐢熸垚鍏ュ簱涓讳换鍔�(c, mainTaskContainer);
- var 淇濆瓨鐢熸垚鐨勪换鍔� = new 淇濆瓨鐢熸垚鐨勫叆搴撲换鍔�(c, mainTaskContainer);
- 鐢熸垚鍏ュ簱涓讳换鍔�.NextHandler = 淇濆瓨鐢熸垚鐨勪换鍔�;
+ var c = (ConveyorEntity)CacheEntity.Conveyors.Find(x => x.Equipment.EquipName == "conveyor1");
+ var mainTaskContainer = new MainTaskContainer();
+ var 鐢熸垚鍏ュ簱涓讳换鍔� = new 鏍规嵁鎵爜鐢熸垚鍏ュ簱涓讳换鍔�(c, mainTaskContainer);
+ var 淇濆瓨鐢熸垚鐨勪换鍔� = new 淇濆瓨鐢熸垚鐨勫叆搴撲换鍔�(c, mainTaskContainer);
+ 鐢熸垚鍏ュ簱涓讳换鍔�.NextHandler = 淇濆瓨鐢熸垚鐨勪换鍔�;
- while (true)
+ while (true)
+ {
+ if (CacheEntity.IsAutoRun)
{
- if (CacheEntity.IsAutoRun)
- {
- 鐢熸垚鍏ュ簱涓讳换鍔�.Handle();
- }
- Thread.Sleep(1000);
+ 鐢熸垚鍏ュ簱涓讳换鍔�.Handle();
}
+ Thread.Sleep(1000);
+ }
}
/// <summary>
/// 鐢熸垚鍑哄簱涓讳换鍔�
@@ -1287,7 +1289,7 @@
{
try
{
- // string stackerName = Enum.GetName(typeof(EEquipmentCnName), EEquipmentCnName.stacker1);
+ // string stackerName = Enum.GetName(typeof(EEquipmentCnName), EEquipmentCnName.stacker1);
var reports = dbModel.COUNTStackerReports.Where(x => x.isfinished == (int)EYesOrNo.鍚�).ToList();
var stacker = CacheEntity.Stackers.FirstOrDefault(x => x.Equipment.EquipName == "stacker1");
var unfinishedReport = reports.FirstOrDefault(x => x.name == stacker.Equipment.EquipName);
--
Gitblit v1.9.3