From 14f174a37b0368167610119ee1b8ce7b610b5a9d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 11 五月 2024 18:27:23 +0800
Subject: [PATCH] 优化人工出库逻辑

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
index 50e67dd..0829fa3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/AutoUpdateWork.cs"
@@ -62,7 +62,7 @@
             Idt_inventoryRepository inventoryRepository = new dt_inventoryRepository(context);
 
 
-            var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum).ToList();
+            var mes_heads = mes_HeadRepository.Find(x => x.quantity == x.finishNum /*|| x.CreateTime.AddDays(30) < DateTime.Now*/).ToList();
 
             #region 妫�娴嬬嚎宸ュ崟
             var mes_head_jcxs = mes_heads.Where(x => x.processCode == "28").ToList();
@@ -82,7 +82,7 @@
                 foreach (var mes_head in mes_head_jjgs)
                 {
                     var inventorys = inventoryRepository.Find(x => x.jobID == mes_head.jobID).ToList();
-                    if (inventorys.Count == mes_head.finishNum)
+                    if (inventorys.Count == mes_head.quantity)
                         AddHtyMesWork(mes_head, mes_HeadRepository);
                 }
             }
@@ -92,7 +92,7 @@
         /// <summary>
         /// 宸插畬鎴愬伐鍗曠Щ鍏ュ巻鍙�
         /// </summary>
-        public static void AddHtyMesWork(dt_mes_head mes_Head, Idt_mes_headRepository mes_HeadRepository, string compeletor = "绯荤粺", string operatetype = "鑷姩瀹屾垚")
+        public static void AddHtyMesWork(dt_mes_head mes_Head, Idt_mes_headRepository mes_HeadRepository, string compeletor = "system", string operatetype = "鑷姩瀹屾垚")
         {
             try
             {
@@ -139,7 +139,7 @@
                     quantity = mes_Head.quantity,
                     expectedStartTime = mes_Head.expectedStartTime,
                     finishNum = mes_Head.finishNum,
-                    FinishTime = DateTime.Now,
+                    FinishTime = mes_Head.FinishTime,
                     maxDiameterDiff = mes_Head.maxDiameterDiff,
                     operatetype = operatetype,
                     processCode = mes_Head.processCode,
@@ -157,11 +157,11 @@
                 };
                 mes_Head_HtyRepository.Add(mes_Head_Hty, true);
                 mes_HeadRepository.Delete(mes_Head, true);
-                WriteDBLog.Success("澶勭悊宸插畬鎴愬伐鍗�", $"宸ュ崟缂栧彿锛歿mes_Head.jobID}", "PCS");
+                WriteDBLog.Success("澶勭悊宸插畬鎴愬伐鍗�", $"宸ュ崟缂栧彿锛歿mes_Head.jobID}", "PCS", compeletor);
             }
             catch (Exception ex)
             {
-                WriteDBLog.Error("澶勭悊宸插畬鎴愬伐鍗�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                WriteDBLog.Error("澶勭悊宸插畬鎴愬伐鍗�", $"閿欒淇℃伅锛歿ex.Message}", "PCS", compeletor);
             }
         }
     }

--
Gitblit v1.9.3