From a746b44994e729613737baa922796383027fc54c Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 14 十一月 2024 16:59:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 _Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
index 18496fa..3a13905 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogPublishPlan/Response_pnlActions_btnOk_OnClick.def
@@ -6,7 +6,11 @@
   DefinitionID: 'Responsedef_WebButton_OnClick'
   Precondition:
   [*
-    return not ( not cbCustomDemand.Checked() and not cbOfflinePlan.Checked() and not cbShiftPlan.Checked() and not cbAssembleOnlinePlan.Checked() and not cbInventoryPlan.Checked() );
+    return not ( not cbCustomDemand.Checked() and not cbCustomDemandCC.Checked()
+                  and not cbOfflinePlan.Checked() and not cbOfflinePlanCC.Checked()
+                  and not cbShiftPlan.Checked() and not cbShiftPlanCC.Checked()
+                  and not cbAssembleOnlinePlan.Checked() and not cbAssembleOnlinePlanCC.Checked()
+                  and not cbInventoryPlan.Checked() and not cbInventoryPlanCC.Checked() );
   *]
   QuillAction
   {

--
Gitblit v1.9.3