From 12e8eef9decf2a15868ed2f693f89db4bbb6172e Mon Sep 17 00:00:00 2001
From: jinxin <1013386558@qq.com>
Date: 星期一, 23 六月 2025 14:56:11 +0800
Subject: [PATCH] 11
---
C#/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs | 117 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 59 insertions(+), 58 deletions(-)
diff --git "a/C\043/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs" "b/C\043/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs"
index fffd276..fe6dc0c 100644
--- "a/C\043/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs"
+++ "b/C\043/HH.WCS.Mobox3.YNJuXing/process/TaskProcess.cs"
@@ -15,7 +15,7 @@
{
internal class TaskProcess
{
- private static HttpHelper httpHelper =new HttpHelper();
+ private static HttpHelper httpHelper = new HttpHelper();
#region 浠诲姟鐩稿叧
//--------------------------------------------------浠诲姟鐩稿叧--------------------------------------------------
/// <summary>
@@ -503,64 +503,65 @@
var to = task.S_END_LOC;
//var from = LocationHelper.GetAgvSite(task.S_START_LOC).ToString();
//var to = LocationHelper.GetAgvSite(task.S_END_LOC).ToString();
- //var db = new SqlHelper<object>().GetInstance();
- //var Url = Settings.ExtendParamSettings.Where(a => a.ExtendNo == "6" && a.Enable == "1").FirstOrDefault();
- //if (Url != null)
- //{
- // var agvbit = db.Queryable<PeiZhi>().Where(a => a.BITCODE == task.S_START_LOC || a.BITCODE == task.S_END_LOC).ToList();
- //
- // foreach (var item in agvbit)
- // {
- // if (item.BITCODE == task.S_START_LOC)
- // {
- // from = item.PLCLOCATION;
- // }
- // else
- // {
- // to = item.PLCLOCATION;
- // }
- // }
- //
- //
- // var endInfo = Settings.InOutLocations.Where(a => a.Location == task.S_END_LOC).FirstOrDefault();
- // if (endInfo != null)
- // {
- // to = endInfo.Code;
- // }
- //
- // var model = new PlcSendTaskreq
- // {
- // contNo = task.S_CNTR_CODE,
- // contType = task.S_SRC_SYS == Settings.JXCODE ? "宸ㄦ槦" : task.S_SRC_SYS == Settings.JWCODE ? "宸ㄦ矁" : task.S_SRC_SYS == Settings.GLCODE ? "绠＄悊" : "",
- // frmPos = from,
- // toPos = to,
- // requestPk = task.S_CODE,
- // trkPrty = task.N_PRIORITY.ToString(),
- // trkType = task.S_TYPE == "鍏ュ簱" ? "1" : task.S_TYPE == "鍑哄簱" ? "2" : "3"
- // };
- // var feed = httpHelper.WebPost(Url.ExtendParam + "receive", JsonConvert.SerializeObject(model));
- // LogHelper.Info($"浠诲姟{task.S_CODE} 鎺ㄩ�浠诲姟鍙傛暟={JsonConvert.SerializeObject(model)} 涓嬫父鍙嶉={feed}");
- // if (!string.IsNullOrEmpty(feed))
- // {
- // var res = JsonConvert.DeserializeObject<PlcSendTaskres>(feed);
- // if (res.code == "0")
- // {
+ var db = new SqlHelper<object>().GetInstance();
+ var Url = Settings.ExtendParamSettings.Where(a => a.ExtendNo == "6" && a.Enable == "1").FirstOrDefault();
+ if (Url != null)
+ {
+ var agvbit = db.Queryable<PeiZhi>().Where(a => a.BITCODE == task.S_START_LOC || a.BITCODE == task.S_END_LOC).ToList();
+
+ foreach (var item in agvbit)
+ {
+ if (item.BITCODE == task.S_START_LOC)
+ {
+ from = item.PLCLOCATION;
+ }
+ else
+ {
+ to = item.PLCLOCATION;
+ }
+ }
+
+
+ var endInfo = Settings.InOutLocations.Where(a => a.Location == task.S_END_LOC).FirstOrDefault();
+ if (endInfo != null)
+ {
+ to = endInfo.Code;
+ }
+
+ var model = new PlcSendTaskreq
+ {
+ contNo = task.S_CNTR_CODE,
+ contType = task.S_SRC_SYS == Settings.JXCODE ? "宸ㄦ槦" : task.S_SRC_SYS == Settings.JWCODE ? "宸ㄦ矁" : task.S_SRC_SYS == Settings.GLCODE ? "绠＄悊" : "",
+ frmPos = from,
+ toPos = to,
+ requestPk = task.S_CODE,
+ trkPrty = task.N_PRIORITY.ToString(),
+ trkType = task.S_TYPE == "鍏ュ簱" ? "1" : task.S_TYPE == "鍑哄簱" ? "2" : "3"
+ };
+ var feed = httpHelper.WebPost(Url.ExtendParam + "receive", JsonConvert.SerializeObject(model));
+ LogHelper.Info($"浠诲姟{task.S_CODE} 鎺ㄩ�浠诲姟鍙傛暟={JsonConvert.SerializeObject(model)} 涓嬫父鍙嶉={feed}");
+ if (!string.IsNullOrEmpty(feed))
+ {
+ var res = JsonConvert.DeserializeObject<PlcSendTaskres>(feed);
+ if (res.code == "0")
+ {
+ task.N_B_STATE = 1;
WCSHelper.UpdateStatus(task, "宸叉帹閫�);
- // TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "8", "", task);
- // TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "Y", "", task, false);
- // }
- // else
- // {
- // LogHelper.Info($"浠诲姟{task.S_CODE} 鎺ㄩ�澶辫触");
- // //TaskProcess.ThirdReportStatus(task.S_SRC_NO, "", "7", "", task);
- // }
- // }
- //
- //}
- //else
- //{
- // LogHelper.Info($"鎺ㄩ�涓嬫父PLC浠诲姟 鑾峰彇API鍦板潃閰嶇疆澶辫触 璇锋鏌ラ厤缃枃浠�);
- //}
+ TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "8", "", task);
+ TaskProcess.ThirdReportStatus(task.S_OP_CODE, "", "Y", "", task, false);
+ }
+ else
+ {
+ LogHelper.Info($"浠诲姟{task.S_CODE} 鎺ㄩ�澶辫触");
+ //TaskProcess.ThirdReportStatus(task.S_SRC_NO, "", "7", "", task);
+ }
+ }
+
+ }
+ else
+ {
+ LogHelper.Info($"鎺ㄩ�涓嬫父PLC浠诲姟 鑾峰彇API鍦板潃閰嶇疆澶辫触 璇锋鏌ラ厤缃枃浠�);
+ }
}
--
Gitblit v1.9.1