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 | 374 +++++++++++++++++++++++++++++------------------------
1 files changed, 206 insertions(+), 168 deletions(-)
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 873b432..943814b 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -48,32 +48,14 @@
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_START_LOC}鍙栬揣瀹屾垚锛岃捣鐐硅В缁戝鍣▄mst.S_CNTR_CODE}");
- if (mst.S_FRAME_CODE != null)
- {
- LocationHelper.UnBindingLocHj(mst.S_START_LOC, mst.S_FRAME_CODE);
+ LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
- }
- else
- {
- LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());
-
- }
}
else
{
Console.WriteLine($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
- //濡傛灉璐ф灦鏈夊�鍒欑粦璐ф灦
- if (mst.S_FRAME_CODE!=null)
- {
- LocationHelper.BindingLocHj(mst.S_END_LOC, mst.S_FRAME_CODE);
-
- }
- else
- {
- LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
-
- }
+ LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
}
@@ -148,7 +130,7 @@
}
}
-
+
private static object locLocker = new object();
/// <summary>
@@ -389,26 +371,92 @@
//var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
if (mst.S_START_LOC != null && mst.S_END_LOC != null)
{
- string src = $"\"src\":\"{mst.S_START_LOC}\",";
- string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
- string carrier_type_id = $"\"carrier_type_id\":\"1\"";
- string parmeS = "{";
- string parmeD = "}";
- string parme = parmeS + src + dst + carrier_type_id + parmeD;
-
- LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
- AntsTaskModel model = new AntsTaskModel();
- model.order_name = mst.S_CODE;
- model.priority = 1;
- model.dead_line = DateTime.Now.ToString();
- model.ts_name = mst.S_TYPE;
- model.parameters = parme;
- //model.parameters = new AntsParasModel {
- // src = mst.S_START_LOC,
- // dst = mst.S_END_LOC,
- // carrier_type_id="-99"
- //};
- var res = RcsHelper.CreateAntsOrder(model);
+ bool res = false;
+ if (mst.S_TYPE == "澶т欢")
+ {
+ string src = $"\"src\":\"{mst.S_START_LOC}\",";
+ string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
+ string carrier_type_id = $"\"carrier_type_id\":\"1\"";
+ string parmeS = "{";
+ string parmeD = "}";
+ string parme = parmeS + src + dst + carrier_type_id + parmeD;
+
+ LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
+ AntsTaskModel model = new AntsTaskModel();
+ model.order_name = mst.S_CODE;
+ model.priority = 1;
+ model.dead_line = DateTime.Now.ToString();
+ model.ts_name = mst.S_TYPE;
+ model.parameters = parme;
+ //model.parameters = new AntsParasModel {
+ // src = mst.S_START_LOC,
+ // dst = mst.S_END_LOC,
+ // carrier_type_id="-99"
+ //};
+ res = RcsHelper.CreateAntsOrder(model);
+ }
+ else if (mst.S_TYPE == "灏忎欢閫氱敤杞﹀瀷")
+ {
+ string src = $"\"src\":\"{mst.S_START_LOC}\",";
+ string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
+ string car_type = $"\"car_type\":\"1\",";
+ string src_ort = $"\"src_ort\":\"-1\",";
+ string dst_ort = $"\"dst_ort\":\"-1\"";
+ string parmeS = "{";
+ string parmeD = "}";
+ string parme = parmeS + src + dst + car_type + src_ort + dst_ort + parmeD;
+
+ LogHelper.Info($"鎺ㄩ�浠诲姟鍙傛暟{parme}", "浠诲姟");
+
+ PickingTaskModel model = new PickingTaskModel();
+ model.order_name = mst.S_CODE;
+ model.priority = 1;
+ model.dead_line = DateTime.Now.ToString();
+ model.ts_name = "p2p";
+ model.parameters = parme;
+ //model.parameters = new AntsParasModel {
+ // src = mst.S_START_LOC,
+ // dst = mst.S_END_LOC,
+ // carrier_type_id="-99"
+ //};
+ res = RcsHelper.CreatePickingOrder(model);
+ }
+ else if (mst.S_TYPE == "inbound")
+ {
+ //鏌ュ嚭璐ф灦缂栫爜
+ 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}\",";
+
+ string extra_info = $"\"extra_info\":";
+ string layer = $"\"layer\":[1,2,3,4],";
+ string put = $"\"put\":true";
+ string parmeS = "{";
+ string parmeD = "}";
+ string parmezS = "[";
+ string parmezD = "]";
+ 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.dead_line = DateTime.Now.ToString();
+ model.ts_name = "picking_ts";
+ model.parameters = parme;
+ //model.parameters = new AntsParasModel {
+ // src = mst.S_START_LOC,
+ // dst = mst.S_END_LOC,
+ // carrier_type_id="-99"
+ //};
+ res = RcsHelper.CreatePickingOrder(model);
+ }
+
+
if (res)
{
//鏇存柊浠诲姟鐘舵�
@@ -462,7 +510,7 @@
return result;
}
//灏忕背澶т欢
- public static bool CreateTransportDj(string start, string end, string taskType, string cntrs,string orderName, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1)
+ public static bool CreateTransportDj(string start, string end, string taskType, string cntrs, string orderName, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1)
{
var result = false;
var trayCodes = cntrs;
@@ -470,7 +518,7 @@
- var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName,trayCarryCount, startLayer, endLayer);
+ var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName, trayCarryCount, startLayer, endLayer);
if (res)
{
result = true;
@@ -795,7 +843,7 @@
result = list.OrderBy(s => s.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
}
-
+
}
}
@@ -981,7 +1029,7 @@
Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
}
endLocStr = model.parameters.dst;
-
+
break;
case "p2a":
startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
@@ -990,7 +1038,7 @@
Message = $"{model.parameters.src}搴撲綅宸茶閿佸畾!";
}
var endLoc = InWorkTransport(model.parameters.dst_area);
- if (endLoc==null)
+ if (endLoc == null)
{
//濡傛灉娌℃壘鍒板氨绛夌涓�潯
endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
@@ -999,7 +1047,7 @@
break;
case "a2p":
startLoc = OutWorkTransport(model.parameters.src_area);
- if (startLoc==null)
+ if (startLoc == null)
{
Message = $"{model.parameters.dst}搴撳尯娌℃湁鍙嚭璐т綅!";
}
@@ -1030,7 +1078,7 @@
break;
}
- LogHelper.Info($"bigMaterial 鎺ユ敹鍙傛暟{JsonConvert.SerializeObject(model) }");
+ LogHelper.Info($"bigMaterial 鎺ユ敹鍙傛暟{JsonConvert.SerializeObject(model)}");
//鍒涘缓鎵樼洏璐т綅缁戝畾鍏崇郴
string trayCode = ContainerHelper.GenerateCntrNo();
//缁戝畾璧风偣璐т綅(浜х嚎)鍜岀墿鏂�@@ -1038,8 +1086,8 @@
var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
//鍒涘缓浠诲姟
- LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLocStr}", model.ts_name);
- var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLocStr, model.ts_name, locCntrRel.S_CNTR_CODE, model.order_name, 1, 1);
+ LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLocStr}", "澶т欢");
+ var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLocStr, "澶т欢", locCntrRel.S_CNTR_CODE, model.order_name, 1, 1);
if (!res)
{
return new TaskResponse
@@ -1082,126 +1130,116 @@
}
-
- //public static TaskResponse smallMaterial(smallMaterial model) {
- // var db = new SqlHelper<Location>().GetInstance();
+ //灏忎欢
+ public static TaskResponse smallMaterial(smallMaterial model)
+ {
+ var db = new SqlHelper<Location>().GetInstance();
+ try
+ {
+ string Message = null;
- // string Message = null;
-
- // //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�- // var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.taskList[0].parameters[0].src).First();
-
- // var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
- // if (startLoc == null || startLoc.N_LOCK_STATE != 0)
- // {
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters[0].src}搴撲綅宸茶閿佸畾!" }
- // };
- // }
- // var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
- // if (endLoc != null)
- // {
- // //鍒涘缓鍒扮紦瀛樺尯浠诲姟
- // var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
- // //鍒涘缓浠诲姟
- // LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLoc.S_CODE}缁堢偣:{endLoc.S_CODE}", model.ts_name);
- // var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
- // if (!res)
- // {
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触" }
- // };
- // }
- // }
- // //鏂欐灦涓婄殑鎵樼洏鍒版寚瀹氱殑宸ヤ綅
- // foreach (var parameter in model.parameters)
- // {
- // var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
- // if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
- // {
- // Message = Message==null? $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!": Message+ $"{model.parameters[0].src}搴撲綅宸茶閿佸畾!";
- // }
- // else
- // {
- // //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�- // var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
- // if (startFrameParent != null)
- // {
- // var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
- // if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
- // {
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
- // };
- // }
- // }
- // var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
- // if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
- // {
- // //搴旇缁曡矾
-
- // Message = Message == null ? $"{parameter.dst}搴撲綅宸茶閿佸畾!" : Message + $"{parameter.dst}搴撲綅宸茶閿佸畾!";
- // }
- // else
- // {
- // //璐ф灦涓婄殑璐у垽鏂竴涓嬭揣鏋舵湁娌℃湁閿�- // var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
- // if (endFrameParent != null)
- // {
- // var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
- // if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
- // {
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}璐ф灦宸茶閿佸畾!" }
- // };
- // }
- // }
- // //鍒涘缓鍒扮紦瀛樺尯浠诲姟
- // var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
- // //鍒涘缓浠诲姟
- // LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startLocHj.S_CODE}缁堢偣:{endLocHj.S_CODE}", model.ts_name);
- // var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
- // if (!res)
- // {
- // return new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟2鍒涘缓澶辫触" }
- // };
- // }
-
- // }
+ //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�+ var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.taskList[0].parameters.src).First();
+ if (startLoc == null || startLoc.N_LOCK_STATE != 0)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters.src}搴撲綅宸茶閿佸畾!" }
+ };
+ }
+ var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
+ if (endLoc != null)
+ {
+ ////鍒涘缓鍒扮紦瀛樺尯浠诲姟
+ //var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
- // }
- // }
- // var result = new TaskResponse();
- // if (Message != null)
- // {
- // result = new TaskResponse
- // {
- // header = new ResponseHead { code = 0, desc = Message }
- // };
- // }
- // else
- // {
- // result = new TaskResponse
- // {
- // header = new ResponseHead { code = 200, desc = "SUCCESS" },
- // body = new ResponseBody
- // {
- // msg = "success",
- // app_name = "Guozi client",
- // data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
- // version = ""
- // }
- // };
- // }
- // return result;
- //}
-
+ //鎵緋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, order_name, 1, 1);
+ if (!res)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = "鑷姩涓婄嚎浠诲姟鍒涘缓澶辫触" }
+ };
+ }
+ }
+ //鏂欐灦涓婄殑鎵樼洏鍒版寚瀹氱殑宸ヤ綅
+ foreach (var tasklist in model.taskList)
+ {
+ if (tasklist.ts_name == "p2p")
+ {
+ //鍏堢粦瀹氭枡鏋跺拰鏂欑浣�+ 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)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = $"{startloc.S_CODE}搴撲綅宸茶閿佸畾!" }
+ };
+ }
+ var endlocstr = tasklist.parameters.dst;
+
+ //鍒涘缓鎵樼洏璐т綅缁戝畾鍏崇郴
+ string trayCode = ContainerHelper.GenerateCntrNo();
+ //缁戝畾璧风偣璐т綅(浜х嚎)鍜岀墿鏂�+ ContainerHelper.BindLocCntrsXm(startloc.S_CODE, trayCode, tasklist.parameters.sku, "", tasklist.parameters.BatchNo, tasklist.parameters.issueMode, tasklist.parameters.num);
+
+ var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startloc.S_CODE).First();
+ //鍒涘缓浠诲姟
+ LogHelper.Info($"鍒涘缓浠诲姟 璧风偣:{startloc.S_CODE}缁堢偣:{endlocstr}", "inbound");
+ var res = TaskProcess.CreateTransportDj(startloc.S_CODE, endlocstr, "inbound", locCntrRel.S_CNTR_CODE, tasklist.order_name, 1, 1);
+ if (!res)
+ {
+ return new TaskResponse
+ {
+ header = new ResponseHead { code = 1, desc = Message }
+ };
+
+ }
+
+ }
+
+ }
+ var result = new TaskResponse();
+ if (Message != null)
+ {
+ result = new TaskResponse
+ {
+ header = new ResponseHead { code = 0, desc = Message }
+ };
+ }
+ else
+ {
+ result = new TaskResponse
+ {
+ header = new ResponseHead { code = 200, desc = "SUCCESS" },
+ body = new ResponseBody
+ {
+ msg = "success",
+ app_name = "Guozi client",
+ data = new List<ResponseData> { new ResponseData { in_order_id = model.taskList[0].taskID } },
+ version = ""
+ }
+ };
+ }
+ return result;
+
+
+
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine("smallMaterial:" + ex.Message + ex.StackTrace);
+ LogHelper.Error("smallMaterial:" + ex.Message, ex);
+ throw;
+ }
+ }
+
}
--
Gitblit v1.9.1