From 8bc688f992f70815084e958a728a696871294672 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 01 七月 2025 15:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 098d22a..48f649f 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -1112,6 +1112,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;
}
@@ -1349,6 +1355,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)
--
Gitblit v1.9.1