From a65303f69de64656e9ccd8bc93bbbe2788378422 Mon Sep 17 00:00:00 2001
From: 杨张扬 <634643841@qq.com>
Date: 星期二, 17 六月 2025 17:28:29 +0800
Subject: [PATCH] 双钱-修改过期时间为0的BUG

---
 core/Monitor.cs |   50 ++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/core/Monitor.cs b/core/Monitor.cs
index 8ffc3c5..769c3f2 100644
--- a/core/Monitor.cs
+++ b/core/Monitor.cs
@@ -597,9 +597,13 @@
                     db.Updateable<TN_EquipProDetail>(targetEPD).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
 
                     var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetEPD.S_ID);
-                    cginfo.S_ITEM_STATE = "杩囨湡";
-                    cginfo.N_ITEM_STATE = 3;
-                    db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+
+                    if (cginfo != null)
+                    {
+                        cginfo.S_ITEM_STATE = "杩囨湡";
+                        cginfo.N_ITEM_STATE = 3;
+                        db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+                    }
                 }
 
                 // 鍚屾 TN_InventoryM 涓�TN_CG_Detail
@@ -626,21 +630,28 @@
                     db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.ITEMSTATE }).ExecuteCommand();
 
                     var cginfo = db.Queryable<TN_CG_Detail>().First(a => a.S_ID == targetInM.S_ID);
-                    cginfo.S_ITEM_STATE = "杩囨湡";
-                    cginfo.N_ITEM_STATE = 3;
-                    db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+
+                    if (cginfo != null)
+                    {
+                        cginfo.S_ITEM_STATE = "杩囨湡";
+                        cginfo.N_ITEM_STATE = 3;
+                        db.Updateable<TN_CG_Detail>(cginfo).UpdateColumns(it => new { it.S_ITEM_STATE, it.N_ITEM_STATE }).ExecuteCommand();
+                    }
                 }
 
-                targetInM = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
+               var targetInMList = db.Queryable<TN_InventoryM>().LeftJoin<TN_CG_Detail>((o, i) => o.S_ID == i.S_ID).
                  Where((o, i) => System.DateTime.Now < o.EXPIRATION
                    && ((i.S_ITEM_STATE == "寰呮" && i.N_ITEM_STATE == 1)
                    || (i.S_ITEM_STATE == "鍚堟牸" && i.N_ITEM_STATE == 0))
-                 ).First();
+                 ).ToList();
 
-                if (targetInM != null)//妫�祴鍑哄揩杩囨湡鐨勮揣鍝�+                if (targetInMList.Count > 0)//妫�祴鍑哄揩杩囨湡鐨勮揣鍝�                 {
-                    targetInM.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now,targetInM.EXPIRATION).ToString();
-                    db.Updateable<TN_InventoryM>(targetInM).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
+                    foreach (var item in targetInMList)
+                    {
+                        item.EXPIRATION_DAY = SpecHelper.CalculateDaysDifference(System.DateTime.Now, item.EXPIRATION).ToString();
+                    }
+                    db.Updateable<TN_InventoryM>(targetInMList).UpdateColumns(it => new { it.EXPIRATION_DAY }).ExecuteCommand();
                 }
 
                 targetInM = db.Queryable<TN_InventoryM>().First(a => Convert.ToInt32(a.EXPIRATION_DAY) > 0 && a.ITEMSTATE == "杩囨湡");
@@ -808,7 +819,22 @@
             }
             catch (Exception ex)
             {
-                LogHelper.Error($"鍙戠敓浜嗗紓甯革紝鍚屾TN_EquipProDetail寮傚父锛寋ex.Message}", ex);
+                // 鑾峰彇鏈�唴灞傚紓甯革紙閫氬父鏄疄闄呭紩鍙戦棶棰樼殑寮傚父锛�+                Exception innerEx = ex;
+                while (innerEx.InnerException != null)
+                {
+                    innerEx = innerEx.InnerException;
+                }
+
+                // 鑾峰彇鍫嗘爤甯т俊鎭�+                var stackTrace = new System.Diagnostics.StackTrace(innerEx, true);
+                var stackFrame = stackTrace.GetFrame(0); // 鑾峰彇鏈�《灞傜殑鍫嗘爤甯�+
+                // 鑾峰彇鏂囦欢鍚嶅拰琛屽彿
+                string fileName = stackFrame.GetFileName();
+                int lineNumber = stackFrame.GetFileLineNumber();
+
+                LogHelper.Error($"鍙戠敓浜嗗紓甯革紝鍚屾TN_EquipProDetail寮傚父锛屾枃浠�{fileName}, 琛屽彿:{lineNumber}, 閿欒:{ex.Message}\r\n{ex.StackTrace}", ex);
             }
         }
 

--
Gitblit v1.9.1