From 7f34e14e8eefc2eb178eb2786e5989fe53b207bb Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期一, 07 七月 2025 17:05:14 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 119 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 77 insertions(+), 42 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
index 658a6c6..46a8c27 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
@@ -215,54 +215,89 @@
public static GzResult applyReroute(orderReroute model)
{
GzResult result = new GzResult();
- var wcsTask = WCSHelper.GetTask(model.orderName);
- if (wcsTask == null)
+ try
+ {
+ var wcsTask = WCSHelper.GetTask(model.orderName);
+ if (wcsTask == null)
+ {
+ result.resultCode = 1;
+ result.msg = "璁㈠崟涓嶅瓨鍦�";
+ return result;
+ }
+ if (model.orderType == 1)
+ {
+ //1琛ㄧず鏄惁鐢宠缁曡矾
+ var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC);
+ LogHelper.Info($"applyReroute 鐢宠鏄惁缁曡矾璐т綅鍙傛暟{JsonConvert.SerializeObject(endLoc)}");
+ if (endLoc.N_CURRENT_NUM == 0&& endLoc.S_LOCK_STATE=="鍏ュ簱閿�)
+ {
+ result.resultCode = 0;
+ result.success = true;
+ result.msg = "鐩爣璐т綅宸茬┖";
+ return result;
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.success = false;
+ result.msg = "鐩爣璐т綅涓烘弧";
+ return result;
+ }
+ }
+ else
+ {
+ //2琛ㄧず鐢宠鐩爣搴撲綅
+ var apply = new ApplyModel() { wcsTaskCode = wcsTask.S_WORKSHOP_NO };
+ var end = XMWcsHelper.GetPositionApply(apply);
+ if (!string.IsNullOrEmpty(end.body.pointCode))
+ {
+ result.resultCode = 0;
+ result.msg = "鐩爣搴撲綅宸茬敵璇�;
+ result.orderData = end.body.pointCode;
+ return result;
+ }
+ else
+ {
+ result.resultCode = 1;
+ result.msg = "鐩爣搴撲綅宸茬敵璇�;
+ result.orderData = "";
+ return result;
+ }
+ }
+ }
+ catch (Exception ex)
{
result.resultCode = 1;
- result.msg = "璁㈠崟涓嶅瓨鍦�";
+ result.success = false;
+ result.msg = $"agv鐢宠缁曡矾鍑虹幇閿欒{JsonConvert.SerializeObject(ex.Message)}";
return result;
}
- if (model.orderType == 1)
- {
- //1琛ㄧず鏄惁鐢宠缁曡矾
- var endLoc = LocationHelper.GetLoc(wcsTask.S_END_LOC);
- if (endLoc.N_CURRENT_NUM == 0 && endLoc.S_LOCK_STATE == "鏃�)
- {
- result.resultCode = 0;
- result.msg = "鐩爣璐т綅宸茬┖";
- return result;
- }
- else
- {
- result.resultCode = 1;
- result.msg = "鐩爣璐т綅涓烘弧";
- return result;
- }
- }
- else
- {
- //2琛ㄧず鐢宠鐩爣搴撲綅
- var apply = new ApplyModel() { wcsTaskCode = wcsTask.S_WORKSHOP_NO };
- var end = XMWcsHelper.GetPositionApply(apply);
- if (!string.IsNullOrEmpty(end.body.pointCode))
- {
- result.resultCode = 0;
- result.msg = "鐩爣搴撲綅宸茬敵璇�;
- result.orderData = end.body.pointCode;
- return result;
- }
- else
- {
- result.resultCode = 1;
- result.msg = "鐩爣搴撲綅宸茬敵璇�;
- result.orderData = "";
- return result;
- }
- }
-
- return result;
+
}
+ /// <summary>
+ /// 浜ょ鐢宠
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static GzResult agvTraffic(orderTraffic model)
+ {
+ GzResult result = new GzResult();
+ try
+ {
+ result.resultCode = 0;
+ result.msg = "success";
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.resultCode = 1;
+ result.success = false;
+ result.msg = $"浜ょ鐢宠鍑虹幇閿欒{JsonConvert.SerializeObject(ex.Message)}";
+ return result;
+ }
+
+ }
///// <summary>
///// 璋冪敤灏忕背鐘舵�鍥炴姤鎺ュ彛
--
Gitblit v1.9.1