From eaefefa5c4cf5ce403ce5f0dcf09a5ad21837e43 Mon Sep 17 00:00:00 2001
From: zxx <Zxx@HanInfo>
Date: 星期一, 07 七月 2025 17:34:44 +0800
Subject: [PATCH] 1
---
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs | 234 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 120 insertions(+), 114 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 d03940d..873b432 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -140,6 +140,12 @@
if (state == 7)
{
CacheBitCancelUpdate(mst);
+ ////灏忕背璁㈠崟鍙栨秷
+ //CancelModel cancelModel = new CancelModel();
+ //cancelModel.order_id = mst.S_WORKSHOP_NO;
+ //cancelModel.order_command_type_id = "2";
+ //RcsHelper.CancelOrder(cancelModel);
+
}
}
@@ -385,7 +391,7 @@
{
string src = $"\"src\":\"{mst.S_START_LOC}\",";
string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
- string carrier_type_id = $"\"carrier_type_id\":\"-99\"";
+ string carrier_type_id = $"\"carrier_type_id\":\"1\"";
string parmeS = "{";
string parmeD = "}";
string parme = parmeS + src + dst + carrier_type_id + parmeD;
@@ -461,6 +467,7 @@
var result = false;
var trayCodes = cntrs;
var taskNo = DateTime.Now.Ticks.ToString();
+
var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName,trayCarryCount, startLayer, endLayer);
@@ -1076,125 +1083,124 @@
}
- public static TaskResponse smallMaterial(smallMaterial model) {
- var db = new SqlHelper<Location>().GetInstance();
+ //public static TaskResponse smallMaterial(smallMaterial model) {
+ // var db = new SqlHelper<Location>().GetInstance();
- string Message = null;
+ // string Message = null;
- //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背wcs浼狅級涓�澶�- var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.parameters[0].src).First();
+ // //鎷嗗垎鎴愪袱鏉′换鍔★紝涓�潯鏄枡鏋跺埌鎸囧畾鐨勭紦瀛樺尯锛屼簩鏄枡鏋朵笂鐨勬墭鐩樺埌鎸囧畾鐨勫伐浣嶏紙灏忕背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.parameters[0].src}搴撲綅宸茶閿佸畾!" }
- };
- }
- var endReservoirs = Settings.ReservoirAreas.Where(s => s.areaName == model.routeType).FirstOrDefault();
- var endLoc = TaskProcess.InWorkTransport(endReservoirs.areaCode);
- 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")
- {
- //搴旇缁曡矾
+ // 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鍒涘缓澶辫触" }
- };
- }
+ // 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鍒涘缓澶辫触" }
+ // };
+ // }
- }
+ // }
- }
- }
- 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;
- }
+ // }
+ // }
+ // 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;
+ //}
--
Gitblit v1.9.1