08/30

_Main/BL/Relations/Relation_Warehouse_MacroPlan_MacroPlan_Warehouse.qbl

+Quintiq file version 2.0
+#parent: #root
+Relation Warehouse_MacroPlan_MacroPlan_Warehouse
+{
+  #keys: '1[413182.1.1824597111]'
+  DefaultRelationStrategy
+  {
+  }
+  RelationSide.LeftSide MacroPlan
+  {
+    #keys: '3[413182.1.1824597113][413182.1.1824597112][413182.1.1824597114]'
+    Cardinality: '0to1'
+    ObjectDefinition: Warehouse
+    OwningSide: 'Reference'
+  }
+  RelationSide.RightSide Warehouse
+  {
+    #keys: '3[413182.1.1824597116][413182.1.1824597115][413182.1.1824597117]'
+    Cardinality: '0to1'
+    ObjectDefinition: MacroPlan
+    OwningSide: 'Owned'
+  }
+}

_Main/BL/Type_ImportExcel/Method_ExecuteDB.qbl

@@ -21,8 +21,8 @@ MethodOverride ExecuteDB (
     
     o := this
     ->SetStatusInProgress()
-    ->|mpsync->ExecuteDBUserImportProfiles( macroplan,importprofiles,uniqueimportobjectgroupinprofiles,isrefreshfromsource,isoverwritemanualconfig,binarydatas,brokers)
-    //->|mp->ImportAllMPData()
+    //->|mpsync->ExecuteDBUserImportProfiles( macroplan,importprofiles,uniqueimportobjectgroupinprofiles,isrefreshfromsource,isoverwritemanualconfig,binarydatas,brokers)
+    ->|mp->ImportAllMPData()
     ->|this->SetStatusDone()
     ->|mp->SetLastImportTime()
     ->|this->deleteuserimportfile(userprofile)

_Main/BL/Type_MacroPlan/Method_A_MPSync_ImportProductsSjzsy.qbl

@@ -15,9 +15,9 @@ Method A_MPSync_ImportProductsSjzsy (
     pispspecs := selectset( mpsync, IOPISPSpecification, io, true, true );
     
     
-    this.A_MPSyncProduct_Sjzsy( isoverwritemanualconfig, products );
-    this.MPSyncProductLevel_MP( isoverwritemanualconfig, productlevels );
-    this.MPSyncPISPSpecification_MP( isoverwritemanualconfig, pispspecs );
+    this.A_MPSyncProduct_Sjzsy( false, products );
+    this.MPSyncProductLevel_MP( false, productlevels );
+    this.MPSyncPISPSpecification_MP( false, pispspecs );
     
     
     this.InitializeProductsAfterImport();

_Main/BL/Type_MacroPlan/Method_DeleteFeedback.qbl

@@ -5,8 +5,47 @@ Method DeleteFeedback
   TextBody:
   [*
     // Administration Jul-27-2023 (created)
-    existing := selectset( this,Feedback.astype(FeedbackPeriodTaskOperation),f,f.Description().LikeUserLocale('内销') or f.Operation().MaterialType()='SF');
-    traverse( existing,Elements,q,q.DateTime()<this.PeriodParameter_MP().StartOfPlanning()){
+    //输液
+    //1、内销全删除
+    //2、外贸、研发全不删
+    //口服
+    //1、内销、外贸、研发全部删除历史及三周外
+    
+    
+    
+    now:=(Date::ActualDate()).DateTime()
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    z:=Duration::Days(7)
+    last:=this.PeriodParameter_MP().StartOfPlanning()-z
+    syjh := selectset( this,Feedback.astype(FeedbackPeriodTaskOperation),f,f.Operation().ProductType()='输液' and f.Description().LikeUserLocale('内销'));
+    
+    traverse( syjh,Elements,q,q.DateTime()<=now and q.DateTime()>=last){
+              
+            q.DateTime(now)
+      }
+    
+    
+    //删除当前时间之前的feedback和大于当前开始时间的feedback，输液外贸、研发全不删
+    sy := selectset( this,Feedback.astype(FeedbackPeriodTaskOperation),f,f.Operation().ProductType()='输液' and f.Description().LikeUserLocale('内销'));
+    traverse( sy,Elements,q,q.DateTime()<now and q.DateTime()>=this.PeriodParameter_MP().StartOfPlanning()){
+      q.Delete()
+      
+      }
+     h:=Duration::Days(21)
+    
+    kf := selectset( this,Feedback.astype(FeedbackPeriodTaskOperation),f,f.Operation().ProductType()='口服');
+    traverse( kf,Elements,q,q.DateTime()<this.PeriodParameter_MP().StartOfPlanning() and q.DateTime()>(this.PeriodParameter_MP().StartOfPlanning()+h)){
       q.Delete()
       
       }

_Main/BL/Type_MacroPlan/Method_InitializeProductsAfterImport0.qbl

@@ -23,10 +23,10 @@ Method InitializeProductsAfterImport0
     }
     
     // This will sort products level
-    this.SortProductLevel( attribute( ProductLevel_MP, LevelForExcel ), true );
+    //this.SortProductLevel( attribute( ProductLevel_MP, LevelForExcel ), true );
     
     //This will sort units to display them in the correct order in product planning Gantt chart.
-    this.SortRootProduct( attribute( Product_MP, DisplayIndexForExcel ), true );
+    this.SortRootProduct( attribute( Product_MP,DisplayIndexForExcel ), true );
     
     
     product:=selectsortedset( this,Product_MP,p,p.ID());

_Main/BL/Type_PeriodTask_MP/Method_GetProductID.qbl

@@ -15,6 +15,8 @@ Method GetProductID () declarative as String
       
       
            version:= p.ID()
+           
+          
       
       
       }

_Main/BL/Type_Routing/Attribute_SCALE.qbl

+Quintiq file version 2.0
+#parent: #root
+Attribute SCALE
+{
+  #keys: '3[413182.1.1796856819][413182.1.1796856818][413182.1.1796856820]'
+  ValueType: Real
+}

_Main/BL/Type_Warehouse/Attribute_DateTime.qbl

+Quintiq file version 2.0
+#parent: #root
+Attribute DateTime
+{
+  #keys: '3[413182.1.1824561486][413182.1.1824561485][413182.1.1824561487]'
+  ValueType: DateTime
+}

_Main/BL/Type_Warehouse/Attribute_ID.qbl

+Quintiq file version 2.0
+#parent: #root
+Attribute ID
+{
+  #keys: '3[413182.1.1824561307][413182.1.1824561306][413182.1.1824561308]'
+  ValueType: String
+}

_Main/BL/Type_Warehouse/Attribute_OperationID.qbl

+Quintiq file version 2.0
+#parent: #root
+Attribute OperationID
+{
+  #keys: '3[413182.1.1824561366][413182.1.1824561365][413182.1.1824561367]'
+  ValueType: String
+}

_Main/BL/Type_Warehouse/Attribute_Quantity.qbl

+Quintiq file version 2.0
+#parent: #root
+Attribute Quantity
+{
+  #keys: '3[413182.1.1824561426][413182.1.1824561425][413182.1.1824561427]'
+  ValueType: Real
+}

_Main/BL/Type_Warehouse/_ROOT_Type_Warehouse.qbl

+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+Type Warehouse
+{
+  #keys: '5[413182.1.1824597094][413182.1.1824597092][0.0.0][413182.1.1824597093][413182.1.1824597095]'
+  BaseType: Object
+  StructuredName: 'Warehouses'
+}

_Main/UI/MacroPlanner/Component_ApplicationLibMacroPlanner/Component_mbMainMenu.def

@@ -81,8 +81,8 @@ Component mbMainMenu #extension
           ]
         }
         Component MenuIMPORT { #keys: '[413182.1.216540432]' BaseType: 'Menu' Properties: [ Text: 'IMPORT' ] }
-        Component MenuDELETE { #keys: '[413182.1.216680684]' BaseType: 'Menu' Properties: [ Text: 'DELETE' ] }
-        Component MenuEXPORT { #keys: '[413182.1.216680736]' BaseType: 'Menu' Properties: [ Text: 'EXPORT' ] }
+        Component MenuDELETE { #keys: '[413182.1.216680684]' BaseType: 'Menu' Properties: [ Text: 'DELETE' Visible: false ] }
+        Component MenuEXPORT { #keys: '[413182.1.216680736]' BaseType: 'Menu' Properties: [ Text: 'EXPORT' Visible: false ] }
       ]
       Properties:
       [

_Main/UI/MacroPlanner/_ROOT_Project_MacroPlanner.qp

@@ -5,7 +5,7 @@ Project id:MacroPlanner
   ProjectProperties
   {
     ApplicationComponentName: 'ApplicationLibMacroPlanner'
-    BuildVersion: '2023.1.0.2'
+    BuildVersion: '2023.1.0.3'
     Description: 'DELMIA Quintiq Macro Planner'
     ProjectKind: 'DesktopClient'
     QuintiqVersion: '6.4.1.0 , build 258128'

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuFinances.def

@@ -13,11 +13,6 @@ Component ContextMenuFinances #extension
     }
     Component MenuUnitCosts #extension
     {
-      Properties:
-      [
-        Title: 'Unit Costs'
-        Visible: false
-      ]
     }
     Component MenuStockingPointCosts #extension
     {

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ContextMenuProcesses.def

@@ -10,7 +10,7 @@ Component ContextMenuProcesses #extension
     {
       Properties:
       [
-        Visible: false
+        Visible: true
       ]
     }
     Component MenuCampaignsAndTransitions #extension

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_ServerInfo.def

+Quintiq file version 2.0
+Component ServerInfo #extension
+{
+  Properties:
+  [
+    Visible: false
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_abgStandardGroup.def

+Quintiq file version 2.0
+Component abgStandardGroup #extension
+{
+  Children:
+  [
+    #child: pnlStandardInformation4
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_applicationFixedPageActionBarPageDef.def

+Quintiq file version 2.0
+Component applicationFixedPageActionBarPageDef #extension
+{
+  Children:
+  [
+    #child: abgStandardGroup
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/Component_pnlStandardInformation4.def

+Quintiq file version 2.0
+Component pnlStandardInformation4 #extension
+{
+  Children:
+  [
+    #child: ServerInfo
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_ApplicationMacroPlanner/_ROOT_Component_ApplicationMacroPlanner.def

@@ -14,6 +14,7 @@ OrphanComponent ApplicationMacroPlanner #extension
         #child: ActionBarPageSales
         #child: ActionBarPageScenarioComparison
         #child: ActionBarPageScenarioAnalysis
+        #child: applicationFixedPageActionBarPageDef
       ]
     }
     Component ExportPlanHolder

_Main/UI/MacroPlannerWebApp/Component_Form172/Component_List187.def

+Quintiq file version 2.0
+Component List187
+{
+  #keys: '[413182.1.1741027302]'
+  BaseType: 'WebList'
+  Children:
+  [
+    Component DataExtractor768
+    {
+      #keys: '[413182.1.1741027303]'
+      BaseType: 'WebDataExtractor'
+      Properties:
+      [
+        Source: 'MacroPlan'
+        Taborder: 0
+        Transformation: 'Product_MP'
+      ]
+    }
+    #child: listActionBarPage673
+    Component DataSetLevel521
+    {
+      #keys: '[413182.1.1741027309]'
+      BaseType: 'WebDataSetLevel'
+      Children:
+      [
+        #child: listContextMenu850
+      ]
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsProductCategory","title":"IsProductCategory","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"IsProductCategory"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ParentID","title":"ParentID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ParentID"}}]'
+        ContextMenu: 'listContextMenu850'
+        Taborder: 2
+      ]
+    }
+  ]
+  Properties:
+  [
+    Taborder: 0
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_Form172/Component_listActionBarPage673.def

+Quintiq file version 2.0
+Component listActionBarPage673
+{
+  #keys: '[413182.1.1741027305]'
+  BaseType: 'listActionBarPage'
+  Properties:
+  [
+    Taborder: 1
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_Form172/Component_listContextMenu850.def

+Quintiq file version 2.0
+Component listContextMenu850
+{
+  #keys: '[413182.1.1741027311]'
+  BaseType: 'listContextMenu'
+  Properties:
+  [
+    Taborder: 0
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_Form172/_ROOT_Component_Form172.def

+Quintiq file version 2.0
+#root
+#parent: MacroPlannerWebApp
+OrphanComponent Form172
+{
+  #keys: '[413182.1.1741027281]'
+  BaseType: 'WebForm'
+  Children:
+  [
+    #child: List187
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_FormProducts/Component_ListProduct#844.def

+Quintiq file version 2.0
+Component ListProduct id:ListProduct_844 #extension
+{
+  Children:
+  [
+    Component DataSetLevelRootProduct #extension
+    {
+      Properties:
+      [
+        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":-1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Name","title":"Name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasureName","title":"UoM","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"UnitOfMeasureName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ID","title":"ID","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ID"}}]'
+      ]
+    }
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_FormProducts/Component_PanelList.def

+Quintiq file version 2.0
+Component PanelList #extension
+{
+  Children:
+  [
+    #child: ListProduct_844
+  ]
+}

_Main/UI/MacroPlannerWebApp/Component_FormProducts/_ROOT_Component_FormProducts.def

+Quintiq file version 2.0
+#root
+#parent: LibMacroPlannerWebUI
+OrphanComponent FormProducts #extension
+{
+  Children:
+  [
+    #child: PanelList
+  ]
+}

_Main/UI/MacroPlannerWebApp/_ROOT_Project_MacroPlannerWebApp.qp

@@ -5,7 +5,7 @@ Project id:MacroPlannerWebApp
   ProjectProperties
   {
     ApplicationComponentName: 'ApplicationMacroPlanner'
-    BuildVersion: '2023.1.0.216'
+    BuildVersion: '2023.1.0.229'
     Description: 'Quintiq Macro Planner'
     ProjectKind: 'WebClient'
     QuintiqVersion: '6.4.1.0 , build 258128'

_Main/metadata.properties

 component=submodel
 kind=Quintiq Metadata File
 name=MacroPlanner
-version.component=2023.1.0.1423
+version.component=2023.1.0.1567
 version.fileformat=2
 version.quintiq=6.4.1.0 , build 258128