From cce7e880813a457cfcdca3f3fc8cad3c99ebfb69 Mon Sep 17 00:00:00 2001 From: czw <selecti@yeah.net> Date: 星期三, 02 七月 2025 17:07:31 +0800 Subject: [PATCH] 1 --- HH.WCS.QingXiNongfu/Program.cs | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) diff --git a/HH.WCS.QingXiNongfu/Program.cs b/HH.WCS.QingXiNongfu/Program.cs index f9a831d..82bd5f6 100644 --- a/HH.WCS.QingXiNongfu/Program.cs +++ b/HH.WCS.QingXiNongfu/Program.cs @@ -7,12 +7,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; @@ -21,6 +19,7 @@ using System.Threading; using System.Threading.Tasks; using Topshelf; +using static System.Net.Mime.MediaTypeNames; using Monitor = HH.WCS.QingXigongchang.core.Monitor; namespace HH.WCS.QingXigongchang @@ -78,6 +77,7 @@ //Console.WriteLine(set1.SetEquals(set2)); //Console.WriteLine(set1.SetEquals(set3)); #endregion + } else { @@ -175,15 +175,19 @@ { //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.Matches(item, @"QX-\d+_[A-Z]+"); - // if (m.Count > 0) - // foreach (Match match in m) - // { - // Console.WriteLine(match.Value); - // } + // var m = System.Text.RegularExpressions.Regex.IsMatch(item,@"^HS-[A-Z]+_");// @"QX-\d+_X$"); + // if (m) + // { + // Console.WriteLine(m); + // } + // //if (m.Count > 0) + // // foreach (System.Text.RegularExpressions.Match match in m) + // // { + // // Console.WriteLine(match.Value); + // // } //} //Console.WriteLine(""); //new WmsController().BindLoc3(new { loc = "PPMKCK=1-2", LineNo = "缈绘枟鏈�, ItemCode = "550ml姘確15鍏鑶滃寘_6" }); @@ -731,6 +735,7 @@ GetTask(Monitor.A),//璁℃暟鍣� 娓呴櫎 鎺у埗鍙� //娣诲姞浠诲姟鎺ㄩ�绾跨▼ GetTask(TaskCore.Dispatch), + GetTask(TaskCore.Kuronggg), GetTask(TaskCore.ChargeHostAgv), //鎵嬪姩杞繍 @@ -755,6 +760,9 @@ 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