From c1c85f2683f2aba57c9dc62f936b05b5fd988616 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 23 六月 2025 11:36:51 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 7ca0154..098d22a 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -387,31 +387,34 @@
}
//缁堢偣璐т綅涓�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;
+ else if (state == 5)
+ {
+ ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
+ //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() == "J绌虹摱鍧�鍑哄簱")
{
@@ -1413,6 +1416,7 @@
//}
else
{
+
if (start == 0)
{
//bool flag3 = ;
@@ -1523,12 +1527,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 +1611,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