From fdb591381753f9eabca095fce8a2cfd506c3fe32 Mon Sep 17 00:00:00 2001
From: pengmn <pmn@HanInfo>
Date: 星期五, 04 七月 2025 16:53:10 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs | 95 ++++++++++++++++++++++++++---------------------
1 files changed, 53 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..bed8f32 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/GZRobot.cs
@@ -215,52 +215,63 @@
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);
+ 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;
+
}
--
Gitblit v1.9.1