From b2c8747a85762bc32f310a31fe84cad69b61104a Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期二, 10 六月 2025 17:32:46 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 786 ++++++++++++++++++++++++++++---------------------------
1 files changed, 396 insertions(+), 390 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
index b36f7c1..a2e791d 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -36,11 +36,13 @@
#region 浣抽�鍚堣偉鎺ュ彛涓氬姟
+ public static object _lockCreateTask = new object();
/// <summary>
/// 绔嬪簱浠诲姟涓嬪彂=銆嬪垱寤轰换鍔� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
+
internal static Result Createtask(CreateTask model)
{
Result result = new Result() { code = "0", msg = "鍒涘缓鎴愬姛" };
@@ -117,267 +119,94 @@
Location endloc = new Location();
Location startloc = new Location();
-
- if (taskData.taskType == 1) //鍑哄簱娴佺▼锛岄�杩囩墿鏂欐満鍙拌绠楃嚎杈硅揣浣�+ lock (_lockCreateTask)
{
- note = "鍑哄簱";
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
+ if (taskData.taskType == 1) //鍑哄簱娴佺▼锛岄�杩囩墿鏂欐満鍙拌绠楃嚎杈硅揣浣� {
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- Start = taskData.pickStation;
- if (CreateCntrIteminfo(partData, taskData))
+ note = "鍑哄簱";
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
{
- endloc = Computeloc(CntrCode, taskData.dropStation, taskData.carrierType);
- if (endloc != null)
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ Start = taskData.pickStation;
+ if (CreateCntrIteminfo(partData, taskData))
{
- End = endloc.S_CODE;
+ endloc = Computeloc(CntrCode, taskData.dropStation, taskData.carrierType);
+ if (endloc != null)
+ {
+ End = endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏈哄彴缂栫爜:{taskData.dropStation}锛屾湭鎵惧埌鍙敤璐т綅";
+ AddErrorInfo("瀵绘壘鍑哄簱璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
}
else
{
result.code = "1";
- result.msg = $"鏈哄彴缂栫爜:{taskData.dropStation}锛屾湭鎵惧埌鍙敤璐т綅";
- AddErrorInfo("瀵绘壘鍑哄簱璐т綅澶辫触", result.msg, Source);
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
return result;
}
}
else
{
+
result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
- return result;
+ result.msg = $"Putin==> 浠诲姟璧风偣:{taskData.pickStation}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
}
}
- else
+ else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
{
-
- result.code = "1";
- result.msg = $"Putin==> 浠诲姟璧风偣:{taskData.pickStation}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- }
- }
- else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
- {
- note = "鍏ュ簱";
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = startloc.S_CODE;
- var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
- if (CntrRel != null)
+ note = "鍏ュ簱";
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
{
- CntrCode = CntrRel.S_CNTR_CODE;
+ Start = startloc.S_CODE;
+ var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
+ if (CntrRel != null)
+ {
+ CntrCode = CntrRel.S_CNTR_CODE;
+ }
+ //else
+ //{
+ // result.code = "1";
+ // result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ // AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
+ // return result;
+ //}
+
}
- //else
- //{
- // result.code = "1";
- // result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- // AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
- // return result;
- //}
-
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
-
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 3)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛�- {
- note = "鍑哄簱";
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = taskData.pickStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{taskData.dropStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 4)//鍘熸潗鏂欏簱闇�鍒ゆ柇鏄惁闇�鍒嗛厤鐢垫浠诲姟,鍒涘缓鍒嗘。浠诲姟
- {
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = taskData.pickStation;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
-
- //鍒ゆ柇妤煎眰鏄惁鐩哥瓑锛屽鏋滀笉鐩稿悓闇�鐢熸垚鍒嗘浠诲姟杩涜鐢垫璋冪敤
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
- var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE).First();
- var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE).First();
- if (startArea == null || endArea == null)
+ else
{
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣锛歿endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
return result;
}
- if (startArea.N_FLOOR == endArea.N_FLOOR)
+
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
{
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- Z_TYPE = n_type,
-
-
- };
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask))
- {
- // LocationHelper.LockLoc(End, 2);
-
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- }
- else
- {
- result.code = "1";
- result.msg = $"浠诲姟鍒涘缓澶辫触";
- AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
- return result;
- }
+ End = taskData.dropStation;
}
- else if (startArea.N_FLOOR != endArea.N_FLOOR)
+ else
{
- //妤煎眰鐢垫鍒嗛厤
- var elevatorLoc = LocationHelper.GetElevatorLoc();
-
- if (elevatorLoc != null)
- { //鍒涘缓wcs鍒嗘浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫1",
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = elevatorLoc.S_CODE,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = elevatorLoc.S_WH_CODE,
- S_END_AREA = elevatorLoc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- Z_TYPE = n_type,
- S_MES_NO = taskData.mesTaskNo
- };
- var wcsTask1 = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫2",
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = elevatorLoc.S_CODE,
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = elevatorLoc.S_WH_CODE,
- S_START_AREA = elevatorLoc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- S_WMS_NO = taskData.wmsTaskNo,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- Z_TYPE = n_type,
- S_MES_NO = taskData.mesTaskNo
-
- };
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
- {
-
- // LocationHelper.LockLoc(Start, 1);
- //LocationHelper.LockLoc(End, 2);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- }
- else
- {
- result.code = "1";
- result.msg = $"浠诲姟鍒涘缓澶辫触";
- AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
- return result;
- }
- }
-
-
-
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
}
}
- else
+ else if (taskData.taskType == 3)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛� {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
- }
- }
- else if (taskData.taskType == 5)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛屽苟缁戝畾鎵樼洏
- {
- note = "鍑哄簱";
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- if (CreateCntrIteminfo(partData, taskData))
- {
+ note = "鍑哄簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
@@ -403,197 +232,373 @@
return result;
}
}
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
- return result;
- }
-
- }
- //鏆傚瓨浣嶅洖搴�- else if (taskData.taskType == 6)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟
- {
- note = "鍏ュ簱";
- //鏍规嵁鎵樼洏鍙锋壘璐т綅
- var CntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == partData.rfid).First();
- if (CntrRel != null)
- {
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == CntrRel.S_LOC_CODE).First();
- if (startloc != null)
- {
- Start = startloc.S_CODE;
- CntrCode = CntrRel.S_CNTR_CODE;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁鎵樼洏{partData.rfid},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- //鐐瑰搴撳尯
- else if (taskData.taskType == 7)//寮傚父浣�- {
- note = "寮傚父搴撳尯鍏ュ簱";
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- if (CreateCntrIteminfo(partData, taskData))
+ else if (taskData.taskType == 4)//鍘熸潗鏂欏簱闇�鍒ゆ柇鏄惁闇�鍒嗛厤鐢垫浠诲姟,鍒涘缓鍒嗘。浠诲姟
{
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
Start = taskData.pickStation;
}
- var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == taskData.dropStation).ToList();
- if (EndLocs.Count > 0)
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
{
- endloc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
- if (endloc != null)
+ End = taskData.dropStation;
+ }
+
+ //鍒ゆ柇妤煎眰鏄惁鐩哥瓑锛屽鏋滀笉鐩稿悓闇�鐢熸垚鍒嗘浠诲姟杩涜鐢垫璋冪敤
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ {
+ var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE).First();
+ var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE).First();
+ if (startArea == null || endArea == null)
{
- End = endloc.S_CODE;
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣锛歿endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ if (startArea.N_FLOOR == endArea.N_FLOOR)
+ {
+ //鍒涘缓wcs浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ Z_TYPE = n_type,
+
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ // LocationHelper.LockLoc(End, 2);
+
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else if (startArea.N_FLOOR != endArea.N_FLOOR)
+ {
+ //妤煎眰鐢垫鍒嗛厤
+ var elevatorLoc = LocationHelper.GetElevatorLoc();
+
+ if (elevatorLoc != null)
+ { //鍒涘缓wcs鍒嗘浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鐢垫1",
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ S_END_LOC = elevatorLoc.S_CODE,
+ N_CNTR_COUNT = 1,
+ S_START_WH = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = elevatorLoc.S_WH_CODE,
+ S_END_AREA = elevatorLoc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ Z_TYPE = n_type,
+ S_MES_NO = taskData.mesTaskNo
+ };
+ var wcsTask1 = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鐢垫2",
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = elevatorLoc.S_CODE,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = elevatorLoc.S_WH_CODE,
+ S_START_AREA = elevatorLoc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ S_WMS_NO = taskData.wmsTaskNo,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ Z_TYPE = n_type,
+ S_MES_NO = taskData.mesTaskNo
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
+ {
+
+ // LocationHelper.LockLoc(Start, 1);
+ //LocationHelper.LockLoc(End, 2);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+
+
+
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ return result;
+ }
+ }
+ else if (taskData.taskType == 5)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛屽苟缁戝畾鎵樼洏
+ {
+ note = "鍑哄簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ if (CreateCntrIteminfo(partData, taskData))
+ {
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
+ {
+ Start = taskData.pickStation;
}
else
{
result.code = "1";
- result.msg = $"缁堢偣搴撳尯锛歿taskData.dropStation}鏃犲彲鐢ㄨ揣浣�;
+ result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{taskData.dropStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
+ return result;
+ }
+
+ }
+ //鏆傚瓨浣嶅洖搴�+ else if (taskData.taskType == 6)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟
+ {
+ note = "鍏ュ簱";
+ //鏍规嵁鎵樼洏鍙锋壘璐т綅
+ var CntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == partData.rfid).First();
+ if (CntrRel != null)
+ {
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == CntrRel.S_LOC_CODE).First();
+ if (startloc != null)
+ {
+ Start = startloc.S_CODE;
+ CntrCode = CntrRel.S_CNTR_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁鎵樼洏{partData.rfid},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ //鐐瑰搴撳尯
+ else if (taskData.taskType == 7)//寮傚父浣�+ {
+ note = "寮傚父搴撳尯鍏ュ簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ if (CreateCntrIteminfo(partData, taskData))
+ {
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
+ {
+ Start = taskData.pickStation;
+ }
+ var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == taskData.dropStation).ToList();
+ if (EndLocs.Count > 0)
+ {
+ endloc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
+ if (endloc != null)
+ {
+ End = endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"缁堢偣搴撳尯锛歿taskData.dropStation}鏃犲彲鐢ㄨ揣浣�;
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣搴撳尯锛歿taskData.dropStation},鏈壘鍒板搴旇揣浣�;
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
-
}
else
{
result.code = "1";
- result.msg = $"鏍规嵁缁堢偣搴撳尯锛歿taskData.dropStation},鏈壘鍒板搴旇揣浣�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
return result;
}
}
- else
+ else if (taskData.taskType == 8)//鍙犵洏鏈虹┖鎵樺洖搴� {
- result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 8)//鍙犵洏鏈虹┖鎵樺洖搴�- {
- note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = startloc.S_CODE;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣:{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣:{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else
- {
- LogHelper.Info($"Createtask==> 浠诲姟绫诲瀷鏈夎");
- result.code = "1";
- result.msg = "浠诲姟绫诲瀷锛歿taskData.taskType}涓嶅湪瑙勫畾鑼冨洿鍐�;
- AddErrorInfo("浠诲姟绫诲瀷閿欒", result.msg, Source);
- }
- if (taskData.taskType != 4)
- {
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
- if (startloc.N_LOCK_STATE != 0)
+ note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
{
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
- AddErrorInfo("璐т綅鏈夐攣", result.msg);
- return result;
- }
- var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE.Trim()).First();
- var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE.Trim()).First();
- if (startArea == null || endArea == null)
- {
- LogHelper.Info($"璧风偣锛歿JsonConvert.SerializeObject(startArea)}");
- LogHelper.Info($"缁堢偣锛歿JsonConvert.SerializeObject(endArea)}");
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣{endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
- AddErrorInfo("搴撳尯鏌ユ壘澶辫触", result.msg);
- return result;
- }
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- Z_TYPE = n_type,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- S_NOTE = note,
- S_MES_NO = taskData.mesTaskNo
-
- };
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask))
- {
- // LocationHelper.LockLoc(Start, 2);
- //LocationHelper.LockLoc(End, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ Start = startloc.S_CODE;
}
else
{
result.code = "1";
- result.msg = $"浠诲姟鍒涘缓澶辫触";
- AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ result.msg = $"鏍规嵁璧风偣:{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣:{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
return result;
}
}
else
{
+ LogHelper.Info($"Createtask==> 浠诲姟绫诲瀷鏈夎");
result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
+ result.msg = "浠诲姟绫诲瀷锛歿taskData.taskType}涓嶅湪瑙勫畾鑼冨洿鍐�;
+ AddErrorInfo("浠诲姟绫诲瀷閿欒", result.msg, Source);
+ }
+ if (taskData.taskType != 4)
+ {
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ {
+ if (startloc.N_LOCK_STATE != 0)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ return result;
+ }
+ var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE.Trim()).First();
+ var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE.Trim()).First();
+ if (startArea == null || endArea == null)
+ {
+ LogHelper.Info($"璧风偣锛歿JsonConvert.SerializeObject(startArea)}");
+ LogHelper.Info($"缁堢偣锛歿JsonConvert.SerializeObject(endArea)}");
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣{endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ AddErrorInfo("搴撳尯鏌ユ壘澶辫触", result.msg);
+ return result;
+ }
+ //鍒涘缓wcs浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = startloc.S_WH_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ Z_TYPE = n_type,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ S_NOTE = note,
+ S_MES_NO = taskData.mesTaskNo
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ // LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ return result;
+ }
}
}
+
return result;
}
@@ -1403,6 +1408,7 @@
string areacode = "";
string cntrcode = "";
Location startloc = new Location();
+ // startloc = LocationHelper.GetLocByAreacode(areacode, model.CarrierType);
#endregion
try
@@ -2410,14 +2416,14 @@
DeviceInfoModel device = new DeviceInfoModel();
List<DeviceInfos> deviceInfos = new List<DeviceInfos>();//鍙犵洏鏈烘姤閿欎俊鎭�- List<AgvInfos> agvInfos = new List<AgvInfos>();//agv鎶ラ敊淇℃伅
+ // List<AgvInfos> agvInfos = new List<AgvInfos>();//agv鎶ラ敊淇℃伅
//鑾峰彇鍐呭瓨涓彔鐩樻満鐨勬姤閿欎俊鎭� foreach (var dpjInfo in DeviceProcess.DpjInfoDirectory)
{
deviceInfos.Add(new DeviceInfos() { Device = dpjInfo.Value.DeviceName, DeviceInfo = dpjInfo.Value.ErrorInfo });
}
- device.DeviceInfos = deviceInfos;
+ // device.DeviceInfos = deviceInfos;
//鑾峰彇杞﹁締鎶ヨ淇℃伅
var agvDeviceInfo = db.Queryable<HangChaAGV>().ToList();
if (agvDeviceInfo.Count > 0)
@@ -2429,10 +2435,10 @@
foreach (var agv in agvDeviceInfo)
{
string agvErrorInfo = GetAgvAlarmSendCodeTwo(agv.agvErrCode, agv.errCode2, agv.faildCode);
- agvInfos.Add(new AgvInfos() { AgvNo = agv.agvNo, AgvInfo = agvErrorInfo });
+ deviceInfos.Add(new DeviceInfos() { AgvNo = agv.agvNo, AgvInfo = agvErrorInfo });
}
}
- device.AgvInfos = agvInfos;
+ device.DeviceInfos = deviceInfos;
return device;
}
--
Gitblit v1.9.1