From f8e049e2a30f711a56b735361a230216d8808f0b Mon Sep 17 00:00:00 2001 From: pulg <plg@Haninfo> Date: 星期一, 30 六月 2025 17:12:30 +0800 Subject: [PATCH] 1 --- HH.WCS.QingXiNongfu/Program.cs | 55 +++++++++++++++++++++++++++++-------------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs index dc5b122..7d54442 100644 --- a/HH.WCS.QingXiNongfu/Program.cs +++ b/HH.WCS.QingXiNongfu/Program.cs @@ -1,5 +1,4 @@ 锘縰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; @@ -7,12 +6,10 @@ using Microsoft.Owin.Hosting; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -using SqlSugar; using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Linq; using System.Net; using System.Net.Sockets; using System.Net.WebSockets; @@ -78,6 +75,9 @@ //Console.WriteLine(set1.SetEquals(set2)); //Console.WriteLine(set1.SetEquals(set3)); #endregion + + var uuu16 = "TN" + (DateTime.Now.ToString("yy")) + ((6180010 + "").PadLeft(8, '0')); + Console.WriteLine(uuu16); } else { @@ -175,10 +175,10 @@ { //Console.WriteLine(item); } - //var v = new string[] { "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" }; + //var v = new string[] { "HS-12BHQ", "HS-C_XC", "1HS-C_XC", "QX-04_J", "QX-04_D", "QX04_J", "QX4_X", "QX-12_A", "QX-08_X", "QX-08_XC", "QX-08_DC" }; //foreach (var item in v) //{ - // var m = System.Text.RegularExpressions.Regex.IsMatch(item, @"QX-\d+_X$"); + // var m = System.Text.RegularExpressions.Regex.IsMatch(item,@"^HS-[A-Z]+_");// @"QX-\d+_X$"); // if (m) // { // Console.WriteLine(m); @@ -734,32 +734,35 @@ { 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), - //閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙i攣銆� - 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), + ////閿佹帓 - 娓呴櫎 鎺掔┖浜嗘墠瑙i攣銆� + //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.YWL_ZX_Turn), + //GetTask(Monitor.BottTask),// 绾哥鑷姩涓浆 + //GetTask(Monitor.AutoRunABD), + //GetTask(Monitor.AutoRun13TSJ), + //GetTask(Monitor.ZdzyABArea), + // GetTask(Monitor.Qchc), + //GetTask(Monitor.AutoTK_PE),//鎻愭墸 - PE鑶滃嚭鍏ュ簱 //GetTask(Monitor.chargeCCD),//YWL 鍏ュ簱宸ュ崟銆傛湭浣跨敤銆� -- Gitblit v1.9.1