From 8f0f149d607a7246fa25e81340602ce5e47398fe Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 10 七月 2025 18:14:38 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 115 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 83 insertions(+), 32 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 7ca0154..1fcc535 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -78,9 +78,11 @@
if (bbbbbbb)
{
+ bbbbbbb = false;
//UpdateElevatorTask(mst);
//todo锛�濡傛灉鏄數姊嵏璐т换鍔＄數姊换鍔′腑闂磋〃鐘舵�锛屽
- if (BeenOver)
+ //bbbbbbb = TaskHelper.CheckActionRecordExist(mst.S_TASK_NO, "5");
+ if (BeenOver || (mst.S_TYPE.Contains("鎴愬搧婊℃") && bbbbbbb))
{
//if (mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
//{
@@ -387,42 +389,42 @@
}
//缁堢偣璐т綅涓�YWLT1TSJCD 鎴栬� YWLT2TSJCD 鐨�瑕佸彇璐у畬鎴愯В閿佽捣鐐癸紝瑙ｇ粦璧风偣锛岀粦瀹氱粓鐐癸紝鍗歌揣瀹屾垚锛岃В閿佺粓鐐� 2025骞�鏈�0鏃� Plg
- if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
- {
- //瑙ｇ粦璧风偣
- CacheBitUpdate(mst, load: true);
- //缁戝畾缁堢偣
- CacheBitUpdate(mst, load: false);
- }
+ //if (mst.S_END_LAREA?.Trim() == "YWLT1TSJCD" || mst.S_END_LAREA?.Trim() == "YWLT2TSJCD")
+ //{
+ // //瑙ｇ粦璧风偣
+ // CacheBitUpdate(mst, load: true);
+ // //缁戝畾缁堢偣
+ // CacheBitUpdate(mst, load: false);
+ //}
LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
}
//new List<string> { "鎴愬搧婊℃-鍏ュ簱", "" }
if (state == 6 || state == 5)
{
- ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
- if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
- {
- LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
- return r;
- }
-
LogHelper.Info($"浠诲姟绫诲瀷锛歿mst.S_TYPE}- 鍔ㄤ綔锛歿state}. 鏄惁5绠�锛焮mst.S_TYPE.Contains("鎴愬搧婊℃") || mst.S_TYPE.Contains("澶囪揣")} ");
if (mst.S_TYPE.Contains("澶囪揣"))
{
if (state == 6) goto vvv;
}
- else if (state == 5) goto vvv;
-
- if (mst.S_TYPE.Trim() == "J绌虹摱鍧�鍑哄簱")
+ else if (state == 5)
{
- mst.S_CNTRS = "J" + Settings.GetTimeStamp();
+ ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
+ //if (mst.S_END_LAREA?.Trim() == "YWLT1TSJCD" || mst.S_END_LAREA?.Trim() == "YWLT2TSJCD")
+ //{
+ // LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
+ // return r;
+ //}
+ goto vvv;
}
- 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() != "婊＄摱鍧�鍏ュ簱"
@@ -842,7 +844,6 @@
return true;
});
}
-
}
else if (mst.S_TYPE.Trim() == "绌虹摱鍧�鍑哄簱" || mst.S_TYPE.Trim().Contains("鐡剁洊-绌轰笂鏈�) || mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
{
@@ -1109,6 +1110,12 @@
{
CacheBitCancelUpdate(mst, out r, true);
}
+ if (state == 9)
+ {
+ CacheBitUpdate(mst, load: true);
+ var g = LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
+ var T = LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
+ }
return r;
}
@@ -1299,7 +1306,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1346,6 +1353,48 @@
else return false;
}
}
+ //else if (taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�鍏ュ簱") || taskType.Contains("鏀剁缉鑶滃弶杩�璐ф灦鍑烘彁鍗囨満"))
+ //{
+ // var ts = 5;
+ // 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;
+ // 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 + "");
+ // }
+ //}
+
//else if ( mst.S_END_LAREA == "WJBQDDKQ" || mst.S_END_LAREA == "SXBQDDKQ"|| mst.S_START_LAREA == "WJBQDDKQ" ||mst.S_START_LAREA == "SXBQDDKQ" )
//{
// if (start == 0)
@@ -1413,6 +1462,7 @@
//}
else
{
+
if (start == 0)
{
//bool flag3 = ;
@@ -1523,12 +1573,10 @@
}
}
- if (Settings.GetDeviceInfoList().Find(x => x.location.Contains(mst.S_END_LOC))?.deviceType == 13 && mst.S_TYPE.Contains("鏀剁缉鑶滃弶杩�))
- {
- end = 7682;
- }
-
-
+ //if (Settings.GetDeviceInfoList().Find(x => x.location.Contains(mst.S_END_LOC))?.deviceType == 13 && mst.S_TYPE.Contains("鏀剁缉鑶滃弶杩�))
+ //{
+ // end = 7027;
+ //}
LogHelper.Info("SendTask " + mst.S_TASK_NO);
Console.WriteLine("start=" + start.ToString());
@@ -1609,6 +1657,9 @@
/// <returns></returns>
public static bool CreateTransport(string wWorkNo, string start, string end, string taskType, List<string> cntrs, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1, string note = "", string TwoEndLoc = "")
{
+ if (string.IsNullOrEmpty(start) || string.IsNullOrEmpty(end))
+ return false;
+
var result = false;
//鎵规鍙峰瓨鎵樼洏鍙凤紝1~3涓墭鐩� var trayCodes = string.Join(",", cntrs);
--
Gitblit v1.9.1