From 69296cb82cbac409959d82417ad0eddf07f51bbb Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 29 十月 2024 17:41:51 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev

---
 _Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
index b4505ca..3392f2e 100644
--- a/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
+++ b/_Main/BL/Type_NewAssemblyOnlinePlanCell/StaticMethod_RefreshData.qbl
@@ -68,6 +68,9 @@
     //  info( "褰撳墠浜х嚎锛�", pl, "    澶勭悊鎷夌┖--------------------------" );
       traverse ( drainPs, Elements, p ) {
         traverse ( p, ExplicitTimeInterval, eti ) {
+          // 璁剧疆鍗曞厓鏍间负鎷夌┖
+          NewAssemblyOnlinePlanCell::SetLineLayingOrEmptyingStatus( macroPlan, eti.Start().Date(), "鎷夌┖", pl );
+          
     //      info( "寮�濮嬫椂闂达細", eti.Start().Format( "Y-M2-D2" ), "    缁撴潫鏃堕棿锛�", eti.End().Format( "Y-M2-D2" ) );
           naopc := select( macroPlan, NewAssemblyOnlinePlanColumn, tempNAOPC, tempNAOPC.StartDate() = ( eti.Start().Date() - 1 ) );
           
@@ -97,6 +100,9 @@
       // 澶勭悊閾虹嚎
       traverse ( lineLyingPs, Elements, p ) {
         traverse ( p, ExplicitTimeInterval, eti ) {
+          // 璁剧疆鍗曞厓鏍间负鎷夌┖
+          NewAssemblyOnlinePlanCell::SetLineLayingOrEmptyingStatus( macroPlan, eti.Start().Date(), "閾虹嚎", pl );
+          
           info( "寮�濮嬫椂闂达細", eti.Start().Format( "Y-M2-D2" ), "    缁撴潫鏃堕棿锛�", eti.End().Format( "Y-M2-D2" ) );
           
           cell  := minselect( macroPlan, NewAssemblyOnlinePlanRow.NewAssemblyOnlinePlanCell, tempNAOPCell, 
@@ -111,5 +117,8 @@
         }
       }
     }
+    
+    // 澶勭悊閾虹嚎鍚庣画澶勭悊
+    NewAssemblyOnlinePlanCell::PostLayingProcessing( macroPlan );
   *]
 }

--
Gitblit v1.9.3