From f3c8f980269b7f8fd9556c9076e06ca1461796e8 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期二, 15 七月 2025 17:30:55 +0800
Subject: [PATCH] 1111
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 437 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 372 insertions(+), 65 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 1bec18f..04c62d7 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -47,6 +47,7 @@
/// <returns></returns>
internal static Result Createtask(CreateTask model)
{
+
Result result = new Result() { code = "0", msg = "鍒涘缓鎴愬姛" };
if (model == null)
{
@@ -187,13 +188,6 @@
}
}
- //else
- //{
- // result.code = "1";
- // result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- // AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
- // return result;
- //}
}
else
@@ -589,6 +583,15 @@
AddErrorInfo("搴撳尯鏌ユ壘澶辫触", result.msg);
return result;
}
+ int pri = 1;
+ var area = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).First();
+ if (area != null)
+ {
+ if (area.XbAreaCodes.Contains(endloc.S_AREA_CODE))
+ {
+ pri = 2;
+ }
+ }
//鍒涘缓wcs浠诲姟
var wcsTask = new WCSTask
{
@@ -603,7 +606,7 @@
S_END_AREA = endloc.S_AREA_CODE,
N_SCHEDULE_TYPE = 1,
S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
+ N_PRIORITY = pri,
Z_TYPE = n_type,
N_START_LAYER = 1,
N_END_LAYER = 1,
@@ -768,7 +771,7 @@
{
//鍒涘缓鎵樼洏鏁版嵁缁戝畾鍏崇郴
- if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
+ if (ContainerHelper.CreateCntrItemTray(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime, model.PowderType))
{
//鍒涘缓鎴愬姛娴佺▼
}
@@ -792,6 +795,182 @@
+ }
+
+ public static object _Point = new object();
+ /// <summary>
+ /// 鍏ュ钩搴�+ /// </summary>
+ /// <param name="model"></param>
+ /// <param name="n_type">0:pda涓嬪彂浠诲姟锛�:mes涓嬪彂浠诲姟</param>
+ /// <returns></returns>
+ internal static Result Point(PointModel model)
+ {
+ Result result = new Result() { code = "200", msg = "鍏ュ钩搴撲换鍔′笅鍙戞垚鍔� };
+ string Source = "Mes";
+
+ if (model == null)
+ {
+ result.code = "1";
+ result.msg = "鍙傛暟涓簄ull";
+ AddErrorInfo("鍙傛暟涓虹┖", result.msg, Source);
+ return result;
+ }
+ var db = new SqlHelper<object>().GetInstance();
+ Location loc = null;
+
+ string Start = model.InitialLocation; //璧风偣璐т綅
+ string itemcode = model.PartNumber; //鐗╂枡缂栫爜
+ string areacode = "";
+ try
+ {
+ lock (_Putin)
+ {
+ #region 鍏ュ簱妫�煡鎵樼洏鐗╂枡琛ㄦ湁鏃犳暟鎹�+ var cntritem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (cntritem == null)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏃犵粦瀹氱墿鏂欐暟鎹�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鎵樼洏缁戝畾鐗╂枡鏁版嵁涓虹┖", result.msg, Source);
+ return result;
+ }
+ #endregion
+
+ #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�濡傛灉娌＄粦瀹氭墭鐩樺垯缁戝畾鎵樼洏
+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (CntrLoc != null)
+ {
+ if (CntrLoc.S_LOC_CODE != Start)
+ {
+
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}";
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鎵樼洏缁戝畾浣嶇疆涓嶅悓", result.msg, Source);
+ return result;
+ }
+ }
+ else
+ {
+ LocationHelper.BindingLoc(Start, new List<string> { model.Rfid });
+ }
+
+ #endregion
+
+ #region 鏍规嵁璧风偣璐т綅鐨勪粨搴撶紪鐮�鑾峰彇骞冲簱缂栫爜,骞惰绠楀叆搴撹揣浣�+ string End = "";
+ var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
+ if (startloc != null)
+ {
+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
+ {
+ areacode = whcode.PMK;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+
+
+ loc = StorageCompute(itemcode, areacode);
+
+ if (loc != null)
+ {
+ End = loc.S_CODE;
+ }
+ else
+ {
+
+ result.code = "1";
+ result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else
+ {
+
+ result.code = "1";
+ result.msg = $"浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ {
+ if (startloc.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 = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = loc.S_WH_CODE,
+ S_END_AREA = loc.S_AREA_CODE,
+ N_CNTR_COUNT = 1,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = model.Rfid,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ N_PRIORITY = 1,
+ Z_TYPE = n_type
+ };
+ LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ 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;
+ }
+ #endregion
+
+ }
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ result.code = "1";
+ result.msg = ex.ToString();
+ LogHelper.Error("Putin Error锛� + ex.ToString(), ex);
+ return result;
+ }
}
public static object _Putin = new object();
@@ -961,6 +1140,7 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
};
LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
@@ -1089,27 +1269,51 @@
#region 鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅锛岄�寰�嚎杈逛綅缃� Location Endloc = null;
+
//鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅
- var loc = airlift(areacode, itemcode, model.PartLevel);
+ var loc = airlift(areacode, itemcode, model.PartLevel, model.PowderType);
if (loc != null)
{
Start = loc.S_CODE;
- //鏍规嵁鍑哄簱璐т綅鎵惧埌缁戝畾鎵樼洏锛岃幏鍙栧叆鏈哄彴璐т綅
+
var CntrRel = LocationHelper.GetLocCntrRel(loc.S_CODE).FirstOrDefault();
CntrCode = CntrRel.S_CNTR_CODE;
- Endloc = Computeloc(CntrCode, model.WorkCenter, cntrType);
- if (Endloc != null)
+ //缁欑粓鐐圭敤缁堢偣锛屾病缁欑粓鐐圭敤鏈哄彴搴撳尯璁＄畻璐т綅
+ if (string.IsNullOrEmpty(model.TargetLocation))
{
- End = Endloc.S_CODE;
+
+ Endloc = Computeloc(CntrCode, model.WorkCenter, cntrType);
+ if (Endloc != null)
+ {
+ End = Endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"Computeloc==銆嬫牴鎹満鍙扮紪鐮侊細{model.WorkCenter},宸ヨ绫诲瀷锛歿cntrType} 鏈壘鍒扮┖璐т綅鏁版嵁锛岃妫�煡璐т綅琛�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
}
else
{
- result.code = "1";
- result.msg = $"Computeloc==銆嬫牴鎹満鍙扮紪鐮侊細{model.WorkCenter},宸ヨ绫诲瀷锛歿cntrType} 鏈壘鍒扮┖璐т綅鏁版嵁锛岃妫�煡璐т綅琛�;
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- return result;
+
+ Endloc = db.Queryable<Location>().Where(a => a.S_CODE == model.TargetLocation).First();
+ if (Endloc != null)
+ {
+ End = Endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"Computeloc==銆嬫牴鎹粓鐐硅揣浣嶏細{model.TargetLocation} 鏈壘鍒拌揣浣嶆暟鎹紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
}
+
}
else
{
@@ -1159,6 +1363,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
};
@@ -1418,6 +1623,8 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = endlayer,
+ N_PRIORITY = 1,
+ S_B_STATE = "绛夊緟鎺ㄩ�",
Z_TYPE = 5
};
LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
@@ -1597,6 +1804,7 @@
N_START_LAYER = 1,
N_END_LAYER = 1,
Z_TYPE = 5,
+ N_PRIORITY = 1,
S_NOTE = "绮夋枡"
};
LogHelper.Info("鍒涘缓鍛煎彨绌烘墭浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
@@ -1821,6 +2029,7 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = 5
};
@@ -2072,6 +2281,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
// N_TYPE = n_type
@@ -2176,8 +2386,8 @@
string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚", "寮�鍗歌揣", "鍗歌揣瀹屾垚" };
- var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
- if (elevatorLoc==null)
+ var elevatorLoc = db.Queryable<Location>().Where(a => a.S_CODE == eleLoc.TN_Location).First();
+ if (elevatorLoc == null)
{
result.code = "1";
result.msg = $"鏍规嵁鐢垫閰嶇疆鏂囦欢璐т綅锛歿eleLoc.TN_Location}鏈壘鍒板浜庤揣浣嶆暟鎹紝璇锋鏌ヨ揣浣嶈〃";
@@ -2208,6 +2418,7 @@
S_CNTR_CODE = cntr.S_CNTR_CODE,
N_END_LAYER = 1,
Z_TYPE = 6,
+ N_PRIORITY = 1,
S_B_STATE = "鐢垫鎺ㄩ�"
};
@@ -2269,6 +2480,47 @@
}
+
+ /// <summary>
+ /// 鐢垫浠诲姟鎺ㄩ�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static Result DT(DTModel model)
+ {
+ Result result = new Result() { code = "200", msg = "鐢垫浠诲姟鎺ㄩ�鎴愬姛" };
+ string Source = "WMS";
+ if (model == null)
+ {
+ result.code = "1";
+ result.msg = "鍙傛暟涓簄ull";
+ AddErrorInfo("鍙傛暟涓虹┖", result.msg, Source);
+ return result;
+ }
+ try
+ {
+ if (model.prepare == "1")
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ //淇敼瀵瑰簲鐢垫浠诲姟杩涜鎺ㄩ�
+ return result;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"涓�ゼ鐢垫鎼繍浠诲姟鎺ㄩ�澶辫触 prepare{model.prepare}涓嶄负1";
+ LogHelper.Info(result.msg);
+ return result;
+ }
+ }
+ catch (Exception ex)
+ {
+ result.code = "1";
+ result.msg = $"鐢垫浠诲姟鎺ㄩ�澶辫触 閿欒淇℃伅锛歿ex}";
+ LogHelper.Error("鐐瑰鐐逛换鍔�Error锛� + ex.ToString(), ex);
+ return result;
+ }
+ }
/// <summary>
/// 璐т綅淇℃伅涓婁紶
/// </summary>
@@ -2437,10 +2689,9 @@
var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
if (location != null)
{
- var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
+ var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc.Trim()).ToList();
if (loccntr.Count > 0)
{
-
var cntrcodes = loccntr.Select(a => a.S_CNTR_CODE.Trim()).ToList();
if (LocationHelper.Clear(loc, cntrcodes))
{
@@ -2511,12 +2762,12 @@
if (agvDeviceInfo.Count > 0)
{
device.AgvQty = agvDeviceInfo.Count;
- device.AgvErrorQty = agvDeviceInfo.FindAll(a => a.agvErrCode != "0" || a.agvErrCode != "0" || a.faildCode != "0").Count;
- device.AgvChargeQty = agvDeviceInfo.FindAll(a => a.agvErrCode == "1").Count;
- device.AgvRunQty = agvDeviceInfo.FindAll(a => a.agvErrCode == "1").Count;
+ device.AgvErrorQty = agvDeviceInfo.FindAll(a => a.agvErrCode != "0" || int.Parse(a.errCode2) > 1 || int.Parse(a.faildCode) > 1).Count;
+ device.AgvChargeQty = agvDeviceInfo.FindAll(a => a.errCode2 == "1").Count;
+ device.AgvRunQty = agvDeviceInfo.FindAll(a => a.agvErrCode == "0"&& a.errCode2 == "0" && a.faildCode == "1").Count;
foreach (var agv in agvDeviceInfo)
{
- string agvErrorInfo = GetAgvAlarmSendCodeTwo(agv.agvErrCode, agv.errCode2, agv.faildCode);
+ string agvErrorInfo = GetAgvAlarmSendCodeTwo(agv.agvNo, agv.agvErrCode, agv.errCode2, agv.faildCode);
deviceInfos.Add(new DeviceInfos() { AgvNo = agv.agvNo, AgvInfo = agvErrorInfo });
}
}
@@ -2528,56 +2779,65 @@
/// <summary>
/// agv灏忚溅鏁呴殰鐮佸鐞� /// </summary>
+ ///<param name="agvNo">杞﹀彿</param>
/// <param name="errCode1">閿欒鐮�</param>
/// <param name="errCode2">閿欒鐮�</param>
/// <param name="faildCode">閿欒鐮�</param>
/// <returns></returns>
- private static string GetAgvAlarmSendCodeTwo(string errCode1, string errCode2, string faildCode)
+ private static string GetAgvAlarmSendCodeTwo(string agvNo, string errCode1, string errCode2, string faildCode)
{
string result = "";
//灏嗘姤璀︿俊鎭暣鍚�- string binSW1 = Convert.ToString(int.Parse(errCode1), 2).PadLeft(22, '0');
+ string binSW1 = Convert.ToString(int.Parse(errCode1), 2).PadLeft(25, '0');
string binSW2 = Convert.ToString(int.Parse(errCode1), 2).PadLeft(20, '0');
string binFc = Convert.ToString(int.Parse(errCode1), 2).PadLeft(16, '0');
var arr1 = binSW1.ToArray();
var arr2 = binSW2.ToArray();
var arr3 = binFc.ToArray();
- for (int i = 0; i <= arr1.Length; i++)
+ var AgvError = Settings.agvError.Where(a => a.agvNo.Contains(agvNo)).FirstOrDefault();
+ if (AgvError != null)
{
- if (arr1[i] == '1')
+ for (int i = 0; i <= arr1.Length; i++)
{
- var ErrorInfo = Settings.agvErrorCode1.Where(a => a.ErrorCode == i).FirstOrDefault();
- if (ErrorInfo != null)
+ if (arr1[i] == '1')
{
- result = result + "," + $"{ErrorInfo.ErrorInfo}";
- }
+ var ErrorInfo = AgvError.AgvErrorCode1.Find(a => a.ErrorCode == i);
+ if (ErrorInfo != null)
+ {
+ result = result + "," + $"{ErrorInfo.ErrorInfo}";
+ }
+ }
+ }
+ for (int i = 0; i <= arr2.Length; i++)
+ {
+ if (arr1[i] == '1')
+ {
+ var ErrorInfo = AgvError.AgvErrorCode2.Find(a => a.ErrorCode == i);
+ if (ErrorInfo != null)
+ {
+ result = result + "," + $"{ErrorInfo.ErrorInfo}";
+ }
+
+ }
+ }
+ for (int i = 0; i <= arr3.Length; i++)
+ {
+ if (arr1[i] == '1')
+ {
+ var ErrorInfo = AgvError.AgvFaildCode.Find(a => a.ErrorCode == i);
+ if (ErrorInfo != null)
+ {
+ result = result + "," + $"{ErrorInfo.ErrorInfo}";
+ }
+
+ }
}
}
- for (int i = 0; i <= arr2.Length; i++)
+ else
{
- if (arr1[i] == '1')
- {
- var ErrorInfo = Settings.agvErrorCode2.Where(a => a.ErrorCode == i).FirstOrDefault();
- if (ErrorInfo != null)
- {
- result = result + "," + $"{ErrorInfo.ErrorInfo}";
- }
- }
- }
- for (int i = 0; i <= arr3.Length; i++)
- {
- if (arr1[i] == '1')
- {
- var ErrorInfo = Settings.agvFaildCode.Where(a => a.ErrorCode == i).FirstOrDefault();
- if (ErrorInfo != null)
- {
- result = result + "," + $"{ErrorInfo.ErrorInfo}";
- }
-
- }
}
return result;
}
@@ -2624,8 +2884,10 @@
/// <param name="areacode"></param>
/// <param name="itemcode"></param>
/// <param name="level">鐗╂枡绛夌骇</param>
+ /// <param name="powderType">鏈哄瀷</param>
/// <returns></returns>
- internal static Location airlift(string areacode, string itemcode, string level = "")
+ internal static Location
+ airlift(string areacode, string itemcode, string level, string powderType)
{
var db = new SqlHelper<object>().GetInstance();
Location result = null;
@@ -2682,8 +2944,8 @@
//}
#endregion
- var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
- LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鐗╂枡绛夌骇璁＄畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
+ var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level, powderType);
+ LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鏈哄瀷{powderType},鐗╂枡绛夌骇璁＄畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
// result = FindStartcolByLoclist(loc);
if (loc.Count > 0)
{
@@ -2765,12 +3027,16 @@
lock (_lockLocation)
{
- var loc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == jtcode.Trim() && a.S_NOTE == cntrType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃�).First();
- if (loc != null)
+ if (string.IsNullOrEmpty(cntrType))
{
- End = loc;
+ End = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == jtcode.Trim() && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃�).First();
}
else
+ {
+ End = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == jtcode.Trim() && a.S_NOTE == cntrType && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.S_LOCK_STATE == "鏃�).First();
+ }
+
+ if (End == null)
{
LogHelper.Info($"Computeloc==銆嬫牴鎹満鍙板垎缁勶細{jtcode},宸ヨ绫诲瀷锛歿cntrType} 鏈壘鍒扮┖璐т綅鏁版嵁锛岃妫�煡璐т綅琛�);
}
@@ -2818,6 +3084,48 @@
}
/// <summary>
+ /// 鍚堣偉浣抽�鎺ュ彛璋冪敤淇℃伅
+ /// </summary>
+ /// <param name="source">绯荤粺鏉ユ簮</param>
+ /// <param name="name">鎺ュ彛鍚嶇О</param>
+ /// <param name="type">璇锋眰鍦板潃绫诲瀷</param>
+ /// <param name="body">璇锋眰鍙傛暟</param>
+ /// <param name="url">璇锋眰鍦板潃</param>
+ /// <param name="err">閿欒淇℃伅</param>
+ /// <returns></returns>
+ public static bool AddInfo(string source, string name, string body, string err, string type, string url)
+ {
+ bool result = false;
+ var db = new SqlHelper<object>().GetInstance();
+ try
+ {
+ var error = new GT_Interface_Exc
+ {
+ S_SOURCE = source,
+ S_NAME = name,
+ S_TYPE = type,
+ S_URL = url,
+ S_BODY = body,
+ S_ERR = err
+ };
+ if (result = db.Insertable<GT_Interface_Exc>(error).ExecuteCommand() > 0)
+ {
+
+ }
+ //else
+ //{
+ // //娣诲姞澶辫触閲嶆柊娣诲姞
+ // AddErrorInfo(errorInfo, remake, areacode, taskno);
+ //}
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"AddInfo Error:{ex.Message}");
+ }
+ return result;
+ }
+
+ /// <summary>
/// 鎵剧粓鐐圭┖璐т綅
/// </summary>
/// <param name="locations"></param>
@@ -2834,14 +3142,14 @@
{
var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
- // LogHelper.Info($"褰撳墠鎺�{rows[i]},鑾峰緱璐т綅{JsonConvert.SerializeObject(rowList)}");
+ // LogHelper.Info($"褰撳墠鎺�{rows[i]},鑾峰緱璐т綅{JsonConvert.SerializeObject(rowList)}");
if (rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
{
Location other = null;
//褰撳墠鎺掓病鏈夐攣骞朵笖鏈夌┖浣嶇疆
// other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").FirstOrDefault();
- other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 ).FirstOrDefault();
+ other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
//if (full == null)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�@@ -3012,7 +3320,6 @@
{
lock (AGVDeviceReceiveLock)
{
-
var db = new SqlHelper<HangChaAGV>().GetInstance();
var agvDeviceInfo = db.Queryable<HangChaAGV>().Where(a => a.agvNo.Trim() == forkliftNo).First();
if (agvDeviceInfo == null)
--
Gitblit v1.9.1