From 663ffc09a8fc33eb7d2346e6ed10c08679f0006c Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期一, 16 六月 2025 17:25:10 +0800
Subject: [PATCH] 新增任务推送限制
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 195 +++++++++++++++++++++++++++++-------------------
1 files changed, 119 insertions(+), 76 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 a2e791d..5bb4768 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -12,6 +12,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
using System.ServiceModel;
using System.Threading;
using System.Threading.Tasks;
@@ -35,14 +36,14 @@
#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 = "鍒涘缓鎴愬姛" };
@@ -159,6 +160,7 @@
result.msg = $"Putin==> 浠诲姟璧风偣:{taskData.pickStation}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
LogHelper.Info($"Putin==> {result.msg}");
AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
}
}
else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
@@ -171,7 +173,18 @@
var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
if (CntrRel != null)
{
- CntrCode = CntrRel.S_CNTR_CODE;
+ if (CntrRel.S_CNTR_CODE!= partData.rfid)
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣锛歿Start}鑾峰彇鎵樼洏:{CntrRel.S_CNTR_CODE}涓庝笅鍙戞墭鐩橈細{partData.rfid}涓嶄竴鑷达紝璇锋鏌ユ墭鐩樼爜鏄惁姝ｇ‘";
+ AddErrorInfo("鎵樼洏鐮佹牎妫�け璐�, result.msg, Source);
+ return result;
+ }
+ else
+ {
+ CntrCode = CntrRel.S_CNTR_CODE;
+ }
+
}
//else
//{
@@ -598,7 +611,7 @@
}
}
}
-
+
return result;
}
@@ -988,7 +1001,6 @@
string areacode = "";
var db = new SqlHelper<object>().GetInstance();
#endregion
-
try
{
@@ -1076,56 +1088,60 @@
#endregion
#region 浠诲姟鍒涘缓
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ if (string.IsNullOrEmpty(Start))
{
- if (loc.N_LOCK_STATE != 0)
- {
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
- AddErrorInfo("璐т綅鏈夐攣", result.msg, Source);
- return result;
- }
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鍑哄钩搴�,
- S_EQ_NO = model.TaskNumber,
- S_START_LOC = Start,
- S_END_LOC = End,
- S_START_WH = loc.S_WH_CODE,
- S_START_AREA = loc.S_AREA_CODE,
- S_END_WH = Endloc.S_WH_CODE,
- S_END_AREA = Endloc.S_AREA_CODE,
- N_CNTR_COUNT = 1,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- Z_TYPE = n_type
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣";
+ return result;
+ }
+ if (string.IsNullOrEmpty(End))
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫嵏璐х偣";
+ return result;
+ }
+ if (loc.N_LOCK_STATE != 0)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg, Source);
+ return result;
+ }
+ //鍒涘缓wcs浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鍑哄钩搴�,
+ S_EQ_NO = model.TaskNumber,
+ S_START_LOC = Start,
+ S_END_LOC = End,
+ S_START_WH = loc.S_WH_CODE,
+ S_START_AREA = loc.S_AREA_CODE,
+ S_END_WH = Endloc.S_WH_CODE,
+ S_END_AREA = Endloc.S_AREA_CODE,
+ N_CNTR_COUNT = 1,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ Z_TYPE = n_type
- };
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
- if (WCSHelper.CreateTask(wcsTask))
- {
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- //LocationHelper.LockLoc(Start, 2);
- //LocationHelper.LockLoc(End, 1);
- }
- else
- {
- result.code = "1";
- result.msg = $"浠诲姟鍒涘缓澶辫触";
- AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
- return result;
- }
+ };
+ LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ //LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
}
else
{
result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
return result;
}
+
#endregion
return result;
@@ -1210,8 +1226,9 @@
loc = dploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
if (loc == null)
{
+ LogHelper.Info($"涓夋ゼ璐т綅鍙犵洏浣嶏紝閮藉凡缁忔湁閿佹垨鑰呭凡缁忓彔婊★紝璇锋鏌ヨ揣浣嶇姸鎬�);
result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
+ result.msg = $"鍙犵洏璐т綅涓嶅彲鐢紝缁堢偣搴撳尯娌℃湁鍙敤璐т綅锛岃妫�煡閿佺姸鎬佸拰鏁伴噺";
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
@@ -1222,9 +1239,9 @@
}
else
{
-
+ // LogHelper.Info($"鏍规嵁璐т綅妤煎眰锛歿startloc.N_LAYER}锛屼粨搴撶紪鐮侊細{startloc.S_WH_CODE}锛岃揣浣嶅娉細鍙犵洏锛屾湭鎵惧埌鍙犵洏璐т綅");
result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
+ result.msg = $"鍙犵洏璐т綅涓嶅彲鐢紝鏈壘鍒板彲鍙犵洏璐т綅";
LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛氬彔鐩橈紝璐т綅妤煎眰:{startloc.N_LAYER},璐т綅浠撳簱:{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
return result;
@@ -1239,8 +1256,9 @@
loc = KjDploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
if (loc == null)
{
+ LogHelper.Info($"鐗囪兌鍫嗗彔浣嶏紝閮藉凡缁忔湁閿佹垨鑰呭凡缁忓彔婊★紝璇锋鏌ヨ揣浣嶇姸鎬�);
result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
+ result.msg = $"鍙犵洏璐т綅涓嶅彲鐢紝缁堢偣搴撳尯娌℃湁鍙敤璐т綅锛岃妫�煡閿佺姸鎬佸拰鏁伴噺";
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
@@ -1274,7 +1292,7 @@
{
result.code = "1";
result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
+ LogHelper.Info($" {result.msg}");
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
@@ -1282,14 +1300,18 @@
//鍥炲簱璐т綅璁＄畻搴撳尯璐т綅
loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
- //{
- // loc = emptyRow(areacode);
- // if (loc == null)
- // {
- // LogHelper.Info($"搴撳尯锛歿areacode}娌℃湁绌烘帓");
- // }
- //}
+ if (loc == null)
+ {
+ loc = emptyRow(areacode);
+ if (loc == null)
+ {
+ result.code = "1";
+ result.msg = $"搴撳尯锛歿areacode}娌℃湁鍙敤璐т綅";
+ LogHelper.Info($" {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ // LogHelper.Info($"搴撳尯锛歿areacode}娌℃湁鍙敤璐т綅");
+ }
+ }
//else
//{
@@ -1404,11 +1426,11 @@
#region 鍙橀噺
string Start = "";
string End = model.TargetLocation;
-
+
string areacode = "";
string cntrcode = "";
Location startloc = new Location();
- // startloc = LocationHelper.GetLocByAreacode(areacode, model.CarrierType);
+ // startloc = LocationHelper.GetLocByAreacode(areacode, model.CarrierType);
#endregion
try
@@ -1418,7 +1440,6 @@
#region 鏍规嵁浠撳簱缂栫爜鍒ゆ柇搴撳尯 骞惰绠楀嚭搴撹揣浣� var endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == End).First();
//鏍规嵁浠撳簱 璁＄畻搴撳尯
-
if (endloc != null)
{
var whcode = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).FirstOrDefault();
@@ -1434,10 +1455,9 @@
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
-
//璁＄畻鍑哄簱鎵樼洏
- startloc = LocationHelper.GetLocByAreacode(areacode,model.CarrierType);
+ startloc = LocationHelper.GetLocByAreacode(areacode, model.CarrierType);
if (startloc != null)
{
var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
@@ -1454,7 +1474,14 @@
AddErrorInfo("鏌ユ壘鎵樼洏澶辫触", result.msg, Source);
return result;
}
-
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓绌哄伐瑁呭懠鍙换鍔�=>鏍规嵁搴撳尯锛歿areacode}锛屾墭鐩樼被鍨嬶細{model.CarrierType}鎵句笉鍒板搴旂┖鎵�;
+ LogHelper.Info($"callfixture:{result.msg}");
+ AddErrorInfo("鏌ユ壘鎵樼洏澶辫触", result.msg, Source);
+ return result;
}
}
@@ -2049,7 +2076,7 @@
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
- internal static Result CreatelevatorTask(Elevator model)
+ internal static Result CreatelevatorTask(ElevatorModel model)
{
Result result = new Result() { code = "200", msg = "鐐瑰鐐逛换鍔″垱寤烘垚鍔� };
string Source = "MES";
@@ -2279,19 +2306,20 @@
if (loccntr != null)
{
-
string cntrcode = loccntr.S_CNTR_CODE;
var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == cntrcode).First();
if (CntrItem != null)
{
- if (LocationHelper.UnBindingLoc(loc, new List<string>() { cntrcode }))
- {
- LogHelper.Info($"娓呴櫎鎵樼洏璐т綅鍏崇郴鎴愬姛");
- }
+ //娓呴櫎鎵樼洏鐗╂枡缁戝畾鍏崇郴
+ db.Deleteable<CntrItemDetail>().Where(it => it.S_CNTR_CODE.Trim() == CntrItem.S_CNTR_CODE).ExecuteCommand();
}
else
{
LogHelper.Info($"ClearLocCntr 鎵樼洏{cntrcode}鏃犵墿鏂欑粦瀹氬叧绯�);
+ }
+ if (LocationHelper.UnBindingLoc(loc, new List<string>() { cntrcode }))
+ {
+ LogHelper.Info($"娓呴櫎鎵樼洏璐т綅鍏崇郴鎴愬姛");
}
}
@@ -2374,7 +2402,7 @@
}
}
-
+
}
else
{
@@ -2416,14 +2444,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)
@@ -2503,7 +2531,7 @@
#region 鍚堣偉浣抽�涓氬姟鏂规硶
-
+
/// <summary>
/// 鎵樼洏鍏ュ簱绠楁硶
/// </summary>
@@ -2677,6 +2705,21 @@
}
}
+
+ //internal static bool CreateCntrLoc(taskData taskData)
+ //{
+ // if ( taskData == null)
+ // {
+ // LogHelper.Info($"CreateCntrIteminfo==> 绔嬪簱浠诲姟涓嬪彂鍙傛暟鏈夌┖锛屽垱寤虹墿鏂欐墭鐩樼粦瀹氬叧绯诲け璐�);
+ // return false;
+ // }
+ // else
+ // {
+ // LocationHelper.BindingLoc(taskData.pickStation,new List<string>() { taskData.rfid });
+
+ // }
+
+ //}
private static object _lockLocation = new object();
/// <summary>
/// 鏍规嵁鎵樼洏缂栫爜锛屾満鍙扮紪鐮侊紝宸ヨ绫诲瀷璁＄畻鏈哄彴绾胯竟鍖哄煙
--
Gitblit v1.9.1