From 83a7b2db0150d30576461055707367e8189ebc6e Mon Sep 17 00:00:00 2001
From: 海波 张 <2956280567@qq.com>
Date: 星期三, 25 六月 2025 17:29:08 +0800
Subject: [PATCH] 交互修改
---
process/TaskProcess.cs | 357 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 248 insertions(+), 109 deletions(-)
diff --git a/process/TaskProcess.cs b/process/TaskProcess.cs
index c847b92..86cec16 100644
--- a/process/TaskProcess.cs
+++ b/process/TaskProcess.cs
@@ -59,7 +59,7 @@
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}");
+ LogHelper.Info($"浠诲姟{mst.S_CODE} 璐т綅{mst.S_END_LOC}鍗歌揣瀹屾垚锛岀粓鐐圭粦瀹氬鍣▄mst.S_CNTR_CODE}");
LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
}
@@ -141,7 +141,17 @@
else if (state == 1004) {
LogHelper.Info($"绛夊緟浜や簰锛屼换鍔″彿={mst.S_CODE}", "瀹夊叏浜や簰");
- var wcsCode = mst.S_CODE.Replace(@"_1", "_2");
+ var wcsCode = "";
+
+ if (mst.S_TYPE.Contains("鍏ュ簱")|| mst.S_TYPE.Contains("鍥炲簱"))
+ {
+ wcsCode = mst.S_CODE.Replace(@"_1", "_2");
+ }
+
+ if (mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ wcsCode = mst.S_CODE.Replace(@"_2", "_1");
+ }
LogHelper.Info($"绛夊緟浜や簰锛屾煡璇㈡牎楠屼换鍔″彿={wcsCode}", "瀹夊叏浜や簰");
//绛夊緟rfid鏍￠獙
@@ -152,7 +162,16 @@
{
if (rfidFlag.S_RESULT.Contains("鎴愬姛"))
{
- LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟", "瀹夊叏浜や簰");
+ LogHelper.Info($"浠诲姟鍙�{mst.S_CODE}锛岀瓑寰呬氦绠℃垚鍔燂紝淇敼鍙傛暟6涓�", "瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
+ }
+ else {
+ var startSite = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
+ var endSite = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
+ LogHelper.Info($"浠诲姟{mst.S_CODE}RFID鏍￠獙澶辫触锛屾敼鍙傛暟1涓簕startSite},鏀瑰弬鏁�涓簕endSite}锛屽弬鏁�涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(mst.S_CODE, 1, startSite);
+ NDCApi.ChangeOrderParam(mst.S_CODE, 2, endSite);
+ NDCApi.ChangeOrderParam(mst.S_CODE, 4, "0");
NDCApi.ChangeOrderParam(mst.S_CODE, 6, "1");
}
}
@@ -227,28 +246,32 @@
//鏌ユ壘缁欏畾缁堢偣
var end = LocationHelper.GetLoc(kt.Location_To);
- //LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鏀归亾缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
- //if (end == null || end.S_LOCK_STATE != "鏃�)
- //{
- // LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鏀归亾缁堢偣澶辫触锛岀粓鐐�{kt.Location_To},娌℃壘鍒版垨鏈夐攣", "鏀归亾瀹夊叏浜や簰");
- //}
- TaskHelper.Fail(wcsTask);
- TaskProcess.OperateStatus(wcsTask, 7);
- LocationHelper.LockLoc(end.S_CODE, "鍏ュ簱閿�, 1);
- db.BeginTran();
- //鏀逛竴娈典换鍔＄粓鐐�- task.S_END_LOC = end.S_CODE;
- task.S_END_AREA = end.S_AREA_CODE;
- db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC,it.S_END_AREA}).ExecuteCommand();
- kt.Status = "Y";
- db.Updateable(kt).UpdateColumns(it => new { it.Status }).ExecuteCommand();
- db.CommitTran();
- var site = LocationHelper.GetAgvSiteZc(end.S_CODE);
- LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
- NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
- NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
- NDCApi.ChangeOrderParam(task.S_CODE, 4, "0");
- return;
+ if (end.S_LOCK_STATE=="鏃� && end.N_CURRENT_NUM==0)
+ {
+ //LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鏀归亾缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
+ //if (end == null || end.S_LOCK_STATE != "鏃�)
+ //{
+ // LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鏀归亾缁堢偣澶辫触锛岀粓鐐�{kt.Location_To},娌℃壘鍒版垨鏈夐攣", "鏀归亾瀹夊叏浜や簰");
+ //}
+ TaskHelper.Fail(wcsTask);
+ TaskProcess.OperateStatus(wcsTask, 7);
+ LocationHelper.LockLoc(end.S_CODE, "鍏ュ簱閿�, 1);
+ db.BeginTran();
+ //鏀逛竴娈典换鍔＄粓鐐�+ task.S_END_LOC = end.S_CODE;
+ task.S_END_AREA = end.S_AREA_CODE;
+ db.Updateable(task).UpdateColumns(it => new { it.S_END_LOC, it.S_END_AREA }).ExecuteCommand();
+ kt.Status = "Y";
+ db.Updateable(kt).UpdateColumns(it => new { it.Status }).ExecuteCommand();
+ db.CommitTran();
+ var site = LocationHelper.GetAgvSiteZc(end.S_CODE);
+ LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
+ NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
+ NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
+ NDCApi.ChangeOrderParam(task.S_CODE, 4, "0");
+ return;
+ }
+
}
}
@@ -259,16 +282,25 @@
var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == wcsTask.S_END_AREA && x.status == "0" && x.roadWay == loc1.N_ROADWAY.ToString()).First();
if (rowdwa == null)
{
- LogHelper.Info($"鍒ゆ柇宸烽亾鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤,涓嶉渶瑕佹敼閬�, "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鍒ゆ柇宸烽亾鍙敤,褰撳墠搴撳尯{wcsTask.S_END_AREA}褰撳墠宸烽亾{loc1.N_ROADWAY}鍙敤,涓嶉渶瑕佹敼閬�, "鏀归亾瀹夊叏浜や簰");
}
else
{
- LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾", "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾", "鏀归亾瀹夊叏浜や簰");
var endLoc = LocationHelper.GetLocOne(wcsTask.S_END_LOC);
+ List<Location> endList;
+ if (!string.IsNullOrEmpty(workFlow.ZONECODE))
+ {
+ endList = LocationHelper.GetZoneLoc(workFlow.ZONECODE);
+ }
+ else
+ {
+ endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
+ }
- var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
+
var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
- LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝闇�鏀归亾锛屾柊缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}锛屽綋鍓嶅贩閬撲笉鍙敤锛岄渶瑕佹敼閬擄紝鏂扮粓鐐逛俊鎭� + JsonConvert.SerializeObject(end), "鏀归亾瀹夊叏浜や簰");
if (end == null)
{
LogHelper.Info($"褰撳墠宸烽亾涓嶅彲鐢紝缁堢偣搴撳尯{workFlow.ENDAREA},娌℃壘鍒扮粓鐐�, "鏀归亾瀹夊叏浜や簰");
@@ -297,9 +329,9 @@
{
flag = false;
- LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鎺ラ┏浣峽con.S_CODE}鍙敤锛屼笉闇�鏀归亾锛岀洿鎺ヤ慨鏀瑰弬鏁�涓�锛�涓�", "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"褰撳墠浠诲姟{task.S_CODE}鎺ラ┏浣峽con.S_CODE}鍙敤锛屼笉闇�鏀归亾锛岀洿鎺ヤ慨鏀瑰弬鏁�涓�锛�涓�024", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
- NDCApi.ChangeOrderParam(task.S_CODE, 4, "0");
+ NDCApi.ChangeOrderParam(task.S_CODE, 4, "1024");
break;
}
}
@@ -351,9 +383,9 @@
db.CommitTran();
var site = LocationHelper.GetAgvSiteZc(loc.S_CODE);
- LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�,4涓�024", "鏀归亾瀹夊叏浜や簰");
+ LogHelper.Info($"浠诲姟{task.S_CODE}鏀归亾鎴愬姛锛屾敼鍙傛暟2涓簕site},鍙傛暟6涓�,4涓�024", "鏀归亾瀹夊叏浜や簰");
NDCApi.ChangeOrderParam(task.S_CODE, 2, site);
- NDCApi.ChangeOrderParam(task.S_CODE, 6, "1");
+ NDCApi.ChangeOrderParam(task.S_CODE, 6, "2");
NDCApi.ChangeOrderParam(task.S_CODE, 4, "1024");
//} else if (workFlow.FLOWNAME.Contains("鍑哄簱")) {
@@ -437,6 +469,23 @@
LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}", "NDC");
+
+ if (mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ var wcsTask = TaskHelper.GetTaskByWork("wcs", mst.S_OP_CODE);
+ if (wcsTask == null) {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屾病鎵惧埌浣滀笟:{mst.S_OP_CODE}瀵瑰簲鐨勫嚭搴撲换鍔�, "NDC");
+ return false;
+ }
+
+ if (wcsTask.S_B_STATE=="鏈墽琛�)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屽搴旂殑Wcs鍑哄簱浠诲姟鏈墽琛岋紝鏆備笉鎺ㄩ�", "NDC");
+ return false;
+ }
+ }
+
+
start = LocationHelper.GetAgvSiteZc(mst.S_START_LOC);
end = LocationHelper.GetAgvSiteZc(mst.S_END_LOC);
@@ -446,7 +495,32 @@
ndcParme.Add(new param() { name = "From", value = start.ToString() });
ndcParme.Add(new param() { name = "To", value = end.ToString() });
ndcParme.Add(new param() { name = "FUNC", value = "0" });
- ndcParme.Add(new param() { name = "DATA", value = "0" });
+
+
+ var work = TaskHelper.GetWmsWork(mst.S_OP_CODE);
+ if (work==null)
+ {
+ LogHelper.Info($"鎺ㄩ�浠诲姟{mst.S_CODE}锛屾病鎵惧埌浣滀笟:{mst.S_OP_CODE}", "NDC");
+ return false;
+ }
+
+ if (string.IsNullOrEmpty(work.CONNECTION))
+ {
+ ndcParme.Add(new param() { name = "DATA", value = "0" });
+ }
+ else {
+ if (work.S_TYPE.Contains("鍏ュ簱") || work.S_TYPE.Contains("鍥炲簱"))
+ {
+ ndcParme.Add(new param() { name = "DATA", value = "768" });
+ }
+ else {
+ ndcParme.Add(new param() { name = "DATA", value = "0" });
+ }
+ }
+
+
+
+
ndcParme.Add(new param() { name = "Ctype", value = "0" });
@@ -770,6 +844,10 @@
}
db.CommitTran();
LogHelper.Info("缁戝畾瑙ｇ粦", "缁撴潫");
+ result.errMsg = "瑙ｇ粦瀹屾垚";
+ result.errCode = 0;
+ result.success = true;
+ return result;
}
}
catch (Exception e)
@@ -778,6 +856,7 @@
LogHelper.Info("鐗╂枡缁戝畾瑙ｇ粦寮傚父:" + e.Message, "鐗╂枡缁戝畾瑙ｇ粦");
result.errMsg = "鐗╂枡缁戝畾瑙ｇ粦寮傚父";
result.errCode = 1;
+ result.success = false;
return result;
}
return result;
@@ -1094,7 +1173,7 @@
result.success = false;
return result;
}
- var endTask = TaskHelper.GetTaskByStartLoc(zd);
+ var endTask = TaskHelper.GetTaskByEndLoc(zd);
if (endTask != null)
{
result.errMsg = "缁堢偣鏈夋墽琛屼腑浠诲姟";
@@ -1263,9 +1342,6 @@
}
-
-
-
//鎵樼洏鏄庣粏鏁伴噺
var cntrCount = 1;
@@ -1327,23 +1403,6 @@
//濡傛灉闇�涓嬪彂wcs绔嬪簱锛屽垯闇�瀵绘壘鍙敤鎺ラ┏浣� if (workFlow.SENDWCS == "Y") {
- //娴嬭瘯榛樿鍙栦竴涓帴椹充綅
- //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
- //foreach (var item in connectionList)
- //{
- // if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM < 2)
- // {
- // connection = item.S_CODE;
- // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
- // }
- //}
-
- //if (connection=="")
- //{
- // LogHelper.Info($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- // throw new Exception($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
- //}
-
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
var usableConnectionList = WcsTask.WcsPositionAvailable(model.task_no, connectionList);
@@ -1351,6 +1410,8 @@
{
//鏍规嵁鎺ラ┏浣嶄换鍔℃暟閲忚幏鍙栧潎琛℃帴椹充綅闆嗗悎浼樺厛浠诲姟鏁板皯鐨勬帴椹充綅
var balanceConnectionList = LocationHelper.GetBalanceConnectionList(usableConnectionList.available);
+
+ LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍧囪 鎺ラ┏浣�+JsonConvert.SerializeObject(balanceConnectionList), "Mes浠诲姟涓嬪彂");
foreach (var item in balanceConnectionList)
{
if (item.loc.N_CURRENT_NUM<2)
@@ -1548,6 +1609,14 @@
//鍒涘缓浣滀笟
if (WMSHelper.CreateWmsWork(operation))
{
+ if (connection != "")
+ {
+ LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ LocationHelper.LockLoc(operation.CONNECTION, "鍏朵粬閿�, 3);
+ }
+
+
LogHelper.Info($"ZCSendTask鍏ュ簱浣滀笟鍒涘缓鎴愬姛{operation.S_CODE}", "Mes浠诲姟涓嬪彂");
result.errMsg = "鍏ュ簱浣滀笟鍒涘缓鎴愬姛";
result.errCode = 0;
@@ -1581,11 +1650,38 @@
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂缁堢偣淇℃伅" + JsonConvert.SerializeObject(end), "Mes浠诲姟涓嬪彂");
- if (end == null || end.S_LOCK_STATE != "鏃�)
+ if (end == null)
{
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛岀粓鐐�{model.Location_To},娌℃壘鍒版垨鏈夐攣", "Mes浠诲姟涓嬪彂");
- throw new Exception($"缁堢偣:{model.Location_To},娌℃壘鍒版垨鏈夐攣");
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛岀粓鐐�{model.Location_To},娌℃壘鍒�, "Mes浠诲姟涓嬪彂");
+ throw new Exception($"缁堢偣:{model.Location_To},娌℃壘鍒�);
}
+
+
+ var unlimitedLocation = TaskHelper.GetMesKtLoc();
+
+ //鏍囪缁堢偣璐т綅鏄惁鍙互鏃犻檺鍒朵笅浠诲姟
+ var endLocFlag = true;
+
+ foreach (var item in unlimitedLocation)
+ {
+ //鍑哄簱缁堢偣璐т綅鍦ㄩ厤缃噷 鍙互鏃犻檺鍒朵笅浠诲姟
+ if (item.Loc.Contains(model.Location_To))
+ {
+ endLocFlag = false;
+ break;
+ }
+ }
+
+ if (endLocFlag)
+ {
+ var endTask = TaskHelper.GetTaskByEndLoc(model.Location_To);
+ if (endTask != null)
+ {
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛岀粓鐐�{model.Location_To}鏈変换鍔℃墽琛屼腑锛屼换鍔″彿:{endTask.S_CODE}", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"缁堢偣:{model.Location_To}鏈変换鍔℃墽琛屼腑锛屼换鍔″彿:{endTask.S_CODE}");
+ }
+ }
+
//鏌ユ壘璧风偣
@@ -1625,6 +1721,10 @@
result.errMsg = "婊℃墭鍑哄簱浣滀笟鏈夊簱瀛樹絾璁惧鎶ヨ";
result.errCode = 2001;
result.success = true;
+ mesRes.errCode = result.errCode;
+ mesRes.errMsg = result.errMsg;
+ //淇濆瓨mes璁板綍
+ CreatMesRes(mesRes);
return result;
}
}
@@ -1634,36 +1734,36 @@
}
else if (workFlow.FLOWCODE == "7") {
//瀵绘壘绔嬪簱鍖虹┖鎵�- start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
- if (start == null)
- {
- strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
- var itemFlag = LocationHelper.FindStartcolByLoclistAndcntrFlag(strrtList, workFlow.STARTAREA);
- LogHelper.Info($"ZCSendTask绌烘墭鍑哄簱浠诲姟娌℃壘鍒拌捣鐐癸紝鏍￠獙鏄惁鏈夊簱瀛樹絾鏄澶囨姤璀itemFlag}", "Mes浠诲姟涓嬪彂");
+ //start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
+ //if (start == null)
+ //{
+ // strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
+ // var itemFlag = LocationHelper.FindStartcolByLoclistAndcntrFlag(strrtList, workFlow.STARTAREA);
+ // LogHelper.Info($"ZCSendTask绌烘墭鍑哄簱浠诲姟娌℃壘鍒拌捣鐐癸紝鏍￠獙鏄惁鏈夊簱瀛樹絾鏄澶囨姤璀itemFlag}", "Mes浠诲姟涓嬪彂");
- if (itemFlag)
+ // if (itemFlag)
+ // {
+ // result.errMsg = "绌烘墭鍑哄簱浣滀笟鏈夊簱瀛樹絾璁惧鎶ヨ";
+ // result.errCode = 2001;
+ // result.success = true;
+ // return result;
+ // }
+ //}
+
+ //绌烘墭鍑哄厛缂撳瓨鍒扮┖鎵樿〃
+
+ //鍏堟煡璇㈡湁娌℃湁鍚岀粓鐐圭紦瀛樼殑璁板綍
+
+ if (endLocFlag) {
+ var ktTask = TaskHelper.GetMesKtTask(end.S_CODE);
+ if (ktTask != null)
{
- result.errMsg = "绌烘墭鍑哄簱浣滀笟鏈夊簱瀛樹絾璁惧鎶ヨ";
- result.errCode = 2001;
- result.success = true;
- return result;
+ LogHelper.Info($"ZCSendTask绌烘墭鍑虹紦瀛樺け璐�缁堢偣{end.S_CODE}宸叉湁缂撳瓨", "Mes浠诲姟涓嬪彂");
+ throw new Exception($"ZCSendTask绌烘墭鍑虹紦瀛樺け璐�缁堢偣{end.S_CODE}宸叉湁缂撳瓨");
}
}
- }
-
- LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
-
- if (workFlow.FLOWCODE == "7" && start == null)
- {
- //绌烘墭鍑烘病鎵惧埌璧风偣锛屽厛缂撳瓨鍒扮┖鎵樿〃
-
- //鍏堟煡璇㈡湁娌℃湁鍚岀粓鐐规湭缂撳瓨鐨勮褰�-
- var ktTask = TaskHelper.GetMesKtTask(end.S_CODE);
- if (ktTask != null) {
- throw new Exception($"ZCSendTask绌烘墭鍑虹紦瀛樺け璐�缁堢偣{end.S_CODE}宸叉湁缂撳瓨");
- }
+
MesKtTask req = new MesKtTask()
{
@@ -1672,7 +1772,8 @@
Priority = model.Priority,
CreateDate = DateTime.Now,
BUSI_TYPE = model.BUSI_TYPE,
- TOOLS_TPYE = model.TOOLS_TPYE,
+ TOOLS_TPYE = TOOLSTYPE,
+ task_no=model.task_no,
Status = "N"
};
@@ -1682,6 +1783,10 @@
result.errMsg = "绌烘墭鍑哄簱缂撳瓨鎴愬姛";
result.errCode = 0;
result.success = true;
+ mesRes.errCode = result.errCode;
+ mesRes.errMsg = result.errMsg;
+ //淇濆瓨mes璁板綍
+ CreatMesRes(mesRes);
return result;
}
else
@@ -1689,17 +1794,17 @@
LogHelper.Info($"ZCSendTask绌烘墭鍑虹紦瀛樺け璐�, "Mes浠诲姟涓嬪彂");
throw new Exception($"ZCSendTask绌烘墭鍑虹紦瀛樺け璐�);
}
-
-
-
}
- else {
+
+
+ LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂璧风偣淇℃伅" + JsonConvert.SerializeObject(start), "Mes浠诲姟涓嬪彂");
+
if (start == null)
{
LogHelper.Info($"ZCSendTask鍑哄簱浠诲姟涓嬪彂澶辫触锛岃捣鐐瑰簱鍖簕workFlow.STARTAREA},娌℃壘鍒拌捣鐐�, "Mes浠诲姟涓嬪彂");
throw new Exception($"璧风偣搴撳尯{workFlow.STARTAREA},娌℃壘鍒拌捣鐐�);
}
- }
+
@@ -1708,23 +1813,6 @@
if (workFlow.SENDWCS == "Y")
{
- //娴嬭瘯榛樿鍙栦竴涓帴椹充綅
- //var connectionList = LocationHelper.GetAllLocList1(workFlow.CONNECTION);
- //foreach (var item in connectionList)
- //{
- // if (item.S_LOCK_STATE == "鏃� && item.N_CURRENT_NUM < 2)
- // {
- // connection = item.S_CODE;
- // LogHelper.Info($"ZCSendTask鍏ュ簱浠诲姟涓嬪彂瀵绘壘鍒板彲鐢ㄦ帴椹充綅{connection}", "Mes浠诲姟涓嬪彂");
- // }
- //}
-
- //if (connection == "")
- //{
- // LogHelper.Info($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�, "Mes浠诲姟涓嬪彂");
- // throw new Exception($"ZCSendTask浠诲姟涓嬪彂瀵绘壘鎺ラ┏浣嶅け璐�);
- //}
-
//姝ｅ紡浠ｇ爜锛岃皟鐢ㄦ帴鍙ｅ鎵惧彲鐢ㄦ帴椹充綅
var connectionList = LocationHelper.GetConnectionList(workFlow.CONNECTION);
@@ -1810,6 +1898,14 @@
//鍒涘缓浣滀笟
if (WMSHelper.CreateWmsWork(operation))
{
+ if (connection!="")
+ {
+ LocationHelper.LockLoc(operation.S_START_LOC, "鍑哄簱閿�, 2);
+ LocationHelper.LockLoc(operation.S_END_LOC, "鍏ュ簱閿�, 1);
+ LocationHelper.LockLoc(operation.CONNECTION, "鍏ュ簱閿�, 1);
+ }
+
+
LogHelper.Info($"ZCSendTask鍑哄簱浣滀笟鍒涘缓鎴愬姛{operation.S_CODE}", "Mes浠诲姟涓嬪彂");
result.errMsg = "鍑哄簱浣滀笟鍒涘缓鎴愬姛";
result.errCode = 0;
@@ -2122,13 +2218,56 @@
}
-
-
+
+ internal static void inPri(WMSTask mst)
+ {
+ LogHelper.Info($"浠诲姟{mst.S_CODE}杩涘叆inpri", "鍏ュ簱浼樺厛绾�);
+ var inprilist = TaskHelper.GetInPri();
+ var db = new SqlHelper<object>().GetInstance();
+
+ foreach (var item in inprilist)
+ {
+
+ LogHelper.Info("鍏ュ簱浼樺厛绾ц褰曚俊鎭�+JsonConvert.SerializeObject(item), "鍏ュ簱浼樺厛绾�);
+
+ if (item.Type=="0" && mst.S_TYPE.Contains("绌烘墭鍑�))
+ {
+ if (mst.S_END_LOC.Contains(item.OutEndLoc))
+ {
+
+ var task = db.Queryable<WMSTask>().Where(a => a.S_B_STATE.Trim() == "宸叉帹閫� && a.S_SCHEDULE_TYPE.Contains("agv") && !a.S_TYPE.Contains("绌烘墭") && (a.S_TYPE.Contains("鍏ュ簱")|| a.S_TYPE.Contains("鍥炲簱")) && a.S_START_LOC.Contains(item.InStartLoc)).First();
+
+ LogHelper.Info($"鏌ユ壘璧风偣{item.InStartLoc}婊℃墭鍏ュ簱浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task), "鍏ュ簱浼樺厛绾�);
+ if (task != null)
+ {
+ NDCApi.ChangeOrderPri(task.S_CODE, item.Pri);
+ }
+
+ }
+ }
+
+
+ if (item.Type == "1" && !mst.S_TYPE.Contains("绌烘墭") && mst.S_TYPE.Contains("鍑哄簱"))
+ {
+ if (mst.S_END_LOC.Contains(item.OutEndLoc))
+ {
+ var task = db.Queryable<WMSTask>().Where(a => a.S_B_STATE.Trim() == "宸叉帹閫� && a.S_SCHEDULE_TYPE.Contains("agv") && a.S_TYPE.Contains("绌烘墭鍏ュ簱") && a.S_START_LOC.Contains(item.InStartLoc)).First();
+ LogHelper.Info($"鏌ユ壘璧风偣{item.InStartLoc}绌烘墭鍏ュ簱浠诲姟淇℃伅锛� + JsonConvert.SerializeObject(task), "鍏ュ簱浼樺厛绾�);
+ if (task != null)
+ {
+ NDCApi.ChangeOrderPri(task.S_CODE, item.Pri);
+ }
+ }
+ }
+
+ }
+ LogHelper.Info($"浠诲姟{mst.S_CODE}锛岀粨鏉焛npri", "鍏ュ簱浼樺厛绾�);
+ }
-
+
public class signalInfo
--
Gitblit v1.9.1