From af548b2e59c0bc1bec3ffbfca0dbc7d121ba633e Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 12:52:56 +0800
Subject: [PATCH] 333
---
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/3、DataProcess_BZ12_FinishTask.cs | 2 +-
CC/iWareCC_ASRS/FormCC.cs | 21 ++++++++++++++-------
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs | 6 ++++++
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/CC/iWareCC_ASRS/FormCC.cs b/CC/iWareCC_ASRS/FormCC.cs
index bf2ba72..439b8c3 100644
--- a/CC/iWareCC_ASRS/FormCC.cs
+++ b/CC/iWareCC_ASRS/FormCC.cs
@@ -21,6 +21,7 @@
using System.Collections.Generic;
using System.Data;
using System.Data.Entity.Core.Metadata.Edm;
+using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Linq.Expressions;
@@ -259,7 +260,7 @@
}
private void FormCC_Load(object sender, EventArgs e)
{
-
+
/*
@@ -614,15 +615,21 @@
{
while (true)
{
- Thread.Sleep(2000);//1绉掗挓璇诲彇涓�娆�
+ Thread.Sleep(3000);//1绉掗挓璇诲彇涓�娆�
try
{
if (stationServiceClient == null)
{
continue;
}
- /*
+
+ Stopwatch main = new Stopwatch();
+ main.Start();
+
iWareCC.StationService.DeviceWarningInfo[] waringList = await stationServiceClient.GetWaringInfoListAsync((int)EDevice.Station, configDeviceWarningList.wmsConfigDeviceWarnings.ToArray());
+
+ main.Stop();
+ var milliseconds = main.ElapsedMilliseconds; //-- 鎿嶄綔鏃堕棿锛堟绉掞級
//鏄剧ず鎶ヨ淇℃伅
List<String> warningCodeList = new List<string>();
@@ -1241,13 +1248,13 @@
-
-
-
-
+
+
+
+
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
index 8ed2903..159e325 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/1\343\200\201DataProcess_BZ12.cs"
@@ -84,12 +84,14 @@
continue;
}
+ /*
isValidate = TaskHandler.ValidateNoFinishOutTaskFor鐮佹澘浠诲姟(wmsDB);
if (!isValidate)
{
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()}-鏈� 鏈粨鏉� 鐨勪换鍔★紝涓嶈兘澶勭悊,姝ゆ寰幆缁撴潫";
continue;
}
+ //*/
var upiObj = wmsDB.mes_batchOrderUPI_new.Where(x => x.UPI == upiCode).FirstOrDefault();
if (upiObj == null)
@@ -170,11 +172,15 @@
}
else
{
+ //鍘绘帀鎶ヨ锛屼笉鍐嶆牎楠岃繖涓簡
+ place = "1";
+ /*
//鍐欏叆鎶ヨ淇℃伅
await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);
SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}鏃犲彲鐢ㄧ爜鍨涚洰鏍囦綅 ";
continue;
+ //*/
}
palletizingStation = int.Parse(place);
diff --git "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs" "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
index acd39f7..e849244 100644
--- "a/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
+++ "b/CC/iWareCC_ASRS/ThreadService/03_BZ12\050\346\234\272\345\231\250\344\272\272\347\240\201\345\214\205\345\267\245\344\275\215\051/3\343\200\201DataProcess_BZ12_FinishTask.cs"
@@ -22,7 +22,7 @@
LogType logType = LogType.DataProcess_BZ12_FinishTask;
while (true)
{
- Thread.Sleep(1000);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
+ Thread.Sleep(900);//浼戠湢2绉掞紝灏嗕紤鐪犲啓鍒板墠闈紝鏄负浜嗕笅闈㈢殑continue鏂规硶鎵ц鍚庝笉鏄剧ず閿欒淇℃伅鐨勬彁绀猴紒锛侊紒銆怑ditBy shaocx,2022-05-24銆�
SystemWarningMsg._lbl_Alert_DataProcess_BZ12_FinishTask = string.Empty;
try
{
--
Gitblit v1.9.3