From da7196f0acb1349fe0bc6b3b652093b495416adc Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期五, 11 七月 2025 17:42:42 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 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 c9fa2b4..a796d4c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
@@ -14,7 +14,11 @@
private static readonly HttpHelper apiHelper = new HttpHelper();
private static readonly string baseUrl = Settings.HASeverUrl;
-
+ /// <summary>
+ /// 鎺ㄩ�Ants璁㈠崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static bool CreateAntsOrder(AntsTaskModel model)
{
var msg = "";
@@ -23,6 +27,7 @@
var response = apiHelper.Post(baseUrl + "/api/om/order", request);
msg = $"[hanao-CreateAntsOrder] request={request} response={response}";
Console.WriteLine(msg);
+ LogHelper.Info("[hanao-CreateAntsOrder]" + msg);
if (response != "")
{
try
@@ -30,7 +35,16 @@
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;
+ }
+
}
}
catch (Exception ex)
@@ -47,6 +61,11 @@
return result;
}
+ /// <summary>
+ /// 鎺ㄩ�Picking璁㈠崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
public static bool CreatePickingOrder(PickingTaskModel model)
{
var msg = "";
@@ -62,7 +81,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)
@@ -79,7 +108,12 @@
return result;
}
- public static bool CancelPickingOrder(CancelModel model)
+ /// <summary>
+ /// 鍒犻櫎璁㈠崟
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public static bool CancelOrder(CancelModel model)
{
bool result = false;
string msg = "";
@@ -129,7 +163,8 @@
/// <summary>
/// TS璁㈠崟鍙傛暟
/// </summary>
- public AntsParasModel parameters { get; set; }
+ //public AntsParasModel parameters { get; set; }
+ public string parameters { get; set; }
/// <summary>
/// 璁㈠崟鐨勫叏灞�敮涓�D
@@ -172,7 +207,7 @@
/// <summary>
/// 璁㈠崟浼樺厛绾�閫氬父涓�锛屾渶澶у�涓�0锛岃秴杩�0鐨勫綋鍋�0澶勭悊锛屾寜浼樺厛绾ч檷搴忔帓搴� /// </summary>
- public string priority { get; set; }
+ public int priority { get; set; }
/// <summary>
/// 璁㈠崟鎴鏃堕棿
/// </summary>
@@ -180,7 +215,8 @@
/// <summary>
/// 璁㈠崟鍙傛暟
/// </summary>
- public PickingParasModel parameters { get; set; }
+ //public PickingParasModel parameters { get; set; }
+ public string parameters { get; set; }
/// <summary>
/// 璁㈠崟TS鍚嶅瓧
@@ -257,7 +293,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