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

lihongji

2024-11-20 440be21e24e4cfb15e85ee1cf8522cd7d4acf21b

 _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
  {