From d66d362ee6d76f02331e56df1fdec1c2114c9f3e Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期三, 16 七月 2025 17:31:41 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
index bd3fae7..1046d0c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
@@ -35,7 +35,17 @@
var dataResult = JsonConvert.DeserializeObject<RcsResult>(response);
if (dataResult.code == 0)
{
- result = true;
+ var db = new SqlHelper<WCSTask>().GetInstance();
+ //瀛樿鍗曞彿
+ var task = db.Queryable<WCSTask>().Where(a => a.S_CODE == model.order_name).First();
+ LogHelper.Info($"CreateAntsOrder task鍙傛暟==========={JsonConvert.SerializeObject(task)}");
+ task.S_WORKSHOP_NO = dataResult.data[0].in_order_id;
+ var res = db.Updateable(task).UpdateColumns(it => it.S_WORKSHOP_NO).ExecuteCommand() > 0;
+ if (res)
+ {
+ result = true;
+ }
+
}
}
catch (Exception ex)
@@ -72,7 +82,17 @@
var dataResult = JsonConvert.DeserializeObject<RcsResult>(response);
if (dataResult.code == 0)
{
- result = true;
+ var db = new SqlHelper<WCSTask>().GetInstance();
+ //瀛樿鍗曞彿
+ var task = db.Queryable<WCSTask>().Where(a => a.S_CODE == model.ts_name).First();
+
+ task.S_WORKSHOP_NO = dataResult.data[0].in_order_id;
+ var res = db.Updateable(task).UpdateColumns(it => it.S_WORKSHOP_NO).ExecuteCommand() > 0;
+ if (res)
+ {
+ result = true;
+ }
+ //result = true;
}
}
catch (Exception ex)
@@ -99,7 +119,8 @@
bool result = false;
string msg = "";
var request = JsonConvert.SerializeObject(model);
- var response = apiHelper.Post(baseUrl + ":9002/wcs-admin/api/cancel", request);
+ //var response = apiHelper.Post(baseUrl + ":9002/wcs-admin/api/cancel", request);
+ var response = apiHelper.Put(baseUrl + ":2000/api/om/order/order-command", request);
msg = $"[hanao-CancelOrder] request={request};response={response}";
Console.WriteLine(msg);
if (response != "")
@@ -188,7 +209,7 @@
/// <summary>
/// 璁㈠崟浼樺厛绾�閫氬父涓�锛屾渶澶у�涓�0锛岃秴杩�0鐨勫綋鍋�0澶勭悊锛屾寜浼樺厛绾ч檷搴忔帓搴� /// </summary>
- public string priority { get; set; }
+ public int priority { get; set; }
/// <summary>
/// 璁㈠崟鎴鏃堕棿
/// </summary>
@@ -196,7 +217,8 @@
/// <summary>
/// 璁㈠崟鍙傛暟
/// </summary>
- public PickingParasModel parameters { get; set; }
+ //public PickingParasModel parameters { get; set; }
+ public string parameters { get; set; }
/// <summary>
/// 璁㈠崟TS鍚嶅瓧
@@ -256,11 +278,11 @@
/// <summary>
///
/// </summary>
- public string order_id { get; set; }
+ public string order_name { get; set; }
/// <summary>
///
/// </summary>
- public string order_command_type_id { get; set; }
+ public int order_command_type_id { get; set; }
}
@@ -273,7 +295,7 @@
public string version { get; set; }
public int code { get; set; }
public string msg { get; set; }
- public RcsData data { get; set; }
+ public List<RcsData> data { get; set; }
}
public class RcsData
{
--
Gitblit v1.9.1