From 7630f581e6ed2fabd50ab6ecd444691f1e99b881 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期一, 25 十一月 2024 16:35:47 +0800
Subject: [PATCH] 工单暂停逻辑更新,WorkBatch更新工单更新

---
 Tiger.Business.MES/Common/WorkBatch.cs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index d431e97..413ac6f 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -12,6 +12,7 @@
 using Tiger.Business.MES;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxTokenParser;
 using Org.BouncyCastle.Ocsp;
+using System.IO;
 
 namespace Tiger.Business
 {
@@ -64,6 +65,7 @@
 
         public void Update(bool updateAll = false)
         {
+            var strat = DateTime.Now;
             var wo = Biz.Db.Queryable<BIZ_MES_WO>().Where(q => q.ORDER_NO == OrderNo).IncludesAllFirstLayer().First();
             var batch = Biz.Db.Queryable<BIZ_MES_WO_BATCH>().Where(q => q.BATCH_NO == Batch.BATCH_NO).First();
             if (WoContext.WoBatchDic.ContainsKey(batch.BATCH_NO))
@@ -72,7 +74,7 @@
                 {
                     WoContext.WoBatchDic.Remove(Batch.BATCH_NO);
                 }
-                else if(updateAll || wo.UPDATE_TIME > WO.UPDATE_TIME || batch.UPDATE_TIME > Batch.UPDATE_TIME)
+                else if(updateAll || wo.CHANGE_TIME > WO.CHANGE_TIME || batch.CHANGE_TIME > Batch.CHANGE_TIME)
                 {
                     GetBatchInfo();
                 }
@@ -84,10 +86,12 @@
             }
             WO = wo;
             Batch = batch;
+            ConsoleExt.WriteLine($"{DateTime.Now:HH:mm:ss} ##### : {(DateTime.Now - strat).TotalSeconds}s", ConsoleColor.Yellow);
         }
 
         private void GetBatchInfo()
         {
+            ConsoleExt.WriteLine($"{DateTime.Now:HH:mm:ss} !!!!! ", ConsoleColor.Cyan);
             Product = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == WO.ITEM_CODE && q.AUTH_ORG == WO.AUTH_ORG).IncludesAllFirstLayer().First();
             Customer = Biz.Db.Queryable<BAS_CUSTOMER>().Where(q => q.CUST_CODE == WO.CUST_CODE).First();
             WoSNs = Biz.Db.Queryable<BIZ_MES_WO_SN>().Where(q => q.WORK_ORDER == OrderNo).ToList();
@@ -198,8 +202,8 @@
                 var db = Biz.Db;
                 var dbTran = db.UseTran(() =>
                 {
-                    db.Updateable(WO, user).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.ACT_START_TIME }).ExecuteCommand();
-                    db.Updateable(Batch, user).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.ACT_START_TIME }).ExecuteCommand();
+                    db.Updateable(WO, user).UpdateColumns(q => new { q.STATUS, q.ACT_START_TIME }).ExecuteCommand();
+                    db.Updateable(Batch, user).UpdateColumns(q => new { q.STATUS, q.ACT_START_TIME }).ExecuteCommand();
                 });
                 if (!dbTran.IsSuccess)
                 {

--
Gitblit v1.9.3