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/process/TaskProcess.cs | 22 ++++++++++++++--------
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs | 6 +++---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs | 18 ++++++++++++++----
3 files changed, 31 insertions(+), 15 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 6c0fb63..a796d4c 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs
@@ -38,7 +38,7 @@
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.in_order_id;
+ 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)
{
@@ -81,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)
@@ -197,7 +207,7 @@
/// <summary>
/// 璁㈠崟浼樺厛绾�閫氬父涓�锛屾渶澶у�涓�0锛岃秴杩�0鐨勫綋鍋�0澶勭悊锛屾寜浼樺厛绾ч檷搴忔帓搴� /// </summary>
- public string priority { get; set; }
+ public int priority { get; set; }
/// <summary>
/// 璁㈠崟鎴鏃堕棿
/// </summary>
@@ -283,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
{
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs
index 0145ee8..bf71097 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs
@@ -26,9 +26,9 @@
//public int N_BIND_ORDER { get; set; }
- [SugarColumn(IsIgnore = true)]
- [Navigate(NavigateType.OneToMany, nameof(S_LOC_CODE))]
- public List<LocCntrRel> LocCntrRels { get; set; }
+ //[SugarColumn(IsIgnore = true)]
+ //[Navigate(NavigateType.OneToMany, nameof(S_LOC_CODE))]
+ //public List<LocCntrRel> LocCntrRels { get; set; }
}
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
index 9e8811a..943814b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -410,9 +410,9 @@
PickingTaskModel model = new PickingTaskModel();
model.order_name = mst.S_CODE;
- model.priority = "1";
+ model.priority = 1;
model.dead_line = DateTime.Now.ToString();
- model.ts_name = mst.S_TYPE;
+ model.ts_name = "p2p";
model.parameters = parme;
//model.parameters = new AntsParasModel {
// src = mst.S_START_LOC,
@@ -423,7 +423,10 @@
}
else if (mst.S_TYPE == "inbound")
{
- string tote_id = $"\"tote_id\":\"{mst.S_FRAME_CODE}\",";
+ //鏌ュ嚭璐ф灦缂栫爜
+ var db = new SqlHelper<Object>().GetInstance();
+ var locFrameRel = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == mst.S_START_LOC).First();
+ string tote_id = $"\"tote_id\":\"{locFrameRel.S_FRAME_CODE}\",";
string task_type = $"\"task_type\":\"{mst.S_TYPE}\",";
string src = $"\"src\":\"{mst.S_START_LOC}\",";
string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
@@ -435,15 +438,15 @@
string parmeD = "}";
string parmezS = "[";
string parmezD = "]";
- string parme = parmeS + src + dst + extra_info + parmeS + parmezS + layer + put + parmeD + parmezD + parmeD;
+ string parme = parmeS + tote_id + task_type + src + dst + extra_info + parmezS+ parmeS + layer + put + parmeD + parmezD + parmeD;
LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
PickingTaskModel model = new PickingTaskModel();
model.order_name = mst.S_CODE;
- model.priority = "1";
+ model.priority = 1;
model.dead_line = DateTime.Now.ToString();
- model.ts_name = mst.S_TYPE;
+ model.ts_name = "picking_ts";
model.parameters = parme;
//model.parameters = new AntsParasModel {
// src = mst.S_START_LOC,
@@ -1149,9 +1152,12 @@
{
////鍒涘缓鍒扮紦瀛樺尯浠诲姟
//var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
+
+ //鎵緋2a鐨勪换鍔＄紪鐮�+ var order_name = model.taskList.Find(s=>s.ts_name=="p2a").order_name;
//鍒涘缓浠诲姟
LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLoc.S_CODE}", "灏忎欢閫氱敤杞﹀瀷");
- var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "灏忎欢閫氱敤杞﹀瀷", model.rackNumber, "", 1, 1);
+ var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "灏忎欢閫氱敤杞﹀瀷", model.rackNumber, order_name, 1, 1);
if (!res)
{
return new TaskResponse
@@ -1166,7 +1172,7 @@
if (tasklist.ts_name == "p2p")
{
//鍏堢粦瀹氭枡鏋跺拰鏂欑浣�- ContainerHelper.BindLocCntrsXmLj(tasklist.parameters.src, model.rackNumber);
+ ContainerHelper.BindLocCntrsXmLj(tasklist.rackPosition, model.rackNumber);
var startloc = db.Queryable<Location>().Where(a => a.S_CODE == tasklist.rackPosition).First();
if (startloc == null || startloc.N_LOCK_STATE != 0)
--
Gitblit v1.9.1