From 12a30243255535e3f616aa858d2a9f1e51e4d123 Mon Sep 17 00:00:00 2001
From: cjs <2216046164@qq.com>
Date: 星期二, 24 六月 2025 17:29:22 +0800
Subject: [PATCH] 111
---
ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs | 81 +++++++++++++++++++++++++++++++++++-----
1 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
index 1e4237b..2128a19 100644
--- a/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
+++ b/ams/Hanhe.iWCS.JingmenGEMTwoProtocol/ProcessHelper.cs
@@ -9,6 +9,7 @@
using MongoDB.Driver.Builders;
using MySql.Data.MySqlClient;
using Newtonsoft.Json;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -697,9 +698,10 @@
if (plc.Count > 0)
{
#region 鍒ゆ柇杈撻�绾挎ā寮�鍙樻洿娉ㄩ噴
- //bool action = true;
+
//foreach(var a in plc)
//{
+ // bool action = false;
// var modeResult = OITcpHelper.RegisterReadOutPut(new OITcpHelper.RegisterReadOutPutModel
// {
// dataNum = 1,
@@ -712,7 +714,6 @@
// CMMLog.Debug($"OutWareTask锛氳鍙栨粴绛掓満{a.ip}閫氶亾鍙蜂负锛歿a.readAddr + 3}鐨勫�涓猴細{modeResult.result[0]}");
// if (modeResult.result[0] == 2)
// {
- // action = false;
// CMMLog.Debug($"OutWareTask:杈撻�绾夸负 鍏ュ簱妯″紡锛岃緭閫佺嚎鐐逛綅锛歿a.location}");
// break;
// }
@@ -724,24 +725,25 @@
// {
// if (modelInfo.Mode == "鍏ュ簱妯″紡")
// {
- // action = false;
// CMMLog.Debug($"OutWareTask:涓棿琛�ModeList涓�鍏ュ簱妯″紡");
- // break;
+ // }
+ // else
+ // {
+ // action = true;
// }
// }
// else
// {
- // action = false;
// CMMLog.Debug("OutWareTask:涓棿琛�ModeList 涓虹┖");
- // break;
// }
// }
// }
+ // if (!action)
+ // {
+ // return false;
+ // }
//};
- //if (!action)
- //{
- // return false;
- //}
+
#endregion
@@ -1321,5 +1323,64 @@
return WeekNumInMonth;
}
+ internal static bool UpdateTaskState(string taskNo, int state)
+ {
+ var result = false;
+ try
+ {
+ string taskState = state == 3 ? "寮�鍙栬揣" : state == 4 ? "鍙栬揣瀹屾垚" : state == 5 ? "寮�鍗歌揣" : state == 6 ? "鍗歌揣瀹屾垚" : state == 2 ? "瀹屾垚" : "";
+ CMMLog.Info($"SQLServer 鏇存柊浠诲姟鐘舵�锛氫换鍔″彿锛歿taskNo},鏇存敼鐘舵�锛歿taskState}");
+ if (!string.IsNullOrEmpty(taskState)) result = new SqlHelper<SQL_TN_I_TASK_MST>().ExecuteSql($"update dbo.tn_am_task_mst set CN_S_STATUS='{taskState}' where CN_S_TASK_NO='{taskNo}'");
+ }
+ catch (Exception ex)
+ {
+ CMMLog.Error($"SQLServer 鏇存柊浠诲姟鐘舵�寮傚父锛歿ex.Message}");
+ }
+
+ return result;
+ }
+
+ /// <summary>
+ /// SQL-AMS浠诲姟涓昏〃
+ /// </summary>
+ [SugarTable("dbo.tn_am_task_mst")]
+ public class SQL_TN_I_TASK_MST
+ {
+ public string CN_S_BATCH_NO { get; set; }
+ public int CN_S_ORDER_NO { get; set; }
+ public string CN_S_TASK_NO { get; set; }
+ public string CN_S_SOURCE_SYS { get; set; }
+ public string CN_S_SOURCE_NO { get; set; }
+ public string CN_S_PROCESS_CODE { get; set; }
+ public string CN_S_TASK_TYPE { get; set; }
+ public string CN_S_START_AREA { get; set; }
+ public string CN_S_START_AREA_NAME { get; set; }
+ public string CN_S_START_BIT { get; set; }
+ public int CN_N_START_AGVBIT { get; set; }
+ public string CN_S_END_AREA { get; set; }
+ public string CN_S_END_AREA_NAME { get; set; }
+ public string CN_S_END_BIT { get; set; }
+ public int CN_N_END_AGVBIT { get; set; }
+ public string CN_S_STATUS { get; set; }
+ public string CN_S_BEF_STATUS { get; set; }
+ public string CN_S_BEFORE_NO { get; set; }
+ public string CN_S_AFTER_NO { get; set; }
+ public string CN_T_START_WORKING { get; set; }
+ public string CN_T_END_WORKING { get; set; }
+ public int CN_N_PRIORITY { get; set; }
+ public int CN_N_CUR_STEP { get; set; }
+ public string CN_S_CREATOR { get; set; }
+ public string CN_S_CREATOR_NAME { get; set; }
+ public string CN_T_CREATE { get; set; }
+ public string CN_S_MENDER { get; set; }
+ public string CN_S_MODIFY_NAME { get; set; }
+ public string CN_T_MODIFY { get; set; }
+ public string CN_S_TASK_MODEL { get; set; }
+ public string CN_S_EXT1 { get; set; }
+ public string CN_S_EXT2 { get; set; }
+ public string CN_S_EXT3 { get; set; }
+ public string CN_N_AGV_NO { get; set; }
+ public string CN_S_TRANSPORT_INFO { get; set; }
+ }
}
}
--
Gitblit v1.9.1