From 8c546e869f979f6f9e83d141cb8b767da6472d66 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期二, 15 十月 2024 16:53:46 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg

---
 _Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelWeekly_791_bApply_OnClick.def |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelRight_bApply_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelWeekly_791_bApply_OnClick.def
similarity index 82%
rename from _Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelRight_bApply_OnClick.def
rename to _Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelWeekly_791_bApply_OnClick.def
index 1a2c721..76a1490 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelRight_bApply_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormProductionLineBatchSetShiftPattern/Response_PanelWeekly_791_bApply_OnClick.def
@@ -1,8 +1,8 @@
 Quintiq file version 2.0
-#parent: PanelRight/bApply
-Response OnClick () id:Response_PanelRight_bApply_OnClick
+#parent: PanelWeekly_791/bApply
+Response OnClick () id:Response_PanelWeekly996_bApply_OnClick
 {
-  #keys: '[414996.1.117189721]'
+  #keys: '[414996.1.127910498]'
   CanBindMultiple: false
   DefinitionID: 'Responsedef_WebButton_OnClick'
   GroupServerCalls: true
@@ -32,7 +32,8 @@
       if( cbSunday.Checked() ){
         weekdays.Add( 7 ); 
       }
-      LocalTool::BatchSetUnitShiftPattern( dhSelectUnit.Data(),ddlShiftPattern.Data(),dsStartDate.Date(),dsEndDate.Date(),weekdays );
+      skipWeek := [Number]efWeekly.Text();
+      LocalTool::BatchSetUnitShiftPattern( dhSelectUnit.Data(),ddlShiftPattern.Data(),dsStartDate.Date(),dsEndDate.Date(),weekdays ,skipWeek );
       WebMessageBox::Success( "Success");
     *]
   }

--
Gitblit v1.9.3