From db825ff9bb1352e79c3e018a647b3c88713d6f69 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期六, 05 七月 2025 14:07:29 +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 |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 48f649f..fa6bcc9 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("缈绘枟鏈哄彨婊�))
                     //{
@@ -399,7 +401,6 @@
             //new List<string> { "鎴愬搧婊℃-鍏ュ簱", "" }
             if (state == 6 || state == 5)
             {
-
                 LogHelper.Info($"浠诲姟绫诲瀷锛歿mst.S_TYPE}- 鍔ㄤ綔锛歿state}. 鏄惁5绠�锛焮mst.S_TYPE.Contains("鎴愬搧婊℃") || mst.S_TYPE.Contains("澶囪揣")} ");
                 if (mst.S_TYPE.Contains("澶囪揣"))
                 {

--
Gitblit v1.9.1