From e1a97fc8b29f063e96e3ebbae2f07ee95b276069 Mon Sep 17 00:00:00 2001
From: lss <Lss@HanInfo>
Date: 星期四, 05 六月 2025 17:25:31 +0800
Subject: [PATCH] 合肥佳通优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs | 961 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 624 insertions(+), 337 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 13161c9..c86d343 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/api/ApiHelper.cs
@@ -11,8 +11,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Reflection.Emit;
+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;
@@ -80,7 +83,7 @@
// AddErrorInfo("瀵绘壘鍑哄簱鍖哄け璐�, result.msg);
// return result;
//}
-
+
int n_type = 0; //浠诲姟鏉ユ簮 1.瀵嗙偧绔嬪簱 3.棰勫搴�,4.鍘熸潗鏂欏簱
string Source = "";
switch (taskData.source)
@@ -155,30 +158,26 @@
}
else if (taskData.taskType == 2)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛岃捣鐐归渶瑕佹湁鎵樼洏
{
+ note = "鍏ュ簱";
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
+ Start = startloc.S_CODE;
var CntrRel = LocationHelper.GetLocCntrRel(startloc.S_CODE).FirstOrDefault();
if (CntrRel != null)
{
- Start = startloc.S_CODE;
CntrCode = CntrRel.S_CNTR_CODE;
}
- else
- {
- result.code = "1";
- result.msg = $"鏍规嵁璧风偣{Start},鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�;
- AddErrorInfo("鎵樼洏鏌ユ壘澶辫触", result.msg, Source);
- return result;
- }
+ //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)
{
@@ -194,8 +193,8 @@
}
else if (taskData.taskType == 3)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛� {
+ note = "鍑哄簱";
//鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
-
startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == taskData.pickStation).First();
if (startloc != null)
{
@@ -267,73 +266,94 @@
N_START_LAYER = 1,
N_END_LAYER = 1,
S_WMS_NO = taskData.wmsTaskNo,
- Z_TYPE = n_type
+ Z_TYPE = n_type,
+
+
};
LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
if (WCSHelper.CreateTask(wcsTask))
{
- LocationHelper.LockLoc(Start, 2);
+ // 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)
{
//妤煎眰鐢垫鍒嗛厤
- var endloc1 = Settings.elevatorLoc.Find(a => a.Floor == startArea.N_FLOOR);
- var startloc1 = Settings.elevatorLoc.Find(a => a.Floor == endArea.N_FLOOR);
+ var elevatorLoc = LocationHelper.GetElevatorLoc();
- //鍒涘缓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
- };
- 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
+ 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))
+ {
- };
-
- LogHelper.Info("鍒涘缓浠诲姟锛� + JsonConvert.SerializeObject(wcsTask), "CreateTask");
- if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
- {
-
- LocationHelper.LockLoc(endloc.S_CODE, 1);
- LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ // LocationHelper.LockLoc(Start, 1);
+ //LocationHelper.LockLoc(End, 2);
+ LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
+ }
}
+
+
+
}
}
else
@@ -345,6 +365,7 @@
}
else if (taskData.taskType == 5)//绉诲簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟锛屽苟缁戝畾鎵樼洏
{
+ note = "鍑哄簱";
//鍒涘缓鎵樼洏鐗╂枡缁戝畾淇℃伅锛屽苟璁＄畻缁堢偣璐т綅
if (CreateCntrIteminfo(partData, taskData))
{
@@ -385,6 +406,7 @@
//鏆傚瓨浣嶅洖搴� else if (taskData.taskType == 6)//鍏ュ簱娴佺▼锛岀洿鎺ヤ娇鐢ㄨ捣鐐硅揣浣嶅拰缁堢偣璐т綅鐢熸垚浠诲姟
{
+ note = "鍏ュ簱";
//鏍规嵁鎵樼洏鍙锋壘璐т綅
var CntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE == partData.rfid).First();
if (CntrRel != null)
@@ -537,15 +559,23 @@
N_START_LAYER = 1,
N_END_LAYER = 1,
S_WMS_NO = taskData.wmsTaskNo,
- S_NOTE = note
+ 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);
+ // LocationHelper.LockLoc(Start, 2);
+ //LocationHelper.LockLoc(End, 1);
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -683,7 +713,7 @@
try
{
//鍒涘缓鎵樼洏鏁版嵁缁戝畾鍏崇郴
- if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty))
+ if (ContainerHelper.CreateCntrItem(model.Rfid, model.PartNumber, model.PartDesc, model.LotNumber, model.Weight, model.Qty, model.ProductionTime, model.MaturityTime))
{
//鍒涘缓鎴愬姛娴佺▼
}
@@ -736,6 +766,18 @@
string areacode = "";
try
{
+
+ #region 鍏ュ簱妫�煡鎵樼洏鐗╂枡琛ㄦ湁鏃犳暟鎹�+ var cntritem = db.Queryable<CntrItemDetail>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (cntritem == null)
+ {
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏃犵粦瀹氱墿鏂欐暟鎹�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鎵樼洏缁戝畾鐗╂枡鏁版嵁涓虹┖", result.msg, Source);
+ return result;
+ }
+ #endregion
#region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�濡傛灉娌＄粦瀹氭墭鐩樺垯缁戝畾鎵樼洏
var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
@@ -791,23 +833,27 @@
if (startloc != null)
{
//鏍规嵁浠撳簱 璁＄畻搴撳尯
- if (startloc.S_WH_CODE == "101")
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
{
- areacode = "PMGQ";
+ areacode = whcode.PMK;
}
else
{
- areacode = "PK2";
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
- areacode = "FLPK";
//鍒ゆ柇鏈夋棤鐩稿悓鐗╂枡鎺� loc = StorageCompute(itemcode, areacode);
- if (loc == null)
- {
- //鏃犵浉鍚岀墿鏂欐帓鎵剧┖鎺�- loc = emptyRow(areacode);
- }
+ //if (loc == null)
+ //{
+ // //鏃犵浉鍚岀墿鏂欐帓鎵剧┖鎺�+ // loc = emptyRow(areacode);
+ //}
if (loc != null)
{
End = loc.S_CODE;
@@ -819,6 +865,7 @@
result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
LogHelper.Info($"Putin==> {result.msg}");
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -828,6 +875,7 @@
result.msg = $"浠诲姟璧风偣:{Start}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
LogHelper.Info($"Putin==> {result.msg}");
AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ return result;
}
#endregion
@@ -863,9 +911,16 @@
LogHelper.Info("鍒涘缓鍏ュ钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
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
@@ -885,7 +940,6 @@
LogHelper.Error("Putin Error锛� + ex.ToString(), ex);
return result;
}
-
}
/// <summary>
@@ -926,47 +980,50 @@
#region 鏍规嵁鐗╂枡缂栫爜瑙勫垯 璁＄畻鍑哄簱搴撳尯
//绮夋枡浠庡钩搴撳嚭搴擄紝鍏朵粬鐗╂枡闇�浠庢殏瀛樺尯鍑哄簱
- if (model.PartNumber.StartsWith("4X"))
+ var locJt = db.Queryable<Location>().Where(a => a.S_AREA_CODE == model.WorkCenter).First();
+ if (locJt == null)
{
- areacode = "FLPK";
- 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 = "KJZCW";
+ areacode = whcode.PMK;
+ cntrType = "PM";
}
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;
+ result.code = "1";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岀墿鏂欏彿{model.PartNumber}涓嶅睘浜庤瀹氱墿鏂�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鐗╂枡缂栫爜鏍煎紡閿欒", result.msg, Source);
+ return result;
+ }
}
}
- //鏍规嵁鐗╂枡鑾峰彇瀵瑰簲搴撳尯
- // var iteminfo = db.Queryable<TN_Material>().Where(a => a.S_ITEM_CODE.Trim() == itemcode).First();
- //if (iteminfo != null)
- //{
- // areacode = iteminfo.S_WH_CODE;
- //}
- //areacode = computeArea(itemcode);
- //if (string.IsNullOrEmpty(areacode))
- //{
- // LogHelper.Info($"PutOut==> 鏍规嵁鐗╂枡缂栫爜:{itemcode}鎵句笉鍒板搴斿簱鍖猴紝璇锋鏌ラ厤缃枃浠�);
- // result.code = "1";
- // result.msg = $"鏍规嵁鐗╂枡缂栫爜:{itemcode}鎵句笉鍒板搴斿簱鍖猴紝鐗╂枡琛ㄩ厤缃�;
- // AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg);
- //}
- //if (itemcode == "娴嬭瘯1")
- //{
- // areacode = "PMJP";
- //}
+ else
+ {
+ result.code = "1";
+ result.msg = $"鏍规嵁缁堢偣搴撳尯浠撳簱缂栫爜锛歿locJt.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
#endregion
#region 鏍规嵁鐗╂枡缂栫爜璁＄畻鍑哄簱璐т綅锛岄�寰�嚎杈逛綅缃�@@ -984,6 +1041,14 @@
{
End = Endloc.S_CODE;
}
+ else
+ {
+ result.code = "1";
+ result.msg = $"Computeloc==銆嬫牴鎹満鍙扮紪鐮侊細{model.WorkCenter},宸ヨ绫诲瀷锛歿cntrType} 鏈壘鍒扮┖璐т綅鏁版嵁锛岃妫�煡璐т綅琛�;
+ LogHelper.Info($"ItemBack锛歿result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
+ }
}
else
{
@@ -992,6 +1057,7 @@
result.msg = $"浠诲姟鐗╂枡:{itemcode}鎵句笉鍒板搴斿簱瀛�;
LogHelper.Info($"ItemBack锛歿result.msg}");
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
#endregion
@@ -1028,8 +1094,15 @@
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 = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -1083,26 +1156,26 @@
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;
- }
+ //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 鏍规嵁璐т綅妤煎眰鍒ゆ柇锛�妤煎幓寰�彔鐩樹綅 鍏朵粬鐨勫洖搴�@@ -1139,7 +1212,7 @@
return result;
}
}
- else if (startloc.S_NOTE == "PM")
+ 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();
@@ -1169,33 +1242,21 @@
}
else
{
- #region 鏍规嵁鎵樼洏鎵惧懠鍙┖鎵樹换鍔★紝骞惰幏寰楀嚭搴撳簱鍖�- msts = WCSHelper.GetTaskBycntrcode(model.Rfid.Trim());
- if (msts.Count() > 0)
+ #region 鏍规嵁璧风偣璐т綅绫诲瀷锛岃幏寰楀洖搴撳簱鍖�+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
{
- msts.RemoveAll(a => string.IsNullOrEmpty(a.S_CNTR_CODE));
- mst = msts.OrderByDescending(a => a.T_CREATE).FirstOrDefault();
- }
- if (mst != null)
- {
- LogHelper.Info($"鎵惧埌鍑哄簱浠诲姟锛歿JsonConvert.SerializeObject(mst)}");
- areacode = mst.S_START_AREA;
+ if ( string.IsNullOrEmpty(startloc.S_NOTE))
+ {
+ areacode = whcode.PMK;
+ }
}
else
{
-
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹墭鐩樼紪鐮亄model.Rfid}鏈壘鍒版墭鐩樺嚭搴撲换鍔�;
- LogHelper.Info($"{result.msg}");
- AddErrorInfo("鏌ユ壘浠诲姟澶辫触", result.msg, Source);
- return result;
- }
- if (string.IsNullOrEmpty(areacode))
- {
-
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹墭鐩樼紪鐮亄model.Rfid}鎵惧埌鍑哄簱浠诲姟{mst.S_CODE}鐨勮捣鐐瑰簱鍖轰负绌�;
- LogHelper.Info($"{result.msg}");
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿startloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
return result;
}
@@ -1203,23 +1264,23 @@
//鍥炲簱璐т綅璁＄畻搴撳尯璐т綅
loc = StorageCompute(itemcode, areacode);
- if (loc == null)
- {
- loc = emptyRow(areacode);
- if (loc == null)
- {
- LogHelper.Info($"搴撳尯锛歿areacode}娌℃湁绌烘帓");
- }
- }
- else
- {
+ //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;
- }
+ // result.code = "1";
+ // result.msg = $"搴撳尯:{areacode}鏃犲彲鐢ㄨ揣浣�;
+ // LogHelper.Info($"{result.msg}");
+ // AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ // return result;
+ //}
}
}
@@ -1235,12 +1296,12 @@
#endregion
#region 鍒涘缓浠诲姟
- if (!string.IsNullOrEmpty(Start) && loc != null)
+ if (startloc != null && loc != null)
{
- if (startloc.N_LOCK_STATE != 0)
+ if (startloc.N_LOCK_STATE != 0 && loc.N_LOCK_STATE != 0)
{
result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐箋Start}鏈夐攣";
+ result.msg = $"鍒涘缓浠诲姟澶辫触锛岃捣鐐硅揣浣嶇姸鎬亄startloc.N_LOCK_STATE},璧风偣璐т綅鐘舵�锛歿loc.N_LOCK_STATE}";
AddErrorInfo("璐т綅鏈夐攣", result.msg);
return result;
}
@@ -1250,7 +1311,7 @@
S_CODE = WCSHelper.GenerateTaskNo(),
S_TYPE = "绌哄伐瑁呭洖搴�,
S_EQ_NO = model.TaskNumber,
- S_START_LOC = Start,
+ 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,
@@ -1263,15 +1324,22 @@
N_END_LAYER = endlayer,
Z_TYPE = 5
};
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ LogHelper.Info("鍒涘缓绌烘墭鍥炲簱浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
if (WCSHelper.CreateTask(wcsTask))
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(loc.S_CODE, 1);
+ //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("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -1324,21 +1392,27 @@
{
#region 鏍规嵁浠撳簱缂栫爜鍒ゆ柇搴撳尯 骞惰绠楀嚭搴撹揣浣� var endloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == End).First();
+ //鏍规嵁浠撳簱 璁＄畻搴撳尯
+
if (endloc != null)
{
- if (endloc.S_WH_CODE == "101")
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == endloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
{
- // itemcode = "TP";
- areacode = "PMGQ";
+ areacode = whcode.PMK;
}
else
{
- //itemcode = "TP";
- areacode = "PK2";
+ result.code = "1";
+ result.msg = $"鏍规嵁璧风偣浠撳簱缂栫爜锛歿endloc.S_WH_CODE}鏈壘鍒板搴旈厤缃枃浠�;
+ LogHelper.Info($"Putin==> {result.msg}");
+ AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ return result;
}
- areacode = "FLPK";
+
+
//璁＄畻鍑哄簱鎵樼洏
- startloc = airlift(areacode, itemcode);
+ startloc = LocationHelper.GetLocByAreacode(areacode);
if (startloc != null)
{
var cntr = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == startloc.S_CODE).First();
@@ -1366,7 +1440,7 @@
result.msg = $"浠诲姟璧风偣:{End}鎵句笉鍒板搴旇揣浣嶏紝璇锋鏌ヨ揣浣嶈〃";
LogHelper.Info($"callfixture:{result.msg}");
AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
-
+ return result;
}
#endregion
@@ -1400,12 +1474,19 @@
Z_TYPE = 5
};
- LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
+ LogHelper.Info("鍒涘缓鍛煎彨绌烘墭浠诲姟锛� + JsonConvert.SerializeObject(wcsTask));
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
@@ -1461,31 +1542,6 @@
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)
- {
-
- 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 = $"鍒涘缓浠诲姟澶辫触锛屾墭鐩�{model.Rfid}鏈壘鍒扮粦瀹氳揣浣�;
- LogHelper.Info($"ItemBack锛歿result.msg}");
- AddErrorInfo("鏌ユ壘鎵樼洏璐т綅澶辫触", result.msg, Source);
- return result;
- }
- #endregion
-
#region 浣欐枡杩斿洖鏍规嵁鎵樼洏鎵惧嚭搴撲换鍔� //浣欐枡杩斿洖鏍规嵁鎵樼洏鎵惧嚭搴撲换鍔� //msts = WCSHelper.GetTaskBycntrcode(model.Rfid);
@@ -1519,46 +1575,73 @@
var startloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == Start).First();
if (startloc != null)
{
- //绮夋枡鐩存帴鍥炲簱锛屽叾浠栫墿鏂欓渶瑕佸幓瀵瑰簲鐨勬殏瀛樺尯
- if (model.PartNumber.StartsWith("4X"))
+ var whcode = Settings.wareLoc.Where(a => a.AreaCode == startloc.S_WH_CODE).FirstOrDefault();
+ if (whcode != null)
{
- areacode = "FLPK";
- loc = StorageCompute(itemcode, areacode);
- if (loc == null)
+ //绮夋枡鐩存帴鍥炲簱锛屽叾浠栫墿鏂欓渶瑕佸幓瀵瑰簲鐨勬殏瀛樺尯
+ #region 鏍规嵁鐗╂枡鍒ゆ柇鍥炲簱搴撳尯
+ if (model.PartNumber.StartsWith("4X"))
{
- loc = emptyRow(areacode);
- }
- }
- else
- {
- if (model.PartNumber.StartsWith("3"))
- {
- areacode = "KJYLZCW";
+ areacode = whcode.PMK;
+ //loc = StorageCompute(itemcode, areacode);
+ //if (loc == null)
+ //{
+ // loc = emptyRow(areacode);
+ //}
}
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)
+ #region 鍒ゆ柇鎵樼洏缁戝畾璐т綅鏄惁鍜屼笅鍙戠粦瀹氳捣鐐圭浉鍚�+ var CntrLoc = db.Queryable<LocCntrRel>().Where(a => a.S_CNTR_CODE.Trim() == model.Rfid).First();
+ if (CntrLoc != null)
{
- End = loc.S_CODE;
+ 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 = $"缁堢偣搴撳尯锛歿areacode}鏃犲彲鐢ㄨ揣浣�;
- AddErrorInfo("鏌ユ壘搴撳尯澶辫触", result.msg, Source);
+ 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;
+ }
+
+
+ }
+ #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
@@ -1568,24 +1651,30 @@
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
{
@@ -1631,8 +1720,8 @@
LogHelper.Info("鍒涘缓鍑哄钩搴撲换鍔★細" + JsonConvert.SerializeObject(wcsTask));
if (WCSHelper.CreateTask(wcsTask))
{
- LocationHelper.LockLoc(Start, 2);
- LocationHelper.LockLoc(End, 1);
+ //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)
@@ -1645,6 +1734,13 @@
db.Updateable(CntrItem).UpdateColumns(a => new { a.F_WEIGHT, a.S_BS_TYPE }).ExecuteCommand();
}
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
else
@@ -1760,10 +1856,11 @@
itemInfo.REMARK1 = model.StewingTime;
itemInfo.REMARK2 = model.OverdueTime;
itemInfo.S_MP_TYPE = model.Unit;
- if (db.Insertable<TN_Material>(itemInfo).ExecuteCommand()>0)
+ if (db.Insertable<TN_Material>(itemInfo).ExecuteCommand() > 0)
{
LogHelper.Info($"add:鐗╂枡缂栫爜:{model.PartNumber}鐨勭墿鏂欎富鏁版嵁宸插悓姝�);
- } ;
+ }
+ ;
return result;
}
catch (Exception ex)
@@ -1857,9 +1954,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
@@ -1935,18 +2039,19 @@
// var startArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == startloc.S_AREA_CODE).First();
//var endArea = db.Queryable<Area>().Where(a => a.S_CODE.Trim() == endloc.S_AREA_CODE).First();
- string dtcode = "DT-01";
- //妤煎眰鐢垫鍒嗛厤
- var Diantiloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == dtcode).First();
- if (Diantiloc == null)
- {
- result.code = "1";
- result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹揣浣嶇紪鐮�{dtcode}鏈壘鍒扮數姊揣浣�;
- AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
- return result;
- }
+ //string dtcode = "DT-01";
+ ////妤煎眰鐢垫鍒嗛厤
+ //var Diantiloc = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == dtcode).First();
+ //if (Diantiloc == null)
+ //{
+ // result.code = "1";
+ // result.msg = $"鍒涘缓浠诲姟澶辫触锛屾牴鎹揣浣嶇紪鐮�{dtcode}鏈壘鍒扮數姊揣浣�;
+ // AddErrorInfo("鏌ユ壘璐т綅澶辫触", result.msg, Source);
+ // return result;
+ //}
- //鏍规嵁鐢垫鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
+ //鏍规嵁浠诲姟鏁伴噺鍒ゆ柇閫佸線鍝釜鐢垫 锛堝叿浣撶數姊祦绋嬫牴鎹幇鍦虹數姊暟閲忥級
+ var elevatorLoc = LocationHelper.GetElevatorLoc();
//鍒涘缓wcs鍒嗘浠诲姟
var wcsTask = new WCSTask
@@ -1956,12 +2061,12 @@
S_TYPE = "鐢垫1",
S_EQ_NO = model.Data.task_no,
S_START_LOC = startloc.S_CODE,
- S_END_LOC = Diantiloc.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 = endloc.S_WH_CODE,
- S_END_AREA = endloc.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,
@@ -1972,11 +2077,11 @@
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,
@@ -1989,9 +2094,16 @@
if (WCSHelper.CreateTask(wcsTask) && WCSHelper.CreateTask(wcsTask1))
{
- LocationHelper.LockLoc(startloc.S_CODE, 2);
- LocationHelper.LockLoc(endloc.S_CODE, 1);
+ //LocationHelper.LockLoc(startloc.S_CODE, 2);
+ //LocationHelper.LockLoc(endloc.S_CODE, 1);
LogHelper.Info("鍒涘缓浠诲姟鎴愬姛");
+ }
+ else
+ {
+ result.code = "1";
+ result.msg = $"浠诲姟鍒涘缓澶辫触";
+ AddErrorInfo("浠诲姟鍒涘缓澶辫触", result.msg, Source);
+ return result;
}
}
@@ -2084,8 +2196,74 @@
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();
+ 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)
+ {
+ if (LocationHelper.UnBindingLoc(loc, new List<string>() { cntrcode }))
+ {
+ LogHelper.Info($"娓呴櫎鎵樼洏璐т綅鍏崇郴鎴愬姛");
+ }
+ }
+ else
+ {
+ LogHelper.Info($"ClearLocCntr 鎵樼洏{cntrcode}鏃犵墿鏂欑粦瀹氬叧绯�);
+ }
+
+ }
+ 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>
/// <param name="model"></param>
@@ -2118,9 +2296,20 @@
if (CntrItem != null)
{
- 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();
+ LocationHelper.UnBindingLoc(loc, new List<string>() { cntrcode });
+ // db.Deleteable<LocCntrRel>().Where(it => it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
+ if (db.Deleteable<CntrItemDetail>().Where(it => it.S_CNTR_CODE == cntrcode).ExecuteCommand() > 0)
+ {
+ LogHelper.Info($"ClearLoc 搴撲綅娓呴櫎鎴愬姛");
+ }
+ else
+ {
+ LogHelper.Info($"ClearLoc 搴撲綅娓呴櫎澶辫触");
+ result.code = "1";
+ result.msg = "搴撲綅娓呴櫎澶辫触";
+ AddErrorInfo("搴撲綅娓呴櫎澶辫触", result.msg, Source);
+ return result;
+ }
}
else
@@ -2154,7 +2343,99 @@
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);
+ agvInfos.Add(new AgvInfos() { AgvNo = agv.agvNo, AgvInfo = agvErrorInfo });
+ }
+ }
+ device.AgvInfos = agvInfos;
+
+ 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 鍚堣偉浣抽�涓氬姟鏂规硶
@@ -2167,51 +2448,52 @@
internal static Location StorageCompute(string itemcode, string areacode)
{
var db = new SqlHelper<object>().GetInstance();
- Location result = null;
- //鏌ヨ鎵�湁鏈夋墭鐩樼殑鎺�- var list = db.Queryable<Location>().Where(a => a.N_CURRENT_NUM > 0 && a.S_AREA_CODE.Trim() == areacode).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)
- {
- if (string.IsNullOrEmpty(itemcode))//绌烘墭鍏ュ簱
- {
- var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
- 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).First();
- }
- }
- else//婊℃嫋鍏ュ簱
- {
- var iteminfo = ContainerHelper.GetCntrItemRel(cntr.S_CNTR_CODE).FirstOrDefault();
- 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).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();
+ //鏌ヨ鎵�湁鏈夋墭鐩樼殑鎺掓病閿佺殑鎺�+ // 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();
- }
- }
- }
- if (result != null)
- {
- return result;
- }
- }
- else
- {
- LogHelper.Info($"鏍规嵁璐х墿缂栫爜{list[i].S_CODE}鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�);
- }
- }
- }
+ // 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();
+
+ // }
+ // }
+ // }
+ // if (result != null)
+ // {
+ // return result;
+ // }
+ // }
+ // else
+ // {
+ // LogHelper.Info($"鏍规嵁璐х墿缂栫爜{list[i].S_CODE}鏈壘鍒版墭鐩樿揣浣嶇粦瀹氬叧绯�);
+ // }
+ // }
+ //}
return result;
}
@@ -2281,7 +2563,12 @@
#endregion
var loc = LocationHelper.GetLocByItemCode(areacode, itemcode, level);
LogHelper.Info($"airlift=>鏍规嵁搴撳尯缂栫爜:{areacode}锛岀墿鏂欑紪鐮�{itemcode},鐗╂枡绛夌骇璁＄畻鍑烘湁鎵樼洏璐т綅{JsonConvert.SerializeObject(loc)}");
- result = FindStartcolByLoclist(loc);
+ // result = FindStartcolByLoclist(loc);
+ if (loc.Count > 0)
+ {
+ result = loc.OrderByDescending(a => a.N_COL).First();
+ }
+
LogHelper.Info($"airlift=>鍙敤璐т綅涓猴細{JsonConvert.SerializeObject(result)}");
return result;
}
@@ -2342,7 +2629,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;
@@ -2399,7 +2686,7 @@
/// </summary>
/// <param name="locations"></param>
/// <returns></returns>
- internal static Location FindEndcolByLocList(List<Location> locations, string itemcode)
+ internal static Location FindEndcolByLocList(List<Location> locations)
{
try
{
@@ -2415,7 +2702,7 @@
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).FirstOrDefault();
//if (full == null)
//{
// //娌℃湁婊′綅锛岄偅灏辨壘鏈�皬鐨勭┖浣�@@ -2492,9 +2779,9 @@
}
}
+
+
#endregion
-
-
internal static CodeInfo GetCodeInfo(string code, string org)
{
--
Gitblit v1.9.1