From ae75edc771b0161f90f3e5a596d13bee8a4b71cc Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 19 六月 2025 17:24:20 +0800
Subject: [PATCH] 现场优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 210 +++++++++++++++++++++++++++++----------------------
1 files changed, 119 insertions(+), 91 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 ed520ca..4a3662a 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -38,12 +38,12 @@
public static object _lockCreateTask = new object();
+ public static object _lockCreateItem = new object();
/// <summary>
/// 绔嬪簱浠诲姟涓嬪彂=銆嬪垱寤轰换鍔� /// </summary>
/// <param name="model"></param>
/// <returns></returns>
-
internal static Result Createtask(CreateTask model)
{
Result result = new Result() { code = "0", msg = "鍒涘缓鎴愬姛" };
@@ -170,10 +170,21 @@
if (startloc != null)
{
Start = startloc.S_CODE;
- var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
+ var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).OrderBy(a => a.T_CREATE).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
//{
@@ -718,6 +729,7 @@
/// <returns></returns>
internal static Result TrayItembind(TrayItembind model)
{
+
Result result = new Result() { code = "200", msg = "浜у嚭淇℃伅涓嬪彂鎴愬姛" };
if (model == null)
{
@@ -726,29 +738,34 @@
AddErrorInfo("鍙傛暟涓虹┖", result.msg);
return result;
}
- try
+ lock (_lockCreateItem)
{
- //鍒涘缓鎵樼洏鏁版嵁缁戝畾鍏崇郴
- if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
+ try
{
- //鍒涘缓鎴愬姛娴佺▼
- }
- else
- {
- result.code = "1";
- result.msg = "浜у嚭淇℃伅涓嬪彂澶辫触锛屾墭鐩樼墿鏂欑粦瀹氬叧绯诲垱寤哄け璐�;
- AddErrorInfo("鍒涘缓缁戝畾鍏崇郴澶辫触", result.msg, "Mes");
+
+ //鍒涘缓鎵樼洏鏁版嵁缁戝畾鍏崇郴
+ if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
+ {
+ //鍒涘缓鎴愬姛娴佺▼
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = "浜у嚭淇℃伅涓嬪彂澶辫触锛屾墭鐩樼墿鏂欑粦瀹氬叧绯诲垱寤哄け璐�;
+ AddErrorInfo("鍒涘缓缁戝畾鍏崇郴澶辫触", result.msg, "Mes");
+ return result;
+ }
return result;
}
- return result;
+ catch (Exception ex)
+ {
+ result.code = "1";
+ result.msg = ex.ToString();
+ LogHelper.Error("TrayItembind Error锛� + ex.ToString(), ex);
+ return result;
+ }
}
- catch (Exception ex)
- {
- result.code = "1";
- result.msg = ex.ToString();
- LogHelper.Error("TrayItembind Error锛� + ex.ToString(), ex);
- return result;
- }
+
}
@@ -863,13 +880,8 @@
return result;
}
- //鍒ゆ柇鏈夋棤鐩稿悓鐗╂枡鎺� loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
- //{
- // //鏃犵浉鍚岀墿鏂欐帓鎵剧┖鎺�- // loc = emptyRow(areacode);
- //}
+
if (loc != null)
{
End = loc.S_CODE;
@@ -1208,7 +1220,8 @@
if (startloc.N_LAYER == 3)
{
//鍙犵洏璐т綅璁＄畻鍙犵洏璐т綅
- var dploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鍙犵洏" && a.N_LAYER == startloc.N_LAYER && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList();
+ // var dploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鍙犵洏" && a.N_LAYER == startloc.N_LAYER && a.S_WH_CODE.Trim() == startloc.S_WH_CODE && a.C_ENABLE == "Y").ToList();
+ var dploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鍙犵洏" && a.N_LAYER == startloc.N_LAYER && a.S_WH_CODE.Trim() == startloc.S_WH_CODE ).ToList();
if (dploc.Count > 0)
{
// LogHelper.Info($"鑾峰彇鍙犵洏璐т綅:{JsonConvert.SerializeObject(dploc)}");
@@ -1239,6 +1252,7 @@
else if (startloc.S_NOTE == "PB")
{
//鎵惧潡鑳跺爢鍙犲尯
+ // var KjDploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鐗囪兌鍫嗗彔浣� && a.S_WH_CODE.Trim() == startloc.S_WH_CODE && a.C_ENABLE == "Y").ToList();
var KjDploc = db.Queryable<Location>().Where(a => a.S_NOTE.Trim() == "鐗囪兌鍫嗗彔浣� && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList();
if (KjDploc.Count > 0)
{
@@ -1361,6 +1375,12 @@
// 绌烘墭鍥炲簱鍒ゆ柇鎵樼洏鏈夋棤缁戝畾鐗╂枡淇℃伅 濡傛灉鏈夊垯鍒犻櫎
var itemcntr = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
if (itemcntr != null) { db.Deleteable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).ExecuteCommand(); }
+ var container = db.Queryable<Container>().Where(a => a.S_CODE.Trim() == model.Rfid).First();
+ if (container == null)
+ {
+ container = new Container { S_CODE = model.Rfid };
+ db.Insertable<Container>(container).ExecuteCommand();
+ }
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
}
else
@@ -1633,7 +1653,7 @@
}
else
{
- if (db.Updateable(new LocCntrRel() { S_CNTR_CODE = model.Rfid, S_LOC_CODE = Start }).UpdateColumns().ExecuteCommand() <= 0)
+ if (db.Insertable(new LocCntrRel() { S_CNTR_CODE = model.Rfid, S_LOC_CODE = Start }).ExecuteCommand() <= 0)
{
result.code = "1";
result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}缁戝畾璐т綅{Start}澶辫触";
@@ -1692,7 +1712,6 @@
{
//loc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
loc = FindEndcolByLocList(EndLocs);
-
}
else
@@ -2065,11 +2084,11 @@
/// </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";
- if (model == null)
+ Result result = new Result() { code = "200", msg = "鐢垫鎼繍浠诲姟鍒涘缓鎴愬姛" };
+ string Source = "WMS";
+ if (model.Data == null)
{
result.code = "1";
result.msg = "鍙傛暟涓簄ull";
@@ -2083,6 +2102,7 @@
var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == model.Data.start_loc_code).First();
+ // var endloc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.Data.end_loc_code && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").First();
var endloc = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.Data.end_loc_code && a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0).First();
@@ -2092,11 +2112,10 @@
if (startloc.N_LOCK_STATE != 0)
{
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋startloc.S_CODE}鏈夐攣";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋startloc.S_CODE}鏈夐攣锛岀數姊湁鍏朵粬浠诲姟锛岃绛夊緟鐢垫浠诲姟瀹屾垚";
AddErrorInfo("璐т綅鏈夐攣", result.msg, Source);
return result;
}
-
var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
if (cntr == null)
{
@@ -2125,26 +2144,7 @@
//鏍规嵁浠诲姟鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
var elevatorLoc = LocationHelper.GetElevatorLoc();
- //鍒涘缓wcs鍒嗘浠诲姟
var wcsTask = new WCSTask
- {
-
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫1",
- S_EQ_NO = model.Data.task_no,
- S_START_LOC = startloc.S_CODE,
- 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 = cntr.S_CNTR_CODE,
- N_END_LAYER = 1,
- Z_TYPE = 6
- };
- var wcsTask1 = new WCSTask
{
S_CODE = WCSHelper.GenerateTaskNo(),
S_TYPE = "鐢垫2",
@@ -2162,13 +2162,34 @@
Z_TYPE = 6
};
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
+
+ if (WCSHelper.CreateTask(wcsTask))
{
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ var device = Settings.deviceInfos.Where(a => a.TN_Location == startloc.S_CODE).FirstOrDefault();
+ var loc = LocationHelper.GetLocByLoc(endloc.S_CODE);
+ if (device == null)
+ {
+ LogHelper.Info($"鏍规嵁浠诲姟璧风偣:{startloc.S_CODE},鏈壘鍒板搴旂數姊厤缃枃浠�);
+ }
+ if (loc == null)
+ {
+ LogHelper.Info($"鏍规嵁浠诲姟璧风偣:{endloc.S_CODE},鏈壘鍒板搴旇揣浣�);
+ }
+ if (device != null && loc != null)
+ {
+ int value = 0;
+ if (loc.N_LAYER == 1) value = 1;
+ else if (loc.N_LAYER == 2) value = 3;
+ else if (loc.N_LAYER == 3) value = 5;
+
+ ModbusHelper.WriteSingleRegister(40089, value, device.address, 1024);
+ ModbusHelper.WriteSingleRegister(40102, 1, device.address, 1024);
+ }
//LocationHelper.LockLoc(startloc.S_CODE, 2);
//LocationHelper.LockLoc(endloc.S_CODE, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+
}
else
{
@@ -2192,7 +2213,7 @@
{
result.code = "1";
- result.msg = $"鐗╂枡涓绘暟鎹垱寤哄け璐�閿欒淇℃伅锛歿ex}";
+ result.msg = $"鐢垫鎼繍浠诲姟鍒涘缓澶辫触 閿欒淇℃伅锛歿ex}";
LogHelper.Error("鐐瑰鐐逛换鍔�Error锛� + ex.ToString(), ex);
return result;
}
@@ -2286,54 +2307,59 @@
}
string loc = model.LocationNum;
var db = new SqlHelper<object>().GetInstance();
- try
+ lock (_lockCreateItem)
{
- var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
- if (location != null)
+ try
{
- var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).First();
-
- if (loccntr != null)
+ var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
+ if (location != null)
{
- string cntrcode = loccntr.S_CNTR_CODE;
- var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == cntrcode).First();
- if (CntrItem != null)
+ var loccntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).First();
+
+ if (loccntr != null)
{
- //娓呴櫎鎵樼洏鐗╂枡缁戝畾鍏崇郴
- db.Deleteable<CntrItemDetail>().Where(it => it.S_CNTR_CODE.Trim() == CntrItem.S_CNTR_CODE).ExecuteCommand();
+ string cntrcode = loccntr.S_CNTR_CODE;
+ var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == cntrcode).First();
+ if (CntrItem != null)
+ {
+ //娓呴櫎鎵樼洏鐗╂枡缁戝畾鍏崇郴
+ 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($"娓呴櫎鎵樼洏璐т綅鍏崇郴鎴愬姛");
+ }
+
}
else
{
- LogHelper.Info($"ClearLocCntr 鎵樼洏{cntrcode}鏃犵墿鏂欑粦瀹氬叧绯�);
+ LogHelper.Info($"ClearLocCntr 璐т綅{loc}鏃犳墭鐩樿揣浣嶇粦瀹氬叧绯�);
}
- if (LocationHelper.UnBindingLoc(loc, new List<string>() { cntrcode }))
- {
- LogHelper.Info($"娓呴櫎鎵樼洏璐т綅鍏崇郴鎴愬姛");
- }
-
}
else
{
- LogHelper.Info($"ClearLocCntr 璐т綅{loc}鏃犳墭鐩樿揣浣嶇粦瀹氬叧绯�);
+ result.code = "1";
+ result.msg = $"鏍规嵁璐т綅:{loc}鎵句笉鍒拌揣浣嶅叧绯�;
+ AddErrorInfo("璐т綅涓虹┖", result.msg, Source);
+ return result;
}
}
- else
+ catch (Exception ex)
{
+ LogHelper.Info($"ClearLocCntr Error锛歿ex}");
+ db.Ado.CommitTran();
result.code = "1";
- result.msg = $"鏍规嵁璐т綅:{loc}鎵句笉鍒拌揣浣嶅叧绯�;
- AddErrorInfo("璐т綅涓虹┖", result.msg, Source);
+ result.msg = $"Error锛歿ex}";
return result;
+
}
}
- catch (Exception ex)
- {
- LogHelper.Info($"ClearLocCntr Error锛歿ex}");
- db.Ado.CommitTran();
- result.code = "1";
- result.msg = $"Error锛歿ex}";
- return result;
-
- }
+
+
return result;
}
@@ -2530,7 +2556,8 @@
internal static Location StorageCompute(string itemcode, string areacode)
{
var db = new SqlHelper<object>().GetInstance();
- Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).First();
+ // Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 ).First();
+ Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0 && a.C_ENABLE == "Y").First();
//鏌ヨ鎵�湁鏈夋墭鐩樼殑鎺掓病閿佺殑鎺� // var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM > 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).ToList();
// if (list.Count > 0)
@@ -2800,7 +2827,8 @@
Location other = null;
//褰撳墠鎺掓病鏈夐攣骞朵笖鏈夌┖浣嶇疆
//鍏堟壘婊′綅锛岀劧鍚庡悗闈竴灞傝涔堟槸绌猴紝瑕佷箞涓嶅瓨鍦�- 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 && 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();
//if (full == null)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�
--
Gitblit v1.9.1