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 | 2741 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 1,648 insertions(+), 1,093 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 8d12ee2..0f89ebf 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -11,11 +11,16 @@
using System;
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;
+using System.Web.UI.WebControls;
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
{
@@ -31,6 +36,10 @@
#region 浣抽�鍚堣偉鎺ュ彛涓氬姟
+
+
+ public static object _lockCreateTask = new object();
+ public static object _lockCreateItem = new object();
/// <summary>
/// 绔嬪簱浠诲姟涓嬪彂=銆嬪垱寤轰换鍔� /// </summary>
@@ -110,247 +119,101 @@
#endregion
- Location endloc = new Location();
- Location startloc = new Location();
-
- if (taskData.taskType == 1) //鍑哄簱娴佺▼锛岄�杩囩墿鏂欐満鍙拌绠楃嚎杈硅揣浣�+ Location endloc = null;
+ Location startloc = null;
+ lock (_lockCreateTask)
{
- note = "鍑哄簱";
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
+ if (taskData.taskType == 1) //鍑哄簱娴佺▼锛岄�杩囩墿鏂欐満鍙拌绠楃嚎杈硅揣浣� {
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- Start = taskData.pickStation;
- if (CreateCntrIteminfo(partData, taskData))
+ note = "鍑哄簱";
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
{
- endloc = Computeloc(CntrCode, taskData.dropStation, taskData.carrierType);
- if (endloc != null)
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ Start = taskData.pickStation;
+ if (CreateCntrIteminfo(partData, taskData))
{
- End = endloc.S_CODE;
+ endloc = Computeloc(CntrCode, taskData.dropStation, taskData.carrierType);
+ if (endloc != null)
+ {
+ End = endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏈哄彴缂栫爜:{taskData.dropStation}锛屾湭鎵惧埌鍙敤璐т綅";
+ AddErrorInfo("瀵绘壘鍑哄簱璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
}
else
{
result.code = "1";
- result.msg = $"鏈哄彴缂栫爜:{taskData.dropStation}锛屾湭鎵惧埌鍙敤璐т綅";
- AddErrorInfo("瀵绘壘鍑哄簱璐т綅澶辫触", result.msg, Source);
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
return result;
}
}
else
{
+
result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
+ result.msg = $"Putin==> 浠诲姟璧风偣:{taskData.pickStation}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
return result;
}
}
- else
+ else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
{
-
- result.code = "1";
- result.msg = $"Putin==> 浠诲姟璧风偣:{taskData.pickStation}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- }
- }
- else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
- {
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
- if (CntrRel != null)
+ note = "鍏ュ簱";
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
{
Start = startloc.S_CODE;
- CntrCode = CntrRel.S_CNTR_CODE;
+ var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).OrderBy(a => a.T_CREATE).FirstOrDefault();
+ if (CntrRel != null)
+ {
+ 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
{
result.code = "1";
- result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
-
- }
- //鍒ゆ柇鏄惁鏄┖鎵樺洖搴�- var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == CntrCode).First();
- if (CntrItem == null)
- {
- note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 3)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛�- {
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
-
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = taskData.pickStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{taskData.dropStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 4)//鍘熸潗鏂欏簱闇�鍒ゆ柇鏄惁闇�鍒嗛厤鐢垫浠诲姟,鍒涘缓鍒嗘。浠诲姟
- {
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = taskData.pickStation;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
-
- //鍒ゆ柇妤煎眰鏄惁鐩哥瓑锛屽鏋滀笉鐩稿悓闇�鐢熸垚鍒嗘浠诲姟杩涜鐢垫璋冪敤
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
- 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();
- if (startArea == null || endArea == null)
- {
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣锛歿endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
return result;
}
- if (startArea.N_FLOOR == endArea.N_FLOOR)
+
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
{
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- Z_TYPE = n_type,
-
-
- };
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask))
- {
- LocationHelper.LockLoc(Start, 2);
-
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- }
+ End = taskData.dropStation;
}
- else if (startArea.N_FLOOR != endArea.N_FLOOR)
+ else
{
- //妤煎眰鐢垫鍒嗛厤
- var endloc1 = Settings.elevatorLoc.Find(a => a.Floor == startArea.N_FLOOR);
- var startloc1 = Settings.elevatorLoc.Find(a => a.Floor == endArea.N_FLOOR);
-
- //鍒涘缓wcs鍒嗘浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫1",
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = endloc1.Location[0],
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- Z_TYPE = n_type,
- S_MES_NO = taskData.mesTaskNo
- };
- var wcsTask1 = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "鐢垫2",
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = startloc1.Location[0],
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- S_WMS_NO = taskData.wmsTaskNo,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- Z_TYPE = n_type,
- S_MES_NO = taskData.mesTaskNo
-
- };
-
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
- {
-
- LocationHelper.LockLoc(endloc.S_CODE, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- }
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
}
}
- else
+ else if (taskData.taskType == 3)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛� {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
- }
- }
- else if (taskData.taskType == 5)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛屽苟缁戝畾鎵樼洏
- {
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- if (CreateCntrIteminfo(partData, taskData))
- {
+ note = "鍑哄簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
@@ -376,189 +239,405 @@
return result;
}
}
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
- return result;
- }
-
- }
- //鏆傚瓨浣嶅洖搴�- else if (taskData.taskType == 6)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟
- {
- //鏍规嵁鎵樼洏鍙锋壘璐т綅
- var CntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == partData.rfid).First();
- if (CntrRel != null)
- {
- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == CntrRel.S_LOC_CODE).First();
- if (startloc != null)
- {
- Start = startloc.S_CODE;
- CntrCode = CntrRel.S_CNTR_CODE;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁鎵樼洏{partData.rfid},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- //鐐瑰搴撳尯
- else if (taskData.taskType == 7)//寮傚父浣�- {
- note = "寮傚父搴撳尯鍏ュ簱";
- //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
- if (CreateCntrIteminfo(partData, taskData))
+ else if (taskData.taskType == 4)//鍘熸潗鏂欏簱闇�鍒ゆ柇鏄惁闇�鍒嗛厤鐢垫浠诲姟,鍒涘缓鍒嗘。浠诲姟
{
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
Start = taskData.pickStation;
}
- var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == taskData.dropStation).ToList();
- if (EndLocs.Count > 0)
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
{
- endloc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
- if (endloc != null)
- {
- End = endloc.S_CODE;
- }
- else
+ End = taskData.dropStation;
+ }
+
+ //鍒ゆ柇妤煎眰鏄惁鐩哥瓑锛屽鏋滀笉鐩稿悓闇�鐢熸垚鍒嗘浠诲姟杩涜鐢垫璋冪敤
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ {
+ 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();
+ if (startArea == null || endArea == null)
{
result.code = "1";
- result.msg = $"缁堢偣搴撳尯锛歿taskData.dropStation}鏃犲彲鐢ㄨ揣浣�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣锛歿endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
return result;
}
+ if (startArea.N_FLOOR == endArea.N_FLOOR)
+ {
+ //鍒涘缓wcs浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = startloc.S_WH_CODE,
+ S_START_AREA = startloc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ Z_TYPE = n_type,
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ // LocationHelper.LockLoc(End, 2);
+
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else if (startArea.N_FLOOR != endArea.N_FLOOR)
+ {
+ 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鍒嗘浠诲姟
+ var wcsTask = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鐢垫1",
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ 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 = CntrCode,
+ N_PRIORITY = taskData.priority,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ Z_TYPE = n_type,
+ S_MES_NO = taskData.mesTaskNo
+ };
+ var wcsTask1 = new WCSTask
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "鐢垫2",
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = elevatorLoc.S_CODE,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = elevatorLoc.S_WH_CODE,
+ S_START_AREA = elevatorLoc.S_AREA_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = taskData.priority,
+ S_WMS_NO = taskData.wmsTaskNo,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ Z_TYPE = n_type,
+ S_MES_NO = taskData.mesTaskNo
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
+ {
+
+ // LocationHelper.LockLoc(Start, 1);
+ //LocationHelper.LockLoc(End, 2);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+
+
+
+ }
}
else
{
result.code = "1";
- result.msg = $"鏍规嵁缁堢偣搴撳尯锛歿taskData.dropStation},鏈壘鍒板搴旇揣浣�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
return result;
}
}
- else
+ else if (taskData.taskType == 5)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛屽苟缁戝畾鎵樼洏
{
- result.code = "1";
- result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
- AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
- return result;
- }
- }
- else if (taskData.taskType == 8)//鍙犵洏鏈虹┖鎵樺洖搴�- {
- note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�- startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
- if (startloc != null)
- {
- Start = startloc.S_CODE;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣:{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
- if (endloc != null)
- {
- End = taskData.dropStation;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣:{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
- }
- else
- {
- LogHelper.Info($"Createtask==> 浠诲姟绫诲瀷鏈夎");
- result.code = "1";
- result.msg = "浠诲姟绫诲瀷锛歿taskData.taskType}涓嶅湪瑙勫畾鑼冨洿鍐�;
- AddErrorInfo("浠诲姟绫诲瀷閿欒", result.msg, Source);
- }
- if (taskData.taskType != 4)
- {
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
- if (startloc.N_LOCK_STATE != 0)
+ note = "鍑哄簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ if (CreateCntrIteminfo(partData, taskData))
+ {
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
+ {
+ Start = taskData.pickStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{taskData.dropStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else
{
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
- AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
return result;
}
- var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE.Trim()).First();
- var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE.Trim()).First();
- if (startArea == null || endArea == null)
- {
- LogHelper.Info($"璧风偣锛歿JsonConvert.SerializeObject(startArea)}");
- LogHelper.Info($"缁堢偣锛歿JsonConvert.SerializeObject(endArea)}");
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣{endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
- AddErrorInfo("搴撳尯鏌ユ壘澶辫触", result.msg);
- return result;
- }
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
- S_EQ_NO = taskData.taskNum,
- S_START_LOC = Start,
- S_END_LOC = End,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.S_AREA_CODE,
- N_SCHEDULE_TYPE = 1,
- S_CNTR_CODE = CntrCode,
- N_PRIORITY = taskData.priority,
- Z_TYPE = n_type,
- N_START_LAYER = 1,
- N_END_LAYER = 1,
- S_WMS_NO = taskData.wmsTaskNo,
- S_NOTE = note,
- S_MES_NO = taskData.mesTaskNo
- };
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask))
+ }
+ //鏆傚瓨浣嶅洖搴�+ else if (taskData.taskType == 6)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟
+ {
+ note = "鍏ュ簱";
+ //鏍规嵁鎵樼洏鍙锋壘璐т綅
+ var CntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == partData.rfid).First();
+ if (CntrRel != null)
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == CntrRel.S_LOC_CODE).First();
+ if (startloc != null)
+ {
+ Start = startloc.S_CODE;
+ CntrCode = CntrRel.S_CNTR_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁鎵樼洏{partData.rfid},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ //鐐瑰搴撳尯
+ else if (taskData.taskType == 7)//寮傚父浣�+ {
+ note = "寮傚父搴撳尯鍏ュ簱";
+ //鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
+ if (CreateCntrIteminfo(partData, taskData))
+ {
+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
+ {
+ Start = taskData.pickStation;
+ }
+ var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == taskData.dropStation).ToList();
+ if (EndLocs.Count > 0)
+ {
+ endloc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
+ if (endloc != null)
+ {
+ End = endloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"缁堢偣搴撳尯锛歿taskData.dropStation}鏃犲彲鐢ㄨ揣浣�;
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣搴撳尯锛歿taskData.dropStation},鏈壘鍒板搴旇揣浣�;
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓鎵樼洏鐗╂枡淇℃伅澶辫触";
+ AddErrorInfo("鍒涘缓鎵樼洏澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else if (taskData.taskType == 8)//鍙犵洏鏈虹┖鎵樺洖搴�+ {
+ note = "绌烘墭鍥炲簱";//浜曟澗绌烘墭鍥炲簱锛岄渶瑕佷笌鍙犵洏鏈哄畨鍏ㄤ氦浜�+ startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
+ if (startloc != null)
+ {
+ Start = startloc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣:{taskData.pickStation},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
+ }
+ endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.dropStation).First();
+ if (endloc != null)
+ {
+ End = taskData.dropStation;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣:{End},鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ AddErrorInfo("璐т綅鏌ユ壘澶辫触", result.msg, Source);
+ return result;
}
}
else
{
+ LogHelper.Info($"Createtask==> 浠诲姟绫诲瀷鏈夎");
result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
+ result.msg = "浠诲姟绫诲瀷锛歿taskData.taskType}涓嶅湪瑙勫畾鑼冨洿鍐�;
+ AddErrorInfo("浠诲姟绫诲瀷閿欒", result.msg, Source);
+ }
+ if (taskData.taskType != 4)
+ {
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
+ {
+ if (startloc.N_LOCK_STATE != 0)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ return result;
+ }
+ var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE.Trim()).First();
+ var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE.Trim()).First();
+ if (startArea == null || endArea == null)
+ {
+ LogHelper.Info($"璧风偣锛歿JsonConvert.SerializeObject(startArea)}");
+ LogHelper.Info($"缁堢偣锛歿JsonConvert.SerializeObject(endArea)}");
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐�{startloc.S_AREA_CODE},缁堢偣{endloc.S_AREA_CODE}鏈壘鍒板搴斿簱鍖�;
+ 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
+ {
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = startArea.S_NAME + "->" + endArea.S_NAME,
+ S_EQ_NO = taskData.taskNum,
+ S_START_LOC = Start,
+ S_END_LOC = End,
+ N_CNTR_COUNT = 1,
+ S_START_WH = startloc.S_WH_CODE,
+ S_END_WH = endloc.S_WH_CODE,
+ S_END_AREA = endloc.S_AREA_CODE,
+ N_SCHEDULE_TYPE = 1,
+ S_CNTR_CODE = CntrCode,
+ N_PRIORITY = pri,
+ Z_TYPE = n_type,
+ N_START_LAYER = 1,
+ N_END_LAYER = 1,
+ S_WMS_NO = taskData.wmsTaskNo,
+ S_NOTE = note,
+ S_MES_NO = taskData.mesTaskNo
+
+ };
+ LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
+ 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;
+ }
}
}
+
return result;
}
@@ -676,6 +755,7 @@
/// <returns></returns>
internal static Result TrayItembind(TrayItembind model)
{
+
Result result = new Result() { code = "200", msg = "浜у嚭淇℃伅涓嬪彂鎴愬姛" };
if (model == null)
{
@@ -684,33 +764,39 @@
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.CreateCntrItemTray(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime, model.PowderType))
+ {
+ //鍒涘缓鎴愬姛娴佺▼
+ }
+ 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;
- }
+
}
+ public static object _Putin = new object();
/// <summary>
/// 鍏ュ钩搴� /// </summary>
@@ -733,155 +819,177 @@
return result;
}
var db = new SqlHelper<object>().GetInstance();
- Location loc = new Location();
+ Location loc = null;
string Start = model.InitialLocation; //璧风偣璐т綅
string itemcode = model.PartNumber; //鐗╂枡缂栫爜
string areacode = "";
try
{
-
- #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�濡傛灉娌＄粦瀹氭墭鐩樺垯缁戝畾鎵樼洏
- var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
- if (CntrLoc != null)
+ lock (_Putin)
{
- if (CntrLoc.S_LOC_CODE != Start)
+ #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}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏃犵粦瀹氱墿鏂欐暟鎹�;
LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鎵樼洏缁戝畾浣嶇疆涓嶅悓", result.msg, Source);
+ AddErrorInfo("鎵樼洏缁戝畾鐗╂枡鏁版嵁涓虹┖", result.msg, Source);
return result;
}
- }
- else
- {
- LocationHelper.BindingLoc(Start, new List<string> { model.Rfid });
- //LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�);
- //result.code = "1";
- //result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�;
- //AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg);
- //return result;
- }
- // Console.WriteLine("鏌ヨ璐т綅缁戝畾鍏崇郴");
- //鍒ゆ柇鎵樼洏涓庤揣浣嶆槸鍚︽湁缁戝畾鍏崇郴锛屽鏋滄病鏈夊垯杩涜缁戝畾
- // var cntrloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
- // Console.WriteLine($"鑾峰彇缁戝畾鍏崇郴:{JsonConvert.SerializeObject(cntrloc)}");
- //if (cntrloc == null)
- //{
- // // Console.WriteLine("缁戝畾鎵樼洏");
- // List<string> cntrs = new List<string>() { model.Rfid };
+ #endregion
- // LocationHelper.BindingLoc(Start, cntrs);
- //}
- //else
- //{
-
- // if (cntrloc.S_LOC_CODE != Start)
- // {
-
- // LogHelper.Info($"Putin==>鎵樼洏:{model.Rfid}宸插拰璐т綅{cntrloc.S_LOC_CODE}鏈夌粦瀹氬叧绯�);
- // result.code = "1";
- // result.msg = $"鎵樼洏:{model.Rfid}宸插拰璐т綅{cntrloc.S_LOC_CODE}鏈夌粦瀹氬叧绯�;
- // }
-
- //}
- #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)
+ #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�濡傛灉娌＄粦瀹氭墭鐩樺垯缁戝畾鎵樼洏
+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (CntrLoc != null)
{
- areacode = whcode.PMK;
+ 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
{
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ LocationHelper.BindingLoc(Start, new List<string> { model.Rfid });
+ //LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�);
+ //result.code = "1";
+ //result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�;
+ //AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg);
+ //return result;
}
-
- //鍒ゆ柇鏈夋棤鐩稿悓鐗╂枡鎺�- loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
+ // Console.WriteLine("鏌ヨ璐т綅缁戝畾鍏崇郴");
+ //鍒ゆ柇鎵樼洏涓庤揣浣嶆槸鍚︽湁缁戝畾鍏崇郴锛屽鏋滄病鏈夊垯杩涜缁戝畾
+ // var cntrloc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ // Console.WriteLine($"鑾峰彇缁戝畾鍏崇郴:{JsonConvert.SerializeObject(cntrloc)}");
+ //if (cntrloc == null)
//{
- // //鏃犵浉鍚岀墿鏂欐帓鎵剧┖鎺�- // loc = emptyRow(areacode);
+ // // Console.WriteLine("缁戝畾鎵樼洏");
+ // List<string> cntrs = new List<string>() { model.Rfid };
+
+ // LocationHelper.BindingLoc(Start, cntrs);
//}
- if (loc != null)
+ //else
+ //{
+
+ // if (cntrloc.S_LOC_CODE != Start)
+ // {
+
+ // LogHelper.Info($"Putin==>鎵樼洏:{model.Rfid}宸插拰璐т綅{cntrloc.S_LOC_CODE}鏈夌粦瀹氬叧绯�);
+ // result.code = "1";
+ // result.msg = $"鎵樼洏:{model.Rfid}宸插拰璐т綅{cntrloc.S_LOC_CODE}鏈夌粦瀹氬叧绯�;
+ // }
+
+ //}
+ #endregion
+
+ #region 鏍规嵁璧风偣璐т綅鐨勪粨搴撶紪鐮�鑾峰彇骞冲簱缂栫爜,骞惰绠楀叆搴撹揣浣�+ string End = "";
+ var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
+ if (startloc != null)
{
- End = loc.S_CODE;
+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ 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 = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
+ result.msg = $"浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
- }
- else
- {
-
- result.code = "1";
- result.msg = $"浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
- }
- #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);
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
return result;
}
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
{
- 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,
- Z_TYPE = n_type
- };
- LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
- if (WCSHelper.CreateTask(wcsTask))
- {
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ 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
+
}
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
- }
- #endregion
return result;
}
@@ -894,6 +1002,7 @@
}
}
+ public static object _PutOut = new object();
/// <summary>
/// 鍑哄钩搴� /// </summary>
@@ -920,91 +1029,115 @@
string Start = "";
string End = "";
string CntrCode = "";
-
string itemcode = model.PartNumber;
string cntrType = "";
string areacode = "";
var db = new SqlHelper<object>().GetInstance();
#endregion
-
try
{
-
- #region 鏍规嵁鐗╂枡缂栫爜瑙勫垯 璁＄畻鍑哄簱搴撳尯
- //绮夋枡浠庡钩搴撳嚭搴擄紝鍏朵粬鐗╂枡闇�浠庢殏瀛樺尯鍑哄簱
- var locJt = db.Queryable<Location>().Where(a => a.S_AREA_CODE == model.WorkCenter).First();
- if (locJt == null)
+ lock (_PutOut)
{
- result.code = "1";
- result.msg = $"鏍规嵁鏈哄彴缂栫爜锛歿model.WorkCenter}鏈壘鍒板搴旇揣浣�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
- //鏍规嵁浠撳簱 璁＄畻搴撳尯
- var whcode = Settings.wareLoc.Where(a => a.AreaCode == locJt.S_WH_CODE).FirstOrDefault();
- if (whcode != null)
- {
- if (model.PartNumber.StartsWith("4X"))
+ #region 鏍规嵁鐗╂枡缂栫爜瑙勫垯 璁＄畻鍑哄簱搴撳尯
+ //绮夋枡浠庡钩搴撳嚭搴擄紝鍏朵粬鐗╂枡闇�浠庢殏瀛樺尯鍑哄簱
+ var locJt = db.Queryable<Location>().Where(a => a.S_AREA_CODE == model.WorkCenter).First();
+ if (locJt == null)
{
- areacode = whcode.PMK;
- cntrType = "PM";
+ result.code = "1";
+ result.msg = $"鏍规嵁鏈哄彴缂栫爜锛歿model.WorkCenter}鏈壘鍒板搴旇揣浣�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
- else
+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == locJt.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
{
- if (model.PartNumber.StartsWith("3"))
+ if (model.PartNumber.StartsWith("4X"))
{
- cntrType = "RC";
- areacode = whcode.ZCW;
+ areacode = whcode.PMK;
+ cntrType = "PM";
+ }
+ else if (model.PartNumber.StartsWith("32"))
+ {
+ areacode = whcode.ZCW2;
}
else
{
+ if (model.PartNumber.StartsWith("3"))
+ {
+ cntrType = "RC";
+ areacode = whcode.ZCW;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岀墿鏂欏彿{model.PartNumber}涓嶅睘浜庤瀹氱墿鏂�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鐗╂枡缂栫爜鏍煎紡閿欒", result.msg, Source);
+ return result;
+ }
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣搴撳尯浠撳簱缂栫爜锛歿locJt.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ #endregion
+
+ #region 鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅锛岄�寰�嚎杈逛綅缃�+ Location Endloc = null;
+ //鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅
+ 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)
+ {
+ End = Endloc.S_CODE;
+ }
+ else
+ {
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岀墿鏂欏彿{model.PartNumber}涓嶅睘浜庤瀹氱墿鏂�;
+ result.msg = $"Computeloc==銆嬫牴鎹満鍙扮紪鐮侊細{model.WorkCenter},宸ヨ绫诲瀷锛歿cntrType} 鏈壘鍒扮┖璐т綅鏁版嵁锛岃妫�煡璐т綅琛�;
LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鐗╂枡缂栫爜鏍煎紡閿欒", result.msg, Source);
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
}
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁缁堢偣搴撳尯浠撳簱缂栫爜锛歿locJt.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
- #endregion
-
- #region 鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅锛岄�寰�嚎杈逛綅缃�- var Endloc = new Location();
- //鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅
- var loc = airlift(areacode, itemcode, model.PartLevel);
- 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)
+ else
{
- End = Endloc.S_CODE;
+
+ result.code = "1";
+ result.msg = $"浠诲姟鐗╂枡:{itemcode}鎵句笉鍒板搴斿簱瀛�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
- }
- else
- {
+ #endregion
- result.code = "1";
- result.msg = $"浠诲姟鐗╂枡:{itemcode}鎵句笉鍒板搴斿簱瀛�;
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
- #endregion
-
- #region 浠诲姟鍒涘缓
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
+ #region 浠诲姟鍒涘缓
+ if (string.IsNullOrEmpty(Start))
+ {
+ 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";
@@ -1029,25 +1162,30 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
Z_TYPE = n_type
+
};
LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
if (WCSHelper.CreateTask(wcsTask))
{
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
+ //LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
}
- }
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
+
+ #endregion
+
return result;
}
- #endregion
- return result;
}
catch (Exception ex)
{
@@ -1059,6 +1197,7 @@
}
+ public static object _lockEmpty = new object();
/// <summary>
/// 绌哄伐瑁呭洖搴� /// </summary>
@@ -1081,200 +1220,245 @@
string Start = model.InitialLocation;
string itemcode = "";
int endlayer = 1;
- Location loc = new Location();
+ Location loc = null;
string areacode = "";
- WCSTask mst = new WCSTask();
List<WCSTask> msts = new List<WCSTask>();
#endregion
try
{
- #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)
- // {
- // LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}");
- // result.code = "1";
- // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}";
- // AddErrorInfo("鎵樼洏缁戝畾浣嶇疆涓嶅悓", result.msg);
- // return result;
- // }
- //}
- //else
- //{
- // LogHelper.Info($"ItemBack锛氬垱寤轰换鍔″け璐ワ紝鎵樼洏:{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�);
- // result.code = "1";
- // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�;
- // AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg);
- // return result;
- //}
- #endregion
-
- #region 鏍规嵁璐т綅妤煎眰鍒ゆ柇锛�妤煎幓寰�彔鐩樹綅 鍏朵粬鐨勫洖搴�- var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
- if (startloc != null)
+ lock (_lockEmpty)
{
- if (startloc.N_LAYER == 3)
+
+
+ #region 鏍规嵁璐т綅妤煎眰鍒ゆ柇锛�妤煎幓寰�彔鐩樹綅 鍏朵粬鐨勫洖搴�+ var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
+ if (startloc != null)
{
- //鍙犵洏璐т綅璁＄畻鍙犵洏璐т綅
- 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)
+ if (!string.IsNullOrEmpty(startloc.S_NOTE1))
{
- // LogHelper.Info($"鑾峰彇鍙犵洏璐т綅:{JsonConvert.SerializeObject(dploc)}");
- loc = dploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
- if (loc == null)
+ //鍙犵洏璐т綅璁＄畻鍙犵洏璐т綅
+ // 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_NOTE1.Trim() == startloc.S_NOTE1 + "鍙犵洏" && a.S_WH_CODE.Trim() == startloc.S_WH_CODE).ToList();
+ if (dploc.Count > 0)
{
- result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- return result;
+ // LogHelper.Info($"鑾峰彇鍙犵洏璐т綅:{JsonConvert.SerializeObject(dploc)}");
+ 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($"{startloc.S_NOTE1}鍙犵洏浣嶏紝閮藉凡缁忔湁閿佹垨鑰呭凡缁忓彔婊★紝璇锋鏌ヨ揣浣嶇姸鎬�);
+ result.code = "1";
+ result.msg = $"{startloc.S_NOTE1}鍙犵洏璐т綅涓嶅彲鐢紝缁堢偣搴撳尯娌℃湁鍙敤璐т綅锛岃妫�煡閿佺姸鎬佸拰鏁伴噺";
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ else
+ {
+ endlayer = loc.N_CURRENT_NUM + 1;
+ }
}
else
{
- endlayer = loc.N_CURRENT_NUM + 1;
+ // LogHelper.Info($"鏍规嵁璐т綅妤煎眰锛歿startloc.N_LAYER}锛屼粨搴撶紪鐮侊細{startloc.S_WH_CODE}锛岃揣浣嶅娉細鍙犵洏锛屾湭鎵惧埌鍙犵洏璐т綅");
+ result.code = "1";
+ result.msg = $"{startloc.S_NOTE1}鍙犵洏璐т綅涓嶅彲鐢紝鏈壘鍒板彲鍙犵洏璐т綅";
+ LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛歿startloc.S_NOTE1}鍙犵洏锛岃揣浣嶄粨搴�{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ else 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 && 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)}");
+ 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 = $"鍙犵洏璐т綅涓嶅彲鐢紝缁堢偣搴撳尯娌℃湁鍙敤璐т綅锛岃妫�煡閿佺姸鎬佸拰鏁伴噺";
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ else
+ {
+ endlayer = loc.N_CURRENT_NUM + 1;
+ }
+ }
+ else
+ {
+ // LogHelper.Info($"鏍规嵁璐т綅妤煎眰锛歿startloc.N_LAYER}锛屼粨搴撶紪鐮侊細{startloc.S_WH_CODE}锛岃揣浣嶅娉細鍙犵洏锛屾湭鎵惧埌鍙犵洏璐т綅");
+ result.code = "1";
+ result.msg = $"鍙犵洏璐т綅涓嶅彲鐢紝鏈壘鍒板彲鍙犵洏璐т綅";
+ LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛氬彔鐩橈紝璐т綅妤煎眰:{startloc.N_LAYER},璐т綅浠撳簱:{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
+ }
+ 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)
+ {
+ 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 = $"鍙犵洏璐т綅涓嶅彲鐢紝缁堢偣搴撳尯娌℃湁鍙敤璐т綅锛岃妫�煡閿佺姸鎬佸拰鏁伴噺";
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ else
+ {
+ endlayer = loc.N_CURRENT_NUM + 1;
+ }
+ }
+ else
+ {
+ LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛氱墖鑳跺爢鍙犱綅,璐т綅浠撳簱:{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
+ result.code = "1";
+ result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
}
}
else
{
+ #region 鏍规嵁璧风偣璐т綅绫诲瀷锛岃幏寰楀洖搴撳簱鍖�+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
+ {
+ if (string.IsNullOrEmpty(startloc.S_NOTE))
+ {
+ areacode = whcode.PMK;
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($" {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ #endregion
+ //鍥炲簱璐т綅璁＄畻搴撳尯璐т綅
+ if (string.IsNullOrEmpty(areacode))
+ {
+ result.code = "1";
+ result.msg = $"璧风偣璐т綅{startloc.S_CODE}鏃犳硶鎵惧埌鍥炲簱搴撳尯锛岃妫�煡璧风偣璐т綅";
+ LogHelper.Info($" {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+ 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
+ //{
+
+ // result.code = "1";
+ // result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
+ // LogHelper.Info($"{result.msg}");
+ // AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ // return result;
+ //}
+ }
+
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"Empty==> 浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"{result.msg}");
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (startloc != null && loc != null)
+ {
+ if (startloc.N_LOCK_STATE != 0 && loc.N_LOCK_STATE != 0)
+ {
result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
- LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛氬彔鐩橈紝璐т綅妤煎眰:{startloc.N_LAYER},璐т綅浠撳簱:{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐硅揣浣嶇姸鎬亄startloc.N_LOCK_STATE},璧风偣璐т綅鐘舵�锛歿loc.N_LOCK_STATE}";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg);
return result;
}
- }
- 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).ToList();
- if (KjDploc.Count > 0)
+ LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟,缁堢偣璐т綅涓虹┖锛� + JsonConvert.SerializeObject(loc));
+ //鍒涘缓wcs浠诲姟
+ var wcsTask = new WCSTask
{
- loc = KjDploc.FindAll(a => a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM < 6).OrderByDescending(a => a.N_CURRENT_NUM).FirstOrDefault();
- if (loc == null)
+ S_CODE = WCSHelper.GenerateTaskNo(),
+ S_TYPE = "绌哄伐瑁呭洖搴�,
+ S_EQ_NO = model.TaskNumber,
+ S_START_LOC = startloc.S_CODE,
+ S_END_LOC = loc.S_CODE,
+ 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 = endlayer,
+ N_PRIORITY = 1,
+ S_B_STATE="绛夊緟鎺ㄩ�",
+ Z_TYPE = 5
+ };
+ LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ //LocationHelper.LockLoc(startloc.S_CODE, 2);
+ //LocationHelper.LockLoc(loc.S_CODE, 1);
+ // 绌烘墭鍥炲簱鍒ゆ柇鎵樼洏鏈夋棤缁戝畾鐗╂枡淇℃伅 濡傛灉鏈夊垯鍒犻櫎
+ 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)
{
- result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- return result;
+ container = new Container { S_CODE = model.Rfid };
+ db.Insertable<Container>(container).ExecuteCommand();
}
- else
- {
- endlayer = loc.N_CURRENT_NUM + 1;
- }
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
}
else
{
- LogHelper.Info($"鏍规嵁璐т綅澶囨敞锛氱墖鑳跺爢鍙犱綅,璐т綅浠撳簱:{startloc.S_WH_CODE}锛屾壘涓嶅埌鍙犵洏璐т綅");
result.code = "1";
- result.msg = $"鍙犵洏璐т綅涓嶅彲鐢�;
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ result.msg = $"浠诲姟鍒涘缓澶辫触锛岃妫�煡璧风偣璐т綅鐘舵�鍚庨噸鏂颁笅鍙�;
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
return result;
}
}
else
{
- #region 鏍规嵁璧风偣璐т綅绫诲瀷锛岃幏寰楀洖搴撳簱鍖�- //鏍规嵁浠撳簱 璁＄畻搴撳尯
- var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
- if (whcode != null)
- {
- if (startloc.S_NOTE == "PM" || string.IsNullOrEmpty(startloc.S_NOTE))
- {
- areacode = whcode.PMK;
- }
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
- #endregion
-
- //鍥炲簱璐т綅璁＄畻搴撳尯璐т綅
- loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
- //{
- // loc = emptyRow(areacode);
- // if (loc == null)
- // {
- // LogHelper.Info($"搴撳尯锛歿areacode}娌℃湁绌烘帓");
- // }
- //}
- //else
- //{
-
- // result.code = "1";
- // result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
- // LogHelper.Info($"{result.msg}");
- // AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
- // return result;
- //}
- }
-
- }
- else
- {
-
- result.code = "1";
- result.msg = $"Empty==> 浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- LogHelper.Info($"{result.msg}");
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
- return result;
- }
- #endregion
-
- #region 鍒涘缓浠诲姟
- if (startloc != null && loc != null)
- {
- if (startloc.N_LOCK_STATE != 0 && loc.N_LOCK_STATE != 0)
- {
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐硅揣浣嶇姸鎬亄startloc.N_LOCK_STATE},璧风偣璐т綅鐘舵�锛歿loc.N_LOCK_STATE}";
- AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
return result;
}
- //鍒涘缓wcs浠诲姟
- var wcsTask = new WCSTask
- {
- S_CODE = WCSHelper.GenerateTaskNo(),
- S_TYPE = "绌哄伐瑁呭洖搴�,
- S_EQ_NO = model.TaskNumber,
- S_START_LOC = startloc.S_CODE,
- S_END_LOC = loc.S_CODE,
- 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 = endlayer,
- Z_TYPE = 5
- };
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
- if (WCSHelper.CreateTask(wcsTask))
- {
- LocationHelper.LockLoc(startloc.S_CODE, 2);
- LocationHelper.LockLoc(loc.S_CODE, 1);
- // 绌烘墭鍥炲簱鍒ゆ柇鎵樼洏鏈夋棤缁戝畾鐗╂枡淇℃伅 濡傛灉鏈夊垯鍒犻櫎
- 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(); }
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
- }
+ #endregion
}
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
- }
- #endregion
+
}
catch (Exception ex)
{
@@ -1286,6 +1470,8 @@
return result;
}
+
+ public static object _lockcallfixture = new object();
/// <summary>
/// 绌哄伐瑁呭懠鍙�@@ -1308,113 +1494,143 @@
#region 鍙橀噺
string Start = "";
string End = model.TargetLocation;
- string itemcode = "";
+
string areacode = "";
string cntrcode = "";
- Location startloc = new Location();
+ Location startloc = null;
+ // startloc = LocationHelper.GetLocByAreacode(areacode, model.CarrierType);
#endregion
try
{
- #region 鏍规嵁浠撳簱缂栫爜鍒ゆ柇搴撳尯 骞惰绠楀嚭搴撹揣浣�- var endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == End).First();
- //鏍规嵁浠撳簱 璁＄畻搴撳尯
-
- if (endloc != null)
+ lock (_lockcallfixture)
{
- var whcode = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).FirstOrDefault();
- if (whcode != null)
+ #region 鏍规嵁浠撳簱缂栫爜鍒ゆ柇搴撳尯 骞惰绠楀嚭搴撹揣浣�+ var endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == End).First();
+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ if (endloc != null)
{
- areacode = whcode.PMK;
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿endloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
-
-
- //璁＄畻鍑哄簱鎵樼洏
- startloc = airlift(areacode, itemcode);
- if (startloc != null)
- {
- var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
- if (cntr != null)
+ #region 鏍￠獙缁堢偣鏄惁鍙�
+ if (endloc.N_CURRENT_NUM >= 1 || endloc.N_LOCK_STATE != 0)
{
- Start = cntr.S_LOC_CODE;
- cntrcode = cntr.S_CNTR_CODE;
+ result.code = "1";
+ result.msg = $"缁堢偣璐т綅锛歿End}涓嶅彲鐢�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("璐т綅涓嶅彲鐢�, result.msg, Source);
+ return result;
+ }
+ #endregion
+
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
+ {
+ areacode = whcode.PMK;
}
else
{
result.code = "1";
- result.msg = $"鍒涘缓绌哄伐瑁呭懠鍙换鍔�=>鏍规嵁璐т綅{endloc.S_CODE}鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿endloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
+
+ //璁＄畻鍑哄簱鎵樼洏
+ 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();
+ if (cntr != null)
+ {
+ Start = cntr.S_LOC_CODE;
+ cntrcode = cntr.S_CNTR_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓绌哄伐瑁呭懠鍙换鍔�=>鏍规嵁璐т綅{endloc.S_CODE}鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ LogHelper.Info($"callfixture:{result.msg}");
+ 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;
}
}
-
- }
- else
- {
-
- result.code = "1";
- result.msg = $"浠诲姟璧风偣:{End}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
- LogHelper.Info($"callfixture:{result.msg}");
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
-
- }
- #endregion
-
- #region 鍒涘缓浠诲姟
- if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
- {
- if (startloc.N_LOCK_STATE != 0)
+ else
{
+
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
- AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ result.msg = $"浠诲姟璧风偣:{End}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
+ LogHelper.Info($"callfixture:{result.msg}");
+ 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 = 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 = 5
+ #endregion
- };
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
- if (WCSHelper.CreateTask(wcsTask))
+ #region 鍒涘缓浠诲姟
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ if (startloc.N_LOCK_STATE != 0)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ 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 = 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 = 5,
+ N_PRIORITY = 1,
+ S_NOTE = "绮夋枡"
+ };
+ 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 = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ return result;
+ }
return result;
+ #endregion
}
- return result;
- #endregion
+
}
catch (Exception ex)
@@ -1429,6 +1645,7 @@
}
+ public static object _lockItemBack = new object();
/// <summary>
/// 浣欐枡杩斿洖
/// </summary>
@@ -1452,117 +1669,93 @@
string Start = model.InitialLocation;
string End = "";
string itemcode = model.PartNumber;
- Location loc = new Location();
+ Location loc = null;
string areacode = "";
- WCSTask mst = new WCSTask();
List<WCSTask> msts = new List<WCSTask>();
#endregion
try
{
-
-
- #region 浣欐枡杩斿洖鏍规嵁鎵樼洏鎵惧嚭搴撲换鍔�- //浣欐枡杩斿洖鏍规嵁鎵樼洏鎵惧嚭搴撲换鍔�- //msts = WCSHelper.GetTaskBycntrcode(model.Rfid);
- //if (msts.Count() > 0)
- //{
- // msts.RemoveAll(a => string.IsNullOrEmpty(a.S_CNTR_CODE));
- // mst = msts.OrderByDescending(a => a.T_CREATE).FirstOrDefault();
- //}
- //if (mst != null)
- //{
- // areacode = mst.S_START_AREA;
- //}
- //else
- //{
- // result.code = "1";
- // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹墭鐩樼紪鐮亄model.Rfid}鏈壘鍒版墭鐩樺嚭搴撲换鍔�;
- // AddErrorInfo("鏌ユ壘浠诲姟澶辫触", result.msg);
- // return result;
- //}
- //if (string.IsNullOrEmpty(areacode))
- //{
- // LogHelper.Info($"鍒涘缓浠诲姟澶辫触锛屾牴鎹墭鐩樼紪鐮亄model.Rfid}鎵惧埌鍑哄簱浠诲姟{mst.S_CODE}鐨勮捣鐐瑰簱鍖轰负绌�);
- // result.code = "1";
- // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹墭鐩樼紪鐮亄model.Rfid}鎵惧埌鍑哄簱浠诲姟{mst.S_CODE}鐨勮捣鐐瑰簱鍖轰负绌�;
- // AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg);
- // return result;
- //}
- #endregion
-
- #region 鏍规嵁鐗╂枡缂栫爜 鍒ゆ柇鍥炲簱杩樻槸鍥炲埌瀵瑰簲鏆傚瓨鍖�
- var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
- if (startloc != null)
+ lock (_lockItemBack)
{
- var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
- if (whcode != null)
+
+
+ #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (CntrLoc != null)
{
- //绮夋枡鐩存帴鍥炲簱锛屽叾浠栫墿鏂欓渶瑕佸幓瀵瑰簲鐨勬殏瀛樺尯
- if (model.PartNumber.StartsWith("4X"))
+ if (CntrLoc.S_LOC_CODE != Start)
{
- areacode = whcode.PMK;
- loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
- //{
- // loc = emptyRow(areacode);
- //}
+
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}";
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鎵樼洏缁戝畾浣嶇疆涓嶅悓", result.msg, Source);
+ return result;
}
- else
+ }
+ else
+ {
+ if (db.Insertable(new LocCntrRel() { S_CNTR_CODE = model.Rfid, S_LOC_CODE = Start }).ExecuteCommand() <= 0)
{
- #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;
+ }
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}缁戝畾浣嶇疆涓嶆槸璧风偣锛歿Start}";
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鎵樼洏缁戝畾浣嶇疆涓嶅悓", result.msg, Source);
- return result;
- }
+ }
+ #endregion
+
+ #region 鏍规嵁鐗╂枡缂栫爜 鍒ゆ柇鍥炲簱杩樻槸鍥炲埌瀵瑰簲鏆傚瓨鍖�
+ 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)
+ {
+ //绮夋枡鐩存帴鍥炲簱锛屽叾浠栫墿鏂欓渶瑕佸幓瀵瑰簲鐨勬殏瀛樺尯
+ #region 鏍规嵁鐗╂枡鍒ゆ柇鍥炲簱搴撳尯
+ if (model.PartNumber.StartsWith("4X"))
+ {
+ areacode = whcode.PMK;
+ //loc = StorageCompute(itemcode, areacode);
+ //if (loc == null)
+ //{
+ // loc = emptyRow(areacode);
+ //}
+ }
+ else if (model.PartNumber.StartsWith("32"))
+ {
+ areacode = whcode.ZCW2;
}
else
{
-
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�;
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg, Source);
- return result;
- }
- #endregion
-
- if (model.PartNumber.StartsWith("3"))
- {
- areacode = whcode.ZCW;
- }
- else
- {
-
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岀墿鏂欏彿{model.PartNumber}涓嶅睘浜庤瀹氱墿鏂�;
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鐗╂枡缂栫爜鏍煎紡閿欒", result.msg, Source);
- return result;
- }
- var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == areacode).ToList();
- if (EndLocs.Count > 0)
- {
- loc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
- if (loc != null)
+ if (model.PartNumber.StartsWith("3"))
{
- End = loc.S_CODE;
+ areacode = whcode.ZCW;
}
else
{
result.code = "1";
- result.msg = $"缁堢偣搴撳尯锛歿areacode}鏃犲彲鐢ㄨ揣浣�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岀墿鏂欏彿{model.PartNumber}涓嶅睘浜庤瀹氱墿鏂�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鐗╂枡缂栫爜鏍煎紡閿欒", result.msg, Source);
return result;
}
+
+
+ }
+ #endregion
+
+
+ var EndLocs = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == areacode).ToList();
+ //鏌ユ壘璐т綅搴撳尯
+ if (EndLocs.Count > 0)
+ {
+ //loc = EndLocs.Find(a => a.N_CURRENT_NUM == 0 && a.N_LOCK_STATE == 0);
+ loc = FindEndcolByLocList(EndLocs);
}
else
@@ -1572,102 +1765,124 @@
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
- //loc = StorageCompute(itemcode, areacode);
- //if (loc == null)
- //{
- // loc = emptyRow(areacode);
- //}
- }
- if (loc != null)
- {
- End = loc.S_CODE;
+
+ if (loc != null)
+ {
+ End = loc.S_CODE;
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
+ AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
+ }
+
}
else
{
result.code = "1";
- result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
+
}
else
{
result.code = "1";
- result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
- LogHelper.Info($"Putin==> {result.msg}");
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
- }
-
- }
- else
- {
-
- result.code = "1";
- result.msg = $"璐т綅:{Start}鎵句笉鍒板搴旇揣浣�;
- 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);
+ 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,
- Z_TYPE = 5
- };
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
- if (WCSHelper.CreateTask(wcsTask))
+ #endregion
+
+ #region 鍒涘缓浠诲姟
+ if (!string.IsNullOrEmpty(Start) && !string.IsNullOrEmpty(End))
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
- //鍒涘缓浠诲姟鎴愬姛 鏇存柊浣欐枡淇℃伅
- var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
- if (CntrItem != null)
+ if (startloc.N_LOCK_STATE != 0)
{
- CntrItem.F_WEIGHT = model.LotList[0].Weight.ToString();
- CntrItem.S_BS_TYPE = "浣欐枡";
- CntrItem.F_QTY = float.Parse(model.LotList[0].qty);
- CntrItem.S_ITEM_STATE = model.LotList[0].QualityStatus;
-
- db.Updateable(CntrItem).UpdateColumns(a => new { a.F_WEIGHT, a.S_BS_TYPE }).ExecuteCommand();
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ AddErrorInfo("璐т綅鏈夐攣", result.msg);
+ return result;
}
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ //鍒涘缓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 = 5
+
+ };
+ LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ if (WCSHelper.CreateTask(wcsTask))
+ {
+ //LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
+ //鍒涘缓浠诲姟鎴愬姛 鏇存柊浣欐枡淇℃伅
+ var CntrItem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (CntrItem != null)
+ {
+ CntrItem.F_WEIGHT = model.LotList[0].Weight.ToString();
+ CntrItem.S_BS_TYPE = "浣欐枡";
+ CntrItem.F_QTY = float.Parse(model.LotList[0].qty);
+ CntrItem.S_ITEM_STATE = model.LotList[0].QualityStatus;
+
+ db.Updateable(CntrItem).UpdateColumns(a => new { a.F_WEIGHT, a.S_BS_TYPE }).ExecuteCommand();
+ }
+ else
+ {
+ var cir = new CntrItemDetail
+ {
+ S_CNTR_CODE = model.Rfid,
+ S_ITEM_CODE = itemcode,
+ S_ITEM_NAME = model.PartNumber,
+ S_ITEM_SPEC = model.PartDesc,
+ F_QTY = float.Parse(model.LotList[0].qty),
+ S_BS_TYPE = "浣欐枡",
+ F_WEIGHT = model.LotList[0].Weight.ToString(),
+ S_ITEM_STATE = model.LotList[0].QualityStatus,
+ D_EXP_DATE = model.LotList[0].MaturityTime,
+ D_PRD_DATE = model.LotList[0].ProductionTime
+ };
+ db.Insertable<CntrItemDetail>(cir).ExecuteCommand();
+ }
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
}
+ else
+ {
+ result.code = "1";
+ result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
+ return result;
+ }
+ #endregion
}
- else
- {
- result.code = "1";
- result.msg = "鍒涘缓浠诲姟澶辫触锛屾湭鎵惧埌瀵瑰簲鐨勫彇璐х偣鎴栧嵏璐х偣";
- return result;
- }
- #endregion
return result;
}
@@ -1865,6 +2080,7 @@
S_CNTR_CODE = CntrCode,
N_START_LAYER = 1,
N_END_LAYER = 1,
+ N_PRIORITY = 1,
// N_TYPE = n_type
@@ -1872,9 +2088,16 @@
LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
if (WCSHelper.CreateTask(wcsTask))
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
+ //LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -1904,11 +2127,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";
@@ -1922,6 +2145,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();
@@ -1931,82 +2155,107 @@
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)
{
-
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)
+ 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 = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹揣浣嶇紪鐮�{dtcode}鏈壘鍒扮數姊揣浣�;
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ result.msg = $"鏈壘鍒颁粨搴搟startloc.S_WH_CODE}鎵�搴旂殑鐢垫锛岃妫�煡閰嶇疆鏂囦欢";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
return result;
}
+ //鏍规嵁浠诲姟鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
+ string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚", "寮�鍗歌揣", "鍗歌揣瀹屾垚" };
- //鏍规嵁鐢垫鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
- //鍒涘缓wcs鍒嗘浠诲姟
+ 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 = "鐢垫1",
+ S_TYPE = "1妤肩數姊惉杩�,
S_EQ_NO = model.Data.task_no,
- S_START_LOC = startloc.S_CODE,
- S_END_LOC = Diantiloc.S_CODE,
- N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
- S_END_WH = endloc.S_WH_CODE,
- S_END_AREA = endloc.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",
- S_EQ_NO = model.Data.task_no,
- S_START_LOC = Diantiloc.S_CODE,
+ S_START_LOC = elevatorLoc.S_CODE,
S_END_LOC = endloc.S_CODE,
N_CNTR_COUNT = 1,
- S_START_WH = startloc.S_WH_CODE,
- S_START_AREA = startloc.S_AREA_CODE,
+ S_START_WH = elevatorLoc.S_WH_CODE,
+ S_START_AREA = elevatorLoc.S_AREA_CODE,
S_END_WH = endloc.S_WH_CODE,
S_END_AREA = endloc.S_AREA_CODE,
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 = "鐢垫鎺ㄩ�"
};
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
- {
- LocationHelper.LockLoc(startloc.S_CODE, 2);
- LocationHelper.LockLoc(endloc.S_CODE, 1);
+ 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);
+
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
@@ -2023,13 +2272,54 @@
{
result.code = "1";
- result.msg = $"鐗╂枡涓绘暟鎹垱寤哄け璐�閿欒淇℃伅锛歿ex}";
+ result.msg = $"鐢垫鎼繍浠诲姟鍒涘缓澶辫触 閿欒淇℃伅锛歿ex}";
LogHelper.Error("鐐瑰鐐逛换鍔�Error锛� + ex.ToString(), ex);
return result;
}
}
+
+ /// <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>
@@ -2099,7 +2389,80 @@
return result;
}
+ /// <summary>
+ /// 搴撲綅娓呯┖
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ internal static Result ClearLocCntr(ClearTask 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;
+ }
+ string loc = model.LocationNum;
+ var db = new SqlHelper<object>().GetInstance();
+ lock (_lockCreateItem)
+ {
+ try
+ {
+ 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).First();
+ 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)
+ {
+ //娓呴櫎鎵樼洏鐗╂枡缁戝畾鍏崇郴
+ 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 璐т綅{loc}鏃犳墭鐩樿揣浣嶇粦瀹氬叧绯�);
+ }
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁璐т綅:{loc}鎵句笉鍒拌揣浣嶅叧绯�;
+ AddErrorInfo("璐т綅涓虹┖", result.msg, Source);
+ return result;
+ }
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"ClearLocCntr Error锛歿ex}");
+ db.Ado.CommitTran();
+ result.code = "1";
+ result.msg = $"Error锛歿ex}";
+ return result;
+
+ }
+ }
+
+
+
+ return result;
+ }
/// <summary>
/// 搴撲綅娓呯┖
/// </summary>
@@ -2120,41 +2483,47 @@
var db = new SqlHelper<object>().GetInstance();
try
{
- var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
- if (location != null)
+ lock (_lockCreateItem)
{
- 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.Trim()).ToList();
+ if (loccntr.Count > 0)
{
-
- LocationHelper.UnBindingLoc(loc, new List<string>() { "cntrcode" });
- // db.Deleteable<LocCntrRel>().Where(it => it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
- db.Deleteable<CntrItemDetail>().Where(it => it.S_CNTR_CODE.Trim() == cntrcode).ExecuteCommand();
+ var cntrcodes = loccntr.Select(a => a.S_CNTR_CODE.Trim()).ToList();
+ if (LocationHelper.Clear(loc, cntrcodes))
+ {
+ LogHelper.Info($"ClearLoc 搴撲綅娓呴櫎鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Info($"ClearLoc 搴撲綅娓呴櫎澶辫触");
+ result.code = "1";
+ result.msg = "搴撲綅娓呴櫎澶辫触";
+ AddErrorInfo("搴撲綅娓呴櫎澶辫触", result.msg, Source);
+ return result;
+ }
}
else
{
- LogHelper.Info($"ClearLoc 鎵樼洏{cntrcode}鏃犵墿鏂欑粦瀹氬叧绯�);
+ result.code = "1";
+ result.msg = $" ClearLoc 璐т綅{loc}鏃犳墭鐩樿揣浣嶇粦瀹氬叧绯�;
+ AddErrorInfo("搴撲綅娓呴櫎澶辫触", result.msg, Source);
+ return result;
+
}
}
+
else
{
- LogHelper.Info($"ClearLoc 璐т綅{loc}鏃犳墭鐩樿揣浣嶇粦瀹氬叧绯�);
+ result.code = "1";
+ result.msg = $"鏍规嵁璐т綅:{loc}鎵句笉鍒拌揣浣嶅叧绯�;
+ AddErrorInfo("璐т綅涓虹┖", result.msg, Source);
+ return result;
}
- }
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璐т綅:{loc}鎵句笉鍒拌揣浣嶅叧绯�;
- AddErrorInfo("璐т綅涓虹┖", result.msg, Source);
- return result;
}
}
catch (Exception ex)
@@ -2169,10 +2538,104 @@
return result;
}
+ /// <summary>
+ /// 璁惧鐘舵�涓婃姤
+ /// </summary>
+ /// <returns></returns>
+ internal static DeviceInfoModel Device()
+ {
+ var db = new SqlHelper<HangChaAGV>().GetInstance();
+ DeviceInfoModel device = new DeviceInfoModel();
+ List<DeviceInfos> deviceInfos = new List<DeviceInfos>();//鍙犵洏鏈烘姤閿欎俊鎭�+ // 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;
+ //鑾峰彇杞﹁締鎶ヨ淇℃伅
+ var agvDeviceInfo = db.Queryable<HangChaAGV>().ToList();
+ 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;
+ foreach (var agv in agvDeviceInfo)
+ {
+ string agvErrorInfo = GetAgvAlarmSendCodeTwo(agv.agvErrCode, agv.errCode2, agv.faildCode);
+ deviceInfos.Add(new DeviceInfos() { AgvNo = agv.agvNo, AgvInfo = agvErrorInfo });
+ }
+ }
+ device.DeviceInfos = deviceInfos;
+
+ return device;
+ }
+
+ /// <summary>
+ /// agv灏忚溅鏁呴殰鐮佸鐞�+ /// </summary>
+ /// <param name="errCode1">閿欒鐮�</param>
+ /// <param name="errCode2">閿欒鐮�</param>
+ /// <param name="faildCode">閿欒鐮�</param>
+ /// <returns></returns>
+ private static string GetAgvAlarmSendCodeTwo(string errCode1, string errCode2, string faildCode)
+ {
+ string result = "";
+ //灏嗘姤璀︿俊鎭暣鍚�+ string binSW1 = Convert.ToString(int.Parse(errCode1), 2).PadLeft(22, '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++)
+ {
+ if (arr1[i] == '1')
+ {
+ var ErrorInfo = Settings.agvErrorCode1.Where(a => a.ErrorCode == i).FirstOrDefault();
+ if (ErrorInfo != null)
+ {
+ result = result + "," + $"{ErrorInfo.ErrorInfo}";
+ }
+
+ }
+ }
+ for (int i = 0; i <= arr2.Length; i++)
+ {
+ 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;
+ }
#endregion
#region 鍚堣偉浣抽�涓氬姟鏂规硶
+
+
/// <summary>
/// 鎵樼洏鍏ュ簱绠楁硶
/// </summary>
@@ -2181,55 +2644,29 @@
/// <returns></returns>
internal static Location StorageCompute(string itemcode, string areacode)
{
+ //Location result = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM == 0 && a.S_AREA_CODE.Trim() == areacode && a.N_LOCK_STATE == 0).First();
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();
- //鏌ヨ鎵�湁鏈夋墭鐩樼殑鎺掓病閿佺殑鎺�- // 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)
- //{
- // for (int i = 0; i < list.Count; i++)
- // {
- // LogHelper.Info($"鏈夋墭鐩樻帓鍙穥list[i].N_ROW}锛岀墿鏂欑紪鐮亄itemcode},搴撳尯{areacode}");
- // //鏌ヨ璐т綅缁戝畾鎵樼洏
- // var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == list[i].S_CODE).First();
- // if (cntr != null)
- // {
- // //鏌ヨ鎵樼洏鐗╂枡淇℃伅
- // var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
+ Location result = null;
+ // 867C567A-183C-413B-9891-15D8F6DE1620
- // if (string.IsNullOrEmpty(itemcode))//绌烘墭鍏ュ簱
- // {
- // if (iteminfo == null)
- // {
- // //鐗╂枡鐩稿悓鍏ヨ揣浣嶅悗涓�綅璐т綅
- // result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();
- // }
- // }
- // else//婊℃嫋鍏ュ簱
- // {
- // if (iteminfo != null)
- // {
- // if (iteminfo.S_ITEM_CODE == itemcode)
- // {
- // //鐗╂枡鐩稿悓鍏ヨ揣浣嶅悗涓�綅璐т綅
- // result = db.Queryable<Location>().OrderBy(a => a.N_COL).Where(a => a.S_AREA_CODE.Trim() == areacode && a.N_ROW == list[i].N_ROW && a.N_COL > list[i].N_COL && a.N_LOCK_STATE == 0 && a.N_CURRENT_NUM == 0).First();
+ // 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();
- // }
- // }
- // }
- // if (result != null)
- // {
- // return result;
- // }
- // }
- // else
- // {
- // LogHelper.Info($"鏍规嵁璐х墿缂栫爜{list[i].S_CODE}鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�);
- // }
- // }
- //}
+ //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);
+ }
+
return result;
}
+
/// <summary>
/// 鏍规嵁鐗╂枡璁＄畻鎵樼洏鍑哄簱
@@ -2237,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;
@@ -2295,9 +2733,14 @@
//}
#endregion
- var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
- LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鐗╂枡绛夌骇璁＄畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
- result = FindStartcolByLoclist(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)
+ {
+ result = loc.OrderByDescending(a => a.N_COL).First();
+ }
+
LogHelper.Info($"airlift=>鍙敤璐т綅涓猴細{JsonConvert.SerializeObject(result)}");
return result;
}
@@ -2336,10 +2779,25 @@
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);
}
}
+
+ //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>
/// 鏍规嵁鎵樼洏缂栫爜锛屾満鍙扮紪鐮侊紝宸ヨ绫诲瀷璁＄畻鏈哄彴绾胯竟鍖哄煙
@@ -2350,7 +2808,7 @@
/// <returns></returns>
internal static Location Computeloc(string cntrcode, string jtcode, string cntrType)
{
- Location End = new Location();
+ Location End = null;
var db = new SqlHelper<object>().GetInstance();
@@ -2358,7 +2816,7 @@
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).First();
+ 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)
{
End = loc;
@@ -2411,11 +2869,53 @@
}
/// <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>
/// <returns></returns>
- internal static Location FindEndcolByLocList(List<Location> locations, string itemcode)
+ internal static Location FindEndcolByLocList(List<Location> locations)
{
try
{
@@ -2425,13 +2925,16 @@
var rows = locations.Select(a => a.N_ROW).Distinct().ToList();
for (int i = 0; i < rows.Count; i++)
{
+
var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
+ // LogHelper.Info($"褰撳墠鎺�{rows[i]},鑾峰緱璐т綅{JsonConvert.SerializeObject(rowList)}");
if (rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
{
Location other = null;
//褰撳墠鎺掓病鏈夐攣骞朵笖鏈夌┖浣嶇疆
- //鍏堟壘婊′綅锛岀劧鍚庡悗闈竴灞傝涔堟槸绌猴紝瑕佷箞涓嶅瓨鍦�- other = rowList.OrderByDescending(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 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)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�@@ -2447,6 +2950,59 @@
// other = db.Queryable<Location>().OrderBy(a => a.N_LAYER).Where(a => (string.IsNullOrEmpty(a.C_ENABLE) || a.C_ENABLE.Trim() != "绂佺敤") && a.S_AREA_CODE == other.S_AREA_CODE && a.N_ROW == other.N_ROW && a.N_COL > other.N_COL).First();
// //LogHelper.Info($"绂佺敤閫夋嫨鍚庝竴涓揣浣峽result}", "鎴愬搧");
//}
+
+ if (other != null)
+ {
+ if (other.S_CODE != null && !string.IsNullOrEmpty(other.S_CODE))
+ {
+ end = other;
+ break;
+ }
+ }
+ }
+ }
+ return end;
+ }
+ catch (Exception)
+ {
+
+ throw;
+ }
+
+ }
+
+ /// <summary>
+ /// 鎵剧粓鐐圭┖璐т綅璁＄畻鎺掗攣
+ /// </summary>
+ /// <param name="locations"></param>
+ /// <returns></returns>
+ internal static Location FindEndcolByLocListLock(List<Location> locations)
+ {
+ try
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ Location end = null;
+ //鏍规嵁缁堢偣璐т綅鎵剧┖闂茶揣浣�+ var rows = locations.Select(a => a.N_ROW).Distinct().ToList();
+ for (int i = 0; i < rows.Count; i++)
+ {
+ var rowList = locations.Where(r => r.N_ROW == rows[i]).ToList();
+ if (rowList.Count(a => a.S_LOCK_STATE != "鏃�) == 0 && rowList.Count(a => a.N_CURRENT_NUM == 0) > 0)
+ {
+ Location other = null;
+ //褰撳墠鎺掓病鏈夐攣骞朵笖鏈夌┖浣嶇疆
+ //鍏堟壘婊′綅锛岀劧鍚庡悗闈竴浣嶈涔堟槸绌猴紝瑕佷箞涓嶅瓨鍦�+ var full = rowList.OrderByDescending(a => a.N_COL).Where(a => a.N_CURRENT_NUM == 1).FirstOrDefault();
+ if (full == null)
+ {
+ //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�+ other = rowList.OrderBy(a => a.N_COL).FirstOrDefault();
+ }
+ else
+ {
+ other = rowList.OrderBy(a => a.N_COL).Where(a => a.N_COL > full.N_COL).FirstOrDefault();
+ }
+
if (other != null)
{
end = other;
@@ -2508,9 +3064,9 @@
}
}
+
+
#endregion
-
-
internal static CodeInfo GetCodeInfo(string code, string org)
{
@@ -2549,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