From 95c865c03a9cb128af51ac4b7d7f9d7149441efd Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期一, 07 七月 2025 17:30:35 +0800
Subject: [PATCH] agv效率开发
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 219 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 177 insertions(+), 42 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 fcf0911..0f89ebf 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -20,6 +20,7 @@
using static HH.WCS.JiaTong.api.ApiModel;
using static HH.WCS.JiaTong.api.OtherModel;
using static HH.WCS.JiaTong.LISTA.process.HttpModel;
+using static HH.WCS.JiaTong.util.Settings;
namespace HH.WCS.JiaTong.api
{
@@ -186,14 +187,7 @@
}
}
- //else
- //{
- // result.code = "1";
- // result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- // AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
- // return result;
- //}
-
+
}
else
{
@@ -312,8 +306,31 @@
}
else if (startArea.N_FLOOR != endArea.N_FLOOR)
{
- //妤煎眰鐢垫鍒嗛厤
- var elevatorLoc = LocationHelper.GetElevatorLoc();
+ string deviceName = "鐢垫1";
+ if (startloc.S_WH_CODE == "103")
+ {
+ deviceName = "鐢垫2";
+ }
+ var eleLoc = Settings.deviceInfos.Where(a => a.deviceName.Trim() == deviceName).FirstOrDefault();
+ if (eleLoc == null)
+ {
+ result.code = "1";
+ result.msg = $"鏈壘鍒颁粨搴搟startloc.S_WH_CODE}鎵�搴旂殑鐢垫锛岃妫�煡閰嶇疆鏂囦欢";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ //鏍规嵁浠诲姟鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
+ string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚", "寮�鍗歌揣", "鍗歌揣瀹屾垚" };
+
+
+ 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}鏈壘鍒板浜庤揣浣嶆暟鎹紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
if (elevatorLoc != null)
{ //鍒涘缓wcs鍒嗘浠诲姟
@@ -565,6 +582,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
{
@@ -579,7 +605,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,
@@ -744,7 +770,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))
{
//鍒涘缓鎴愬姛娴佺▼
}
@@ -793,7 +819,7 @@
return result;
}
var db = new SqlHelper<object>().GetInstance();
- Location loc = new Location();
+ Location loc = null;
string Start = model.InitialLocation; //璧风偣璐т綅
string itemcode = model.PartNumber; //鐗╂枡缂栫爜
@@ -937,6 +963,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));
@@ -1066,7 +1093,7 @@
#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;
@@ -1135,6 +1162,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
};
@@ -1335,12 +1363,14 @@
loc = StorageCompute(itemcode, areacode);
if (loc == null)
{
+
result.code = "1";
result.msg = $"搴撳尯锛歿areacode}娌℃湁鍙敤璐т綅";
LogHelper.Info($" {result.msg}");
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
// LogHelper.Info($"搴撳尯锛歿areacode}娌℃湁鍙敤璐т綅");
+
}
//else
//{
@@ -1392,6 +1422,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));
@@ -1571,6 +1603,7 @@
N_START_LAYER = 1,
N_END_LAYER = 1,
Z_TYPE = 5,
+ N_PRIORITY = 1,
S_NOTE = "绮夋枡"
};
LogHelper.Info("鍒涘缓鍛煎彨绌烘墭浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
@@ -1795,6 +1828,7 @@
S_CNTR_CODE = model.Rfid,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = 5
};
@@ -2046,6 +2080,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
// N_TYPE = n_type
@@ -2127,35 +2162,49 @@
var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
if (cntr == null)
{
-
result.code = "1";
result.msg = $"璧风偣{model.Data.start_loc_code}鏈煡璇㈢粦瀹氭墭鐩�;
LogHelper.Info($"callfixture:鍒涘缓绌哄伐瑁呭懠鍙换鍔�=>{result.msg}");
AddErrorInfo("鏌ユ壘鎵樼洏澶辫触", result.msg, Source);
return result;
}
-
- // 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();
-
- //string dtcode = "DT-01";
- ////妤煎眰鐢垫鍒嗛厤
- //var Diantiloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == dtcode).First();
- //if (Diantiloc == null)
- //{
- // result.code = "1";
- // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹揣浣嶇紪鐮�{dtcode}鏈壘鍒扮數姊揣浣�;
- // AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
- // return result;
- //}
-
+ string deviceName = "鐢垫1";
+ if (startloc.S_WH_CODE == "103")
+ {
+ deviceName = "鐢垫2";
+ }
+ var eleLoc = Settings.deviceInfos.Where(a => a.deviceName.Trim() == deviceName).FirstOrDefault();
+ if (eleLoc == null)
+ {
+ result.code = "1";
+ result.msg = $"鏈壘鍒颁粨搴搟startloc.S_WH_CODE}鎵�搴旂殑鐢垫锛岃妫�煡閰嶇疆鏂囦欢";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
//鏍规嵁浠诲姟鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
- var elevatorLoc = LocationHelper.GetElevatorLoc();
+ string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚", "寮�鍗歌揣", "鍗歌揣瀹屾垚" };
+
+ 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}鏈壘鍒板浜庤揣浣嶆暟鎹紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("鐢垫") && state.Contains(a.S_B_STATE) && (a.S_END_LOC == elevatorLoc.S_CODE || a.S_START_LOC == elevatorLoc.S_CODE)).Count();
+ if (mst > 0)
+ {
+ result.code = "1";
+ result.msg = $"鐢垫瀛樺湪浠诲姟锛屼笉鍏佽鍒涘缓鐢垫浠诲姟";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
var wcsTask = new WCSTask
{
S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫2",
+ S_TYPE = "1妤肩數姊惉杩�,
S_EQ_NO = model.Data.task_no,
S_START_LOC = elevatorLoc.S_CODE,
S_END_LOC = endloc.S_CODE,
@@ -2167,7 +2216,9 @@
N_SCHEDULE_TYPE = 1,
S_CNTR_CODE = cntr.S_CNTR_CODE,
N_END_LAYER = 1,
- Z_TYPE = 6
+ Z_TYPE = 6,
+ N_PRIORITY = 1,
+ S_B_STATE = "鐢垫鎺ㄩ�"
};
@@ -2228,6 +2279,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>
@@ -2396,10 +2488,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))
{
@@ -2560,12 +2651,14 @@
// var aaa = db.Deleteable<Location>(a => a.S_ID == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
// var aaa = db.Deleteable<Location>(a => a.S_ID.Trim() == "867C567A-183C-413B-9891-15D8F6DE1620").ExecuteCommand();
+
//LogHelper.Info($"鏂规硶锛歋torageCompute");
var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE == areacode && a.N_LOCK_STATE == 0).ToList();
// LogHelper.Info($"鍒涘缓绌烘墭鍥炲簱浠诲姟,缁堢偣璐т綅闆嗗悎锛氭牴鎹簱鍖虹紪鐮侊細{areacode}" + list.Count);
//list.RemoveAll(a => string.IsNullOrEmpty(a.S_CODE.Trim()) || a.S_CODE == null || string.IsNullOrWhiteSpace(a.S_CODE.Trim()));
// list = list.FindAll(a => a.N_ROW > 0 && a.N_COL > 0);
//LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟,缁堢偣璐т綅闆嗗悎杩囨护锛� + list.Count);
+
if (list.Count > 0)
{
result = FindEndcolByLocList(list);
@@ -2581,8 +2674,9 @@
/// <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;
@@ -2639,8 +2733,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)
{
@@ -2685,7 +2779,7 @@
else
{
return ContainerHelper.CreateCntrItem(taskData.pickStation, partData.rfid, partData.partNumber, partData.partDesc, partData.partType, taskData.carrierType, partData.lotNumber, taskData.wmsLot, partData.weight, partData.unit,
- taskData.tyreType, taskData.supplier, taskData.receiveLot, taskData.subpool, partData.productionTime, partData.maturityTime, taskData.level);
+ taskData.tyreType, taskData.supplier, taskData.receiveLot, taskData.subpool, partData.productionTime, partData.maturityTime, taskData.level, partData.qty, partData.qtyCfg);
}
}
@@ -2775,6 +2869,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>
@@ -2791,14 +2927,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 && !string.IsNullOrEmpty(a.S_CODE.Trim()) && !string.IsNullOrWhiteSpace(a.S_CODE.Trim())).FirstOrDefault();
+ other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).FirstOrDefault();
//if (full == null)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�@@ -2969,7 +3105,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