From 8953f14db850deaf66782197a5d2bff35fe41e1a Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期三, 02 七月 2025 18:02:09 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/Program.cs | 51 +++++++++++++++++++++++++--------------------------
1 files changed, 25 insertions(+), 26 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs
index 7d54442..7a98936 100644
--- a/HH.WCS.QingXiNongfu/Program.cs
+++ b/HH.WCS.QingXiNongfu/Program.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.QingXigongchang.api;
+using HH.WCS.QingXigongchang.core;
using HH.WCS.QingXigongchang.device;
using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
@@ -76,8 +77,6 @@
//Console.WriteLine(set1.SetEquals(set3));
#endregion
- var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010 + "").PadLeft(8, '0'));
- Console.WriteLine(uuu16);
}
else
{
@@ -734,34 +733,34 @@
{
GetTask(Monitor.A),//璁℃暟鍣� 娓呴櫎 鎺у埗鍙� //娣诲姞浠诲姟鎺ㄩ�绾跨▼
- //GetTask(TaskCore.Dispatch),
- //GetTask(TaskCore.Kuronggg),
+ GetTask(TaskCore.Dispatch),
+ GetTask(TaskCore.Kuronggg),
- //GetTask(TaskCore.ChargeHostAgv),
- ////鎵嬪姩杞繍
- //GetTask(Monitor.BottleCapAuto2),
- ///// 鑷姩杞繍
- //GetTask(Monitor.BottleCapAuto3, 1),
- ////閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙ｉ攣銆�
- //GetTask(Monitor.BottleCapAuto4),
- ////鑷姩棰嗘枡 - 涓婅緭閫佺嚎
- //GetTask(Monitor.BottleCapAuto5),
- ////绌烘涓浆锛岃浆鎷嗘
- //GetTask(Monitor.BottleCapAuto6),
- ////鍑哄簱鍗曟壒鍒�- //GetTask(Monitor.BottleCapAuto7),
- ////鑷姩涓浆
- //GetTask(Monitor.BB7),
+ GetTask(TaskCore.ChargeHostAgv),
+ //鎵嬪姩杞繍
+ GetTask(Monitor.BottleCapAuto2),
+ /// 鑷姩杞繍
+ GetTask(Monitor.BottleCapAuto3, 1),
+ //閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙ｉ攣銆�
+ GetTask(Monitor.BottleCapAuto4),
+ //鑷姩棰嗘枡 - 涓婅緭閫佺嚎
+ GetTask(Monitor.BottleCapAuto5),
+ //绌烘涓浆锛岃浆鎷嗘
+ GetTask(Monitor.BottleCapAuto6),
+ //鍑哄簱鍗曟壒鍒�+ GetTask(Monitor.BottleCapAuto7),
+ //鑷姩涓浆
+ GetTask(Monitor.BB7),
//鍘熸潗鏂�鑷姩涓浆 - 灞曠ず娴佺▼銆�鍓嶆湡娴嬭瘯鐢ㄧ殑
//GetTask(Monitor.AutoRun),
GetTask(Monitor.YwlTKPEBQ_Auto),//鏍囩鏃犺弻姘寸嚎鍑哄叆搴撱�
- //鍘熸潗鏂欑殑 鏂颁腑杞祦绋嬨�
- //GetTask(Monitor.YWL_ZX_Turn),
- //GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
- //GetTask(Monitor.AutoRunABD),
- //GetTask(Monitor.AutoRun13TSJ),
- //GetTask(Monitor.ZdzyABArea),
- // GetTask(Monitor.Qchc),
+ //鍘熸潗鏂欑殑 鏂颁腑杞祦绋嬨�
+ GetTask(Monitor.YWL_ZX_Turn),//--绉诲簱
+ GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆
+ GetTask(Monitor.AutoRunABD),
+ GetTask(Monitor.AutoRun13TSJ),
+ GetTask(Monitor.ZdzyABArea),
+ GetTask(Monitor.Qchc),
//GetTask(Monitor.AutoTK_PE),//鎻愭墸 - PE鑶滃嚭鍏ュ簱
--
Gitblit v1.9.1