From 28cec6f80f1cf5c85ebafd2712b73761d92c2079 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 24 七月 2025 17:38:53 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 100 +++++++++++++++++++++++++------------------------
1 files changed, 51 insertions(+), 49 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index fa6bcc9..ab2b0b2 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -81,7 +81,7 @@
bbbbbbb = false;
//UpdateElevatorTask(mst);
//todo锛�濡傛灉鏄數姊嵏璐т换鍔＄數姊换鍔′腑闂磋〃鐘舵�锛屽
- //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
+ bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
if (BeenOver || (mst.S_TYPE.Contains("鎴愬搧婊℃") && bbbbbbb))
{
//if (mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
@@ -417,16 +417,14 @@
goto vvv;
}
- if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
- {
- mst.S_CNTRS = "J" + Settings.GetTimeStamp();
- }
-
- if (mst.S_TYPE.Trim() == "F绌虹摱鍧�鍑哄簱")
- {
- mst.S_CNTRS = "F" + Settings.GetTimeStamp();
- }
-
+ //if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
+ //{
+ // mst.S_CNTRS = "J" + Settings.GetTimeStamp();
+ //}
+ //if (mst.S_TYPE.Trim() == "F绌虹摱鍧�鍑哄簱")
+ //{
+ // mst.S_CNTRS = "F" + Settings.GetTimeStamp();
+ //}
//鎴愬搧绌烘 涓嶉渶瑕佺粦绛� if (!mst.S_TYPE.Trim().Contains("鎴愬搧-绌烘墭涓婄嚎")
&& mst.S_TYPE.Trim() != "婊＄摱鍧�鍏ュ簱"
@@ -435,9 +433,11 @@
&& mst.S_TYPE.Trim() != "闈掓邯绾哥鎼繍鐗╂枡"
&& !mst.S_TYPE.Trim().Contains("鑷敱鐐瑰鐐�))
{
- CacheBitUpdate(mst, load: false, mst.S_NOTE);
+ if (mst.S_END_LOC != "YWLT1TSJ")
+ {
+ CacheBitUpdate(mst, load: false, mst.S_NOTE);
+ }
}
-
if (mst.S_TYPE.Trim().Contains("鎴愬搧-绌烘墭涓婄嚎"))
{
@@ -481,7 +481,8 @@
{
// to.AlQty += mst.S_CNTRS.Split(',').Length;// mst.S_CNTRS.Substring(1).Split('v').Length;
to.OutNum -= mst.S_CNTRS.Split(',').Length;
- db.Updateable(to).UpdateColumns(it => new { it.OutNum }).ExecuteCommand();
+ var ggi = db.Updateable(to).UpdateColumns(it => new { it.OutNum }).ExecuteCommand();
+ LogHelper.Info($"鏇存柊 鎻愬崌鏈轰笂鏂欏伐鍗曡〃鏁伴噺涓�{to.OutNum} 褰卞搷琛屾暟涓�{ggi}");
}
}
@@ -846,7 +847,6 @@
return true;
});
}
-
}
else if (mst.S_TYPE.Trim() == "绌虹摱鍧�鍑哄簱" || mst.S_TYPE.Trim().Contains("鐡剁洊-绌轰笂鏈�) || mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
{
@@ -1309,7 +1309,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1356,45 +1356,45 @@
else return false;
}
}
- //else if (taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満"))
+ else if (taskType.Contains("鐡跺澂缈绘枟鏈虹┖鎵�))
+ {
+ start = LocationHelper.GetAgvSite(mst.S_START_LOC);
+ end = LocationHelper.GetAgvSite(mst.S_END_LOC, "2");
+ LogHelper.Info($"鐡跺澂鏈虹炕鏂楁満浠诲姟 璧风偣缁堢偣瀵瑰簲鐨刟gv绔欑偣 start {start} end {end} 浠诲姟:" + mst.S_TASK_NO);
+
+ }
+ else if (taskType.Contains("鐡跺澂缈绘枟鏈烘弧鎵�))
+ {
+ start = LocationHelper.GetAgvSite(mst.S_START_LOC, "2");
+ end = LocationHelper.GetAgvSite(mst.S_END_LOC);
+ LogHelper.Info($"鐡跺澂鏈虹炕鏂楁満浠诲姟 璧风偣缁堢偣瀵瑰簲鐨刟gv绔欑偣 start {start} end {end} 浠诲姟:" + mst.S_TASK_NO);
+ }
+ //else if (taskType.Contains("鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満"))
//{
- // var ts = 5;
+ // TSNo = 5;
+ // FRow = "1";
+ // ChgTo = "2";
+ // Flow = "0";
+ // Tlow = "0";
+ // DispInfo = "0";
+ // CtrlVal = "1";
// start = LocationHelper.GetAgvSite(mst.S_START_LOC);//璧风偣绔欑偣
// end = LocationHelper.GetAgvSite(mst.S_END_LOC);//缁堢偣绔欑偣
- // var dic = new Dictionary<string, string>();
- // dic.Add("From", start.ToString());
- // dic.Add("To", end.ToString());
- // dic.Add("FUNC", "0");
- // dic.Add("DATA", "0");
- // int height = 0;
- // var itemcode = "";
- // var ItemLayer = 0;
+ // if (mst.N_START_LAYER == 1)
+ // {
+ // CtrlVal = "11";
+ // }
+ // else
+ // {
+ // CtrlVal = "21";
+ // }
// var db = new SqlHelper<object>().GetInstance();
// var cirs = ContainerHelper.GetCntrItemRel(mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).First();
// LogHelper.Info($"鍘熺墿鏂�鏀剁缉鑶滃弶杩�瀹瑰櫒鐗╂枡琛ㄦ暟鎹畕JsonConvert.SerializeObject(cirs)}", "HosttoagvTask");
// if (cirs != null)
// {
// var ItemF = db.Queryable<ItemInfo>().Where(a => a.S_ITEM_CODE == cirs.S_ITEM_CODE).First();
- // itemcode = ItemF.S_ITEM_CODE;
- // ItemLayer = ItemF.ItemLayer;
- // if (mst.N_START_LAYER < 3 || mst.N_END_LAYER < 3)
- // {
- // height = ItemF.trayHeight;
- // }
- // else
- // {
- // height = ItemF.trayHeight1;
- // }
- // }
- // dic.Add("ItemHeight", height.ToString());
- // dic.Add("StaItemHeight", "0");
- // dic.Add("TrayType", $"{mst.N_START_LAYER}{mst.N_END_LAYER}");
- // var ggh = NDC.AddTaskNew(ts, mst.N_PRIORITY, mst.S_TASK_NO, dic);
- // if (ggh)
- // {
- // TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
- // result = true;
- // GeneralInterFaceFunc(mst, 8 + "");
+ // TRow = ItemF.trayHeight.ToString();
// }
//}
@@ -1481,7 +1481,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1496,7 +1496,7 @@
"start agv鐐�,
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
}
@@ -1584,6 +1584,7 @@
LogHelper.Info("SendTask " + mst.S_TASK_NO);
Console.WriteLine("start=" + start.ToString());
Console.WriteLine("end= " + end.ToString());
+
NDC.AGVResult res = NDC.AddNewOrder(TSNo, new Dictionary<string, string>
{
{
@@ -1634,7 +1635,8 @@
bool flag8 = res != null && (res.Res.ErrCode == 0 || res.Res.ErrCode == 50009);
if (flag8)
{
- TaskHelper.UpdateStatus(mst, "宸叉帹閫�);
+ var ctr2 = LocationHelper.GetList<CntrItemRel>(x => x.S_CNTR_CODE == mst.S_CNTRS.Split(',').ToList().FirstOrDefault()).FirstOrDefault();
+ TaskHelper.UpdateStatus(mst, "宸叉帹閫�, ctr2);
result = true;
GeneralInterFaceFunc(mst, 8 + "");
}
--
Gitblit v1.9.1