From b8f0938c46299b821eb73b3b4aec9fc807178354 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 10 六月 2025 17:33:09 +0800
Subject: [PATCH] 11
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 140 ++++++++++++++++++++++------------------------
1 files changed, 68 insertions(+), 72 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 391cc92..d0ac375 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -96,25 +96,25 @@
internal static void recordInfo(string taskName,string errMsg)
{
- //var errInfo = MongoDBSingleton.Instance.FindOne<errInfoTable>(Query.EQ("taskName", taskName), "errInfoTable");
- //if(errInfo != null)
- //{
- // MongoDBSingleton.Instance.Update<errInfoTable>(Query.EQ("_id", errInfo._id), Update.Set("errMsg", errMsg).Set("dateTime", DateTime.Now), UpdateFlags.None);
- //}
- //else
- //{
- // MongoDBSingleton.Instance.Insert<errInfoTable>(new errInfoTable
- // {
- // taskName = taskName,
- // errMsg = errMsg,
- // dateTime = DateTime.Now
- // });
- //}
+ var errInfo = MongoDBSingleton.Instance.FindOne<errInfoTable>(Query.EQ("taskName", taskName), "errInfoTable");
+ if(errInfo != null)
+ {
+ MongoDBSingleton.Instance.Update<errInfoTable>(Query.EQ("_id", errInfo._id), Update.Set("errMsg", errMsg).Set("dateTime", DateTime.Now), UpdateFlags.None);
+ }
+ else
+ {
+ MongoDBSingleton.Instance.Insert<errInfoTable>(new errInfoTable
+ {
+ taskName = taskName,
+ errMsg = errMsg,
+ dateTime = DateTime.Now
+ });
+ }
}
internal static void deleteInfo(string taskName)
{
- //MongoDBSingleton.Instance.Remove<errInfoTable>(Query.EQ("taskName", taskName), RemoveFlags.None);
+ MongoDBSingleton.Instance.Remove<errInfoTable>(Query.EQ("taskName", taskName), RemoveFlags.None);
}
@@ -692,62 +692,60 @@
if (plc.Count > 0)
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
- bool action = true;
- foreach(var a in plc)
- {
- var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
- {
- dataNum = 1,
- addr = a.readAddr + 3,
- host = a.ip,
- port = a.port
- });
- if (modeResult != null && modeResult.errCode == 0)
- {
- CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
- if (modeResult.result[0] == 2)
- {
- action = false;
- CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
- break;
- }
- else
- {
- //璇诲彇涓棿琛ㄦā寮�- var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
- if (modelInfo != null)
- {
- if (modelInfo.Mode == "鍏ュ簱妯″紡")
- {
- action = false;
- CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
- break;
- }
- }
- else
- {
- action = false;
- CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
- break;
- }
- }
- }
- };
- if (!action)
- {
- return false;
- }
+ //bool action = true;
+ //foreach(var a in plc)
+ //{
+ // var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
+ // {
+ // dataNum = 1,
+ // addr = a.readAddr + 3,
+ // host = a.ip,
+ // port = a.port
+ // });
+ // if (modeResult != null && modeResult.errCode == 0)
+ // {
+ // CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
+ // if (modeResult.result[0] == 2)
+ // {
+ // action = false;
+ // CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
+ // break;
+ // }
+ // else
+ // {
+ // //璇诲彇涓棿琛ㄦā寮�+ // var modelInfo = MongoDBSingleton.Instance.FindOne<ModeList>("ModeList");
+ // if (modelInfo != null)
+ // {
+ // if (modelInfo.Mode == "鍏ュ簱妯″紡")
+ // {
+ // action = false;
+ // CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
+ // break;
+ // }
+ // }
+ // else
+ // {
+ // action = false;
+ // CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
+ // break;
+ // }
+ // }
+ // }
+ //};
+ //if (!action)
+ //{
+ // return false;
+ //}
#endregion
- CMMLog.Info($"OutWareTask 11111");
string ssx01 = plc[0].location;
string ssx02 = plc[1].location;
//CMMLog.Info($"鏌ヨ杈撻�绾垮綋鍓嶇偣浣嶏細{a.location}");
var slptInfo1 = MongoDBSingleton.Instance.FindOne<SLPTLoc>(Query.EQ("locCode", ssx01), "SLPTLoc");
if (slptInfo1 == null)
{
- CMMLog.Info($"OutWareTask 222222");
endMachLoc = ssx01;
slptInfo1 = new SLPTLoc
{
@@ -758,7 +756,6 @@
}
else
{
- CMMLog.Info($"OutWareTask 3333333");
var slptInfo2 = MongoDBSingleton.Instance.FindOne<SLPTLoc>(Query.EQ("locCode", ssx02), "SLPTLoc");
if (slptInfo2 == null)
{
@@ -772,7 +769,6 @@
}
else
{
- CMMLog.Info($"OutWareTask 44444444444");
var loc = slptInfo1.taskNum <= slptInfo2.taskNum ? slptInfo1 : slptInfo2;
CMMLog.Info("OutWareTask :" + JsonConvert.SerializeObject(loc));
if (loc.taskNum < 2)
@@ -793,14 +789,14 @@
new SqlHelper<object>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_END_BIT='{endMachLoc}',CN_S_END_AGVBIT = '{StockInstance.Instance.GetAGVCodeForBitCode(endMachLoc)}' where CN_S_TASK_NO = '{mst.CN_S_TASK_NO}'");
var plcTwo = Settings.GetPlcInfo().Where(a => a.location == endMachLoc && a.enable == 1).First();
- int[] num = new int[1] { 1 };
- var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
- {
- addr = plcTwo.writeAddr + 1,
- host = plcTwo.ip,
- data = num,
- port = plcTwo.port
- });
+ //int[] num = new int[1] { 1 };
+ //var wirte = OITcpHelper.RegisterWriteOutPutMulti(new OITcpHelper.RegisterWriteOutPutModelMulti
+ //{
+ // addr = plcTwo.writeAddr + 1,
+ // host = plcTwo.ip,
+ // data = num,
+ // port = plcTwo.port
+ //});
result = true;
}
--
Gitblit v1.9.1