From 91fc6f65c712505f0b13e45d66e917e2645ae1c3 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 10 七月 2025 18:17:27 +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 | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 5b96932..da88055 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("缈绘枟鏈哄彨婊�))
//{
@@ -415,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() != "婊＄摱鍧�鍏ュ簱"
@@ -844,7 +844,6 @@
return true;
});
}
-
}
else if (mst.S_TYPE.Trim() == "绌虹摱鍧�鍑哄簱" || mst.S_TYPE.Trim().Contains("鐡剁洊-绌轰笂鏈�) || mst.S_TYPE.Trim().Contains("缈绘枟鏈哄彨婊�))
{
@@ -1307,7 +1306,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1479,7 +1478,7 @@
"start DD ",
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
else
@@ -1494,7 +1493,7 @@
"start agv鐐�,
start.ToString(),
"-",
- TRow
+ FRow
}), "");
}
}
--
Gitblit v1.9.1