Merge remote-tracking branch 'origin/dev' into dev

lihongji

2024-11-13 3d65ee18d645a30e600c9b63f0daefe2fc2b1151

 _Main/UI/MacroPlannerWebApp/Component_DialogCreateEditPackagingPlanNewCapability/Response_pnlActions_btnOk_OnClick.def

@@ -6,7 +6,9 @@
  DefinitionID: 'Responsedef_WebButton_OnClick'
  Precondition:
  [*
    return not exists( MacroPlan, PackagingPlanNewCapability, tempPPNC, true, tempPPNC.ProductionLine() = ddslFactory.Text() );
    return not exists( MacroPlan, PackagingPlanNewCapability, tempPPNC, true, 
                       tempPPNC.Factory()   = ddslFactory.Text()   and
                       tempPPNC.ProductID() = ddslProductID.Text() );
  *]
  QuillAction
  {