xiaoding721
2024-10-23 4981fae2e6147b7977422e377d71839a3d2769f0
修复一些bug,添加包装计划的存档方法
已添加1个文件
已修改1个文件
已删除8个文件
536 ■■■■ 文件已修改
_Main/BL/Type_ArchivePackagingPlanCell/Attribute_StartDate.qbl 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcPackagingInventory.qbl 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcStartDate.qbl 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcUnpackagedInventory.qbl 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_Archive.qbl 113 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_CalculationPackagingPlanProperties.qbl 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_GenerateReport.qbl 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_Package.qbl 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_SetPackagingAndUnpackingValues.qbl 146 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_ArchivePackagingPlanCell/Attribute_StartDate.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcPackagingInventory.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcStartDate.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/Function_CalcUnpackagedInventory.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_Archive.qbl
对比新文件
@@ -0,0 +1,113 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Archive (
  const MacroPlan macroPlan,
  Archive archive
)
{
  TextBody:
  [*
    // Akari Oct-23-2024 (created)
    //packagingPlanCells := selectset( macroPlan,PackagingPlanRow.PackagingPlanCell,cell,true );
    //packagingPlanCellIndexTree := NamedValueTree::Create();
    //for( i := 0; i < packagingPlanCells.Size(); i++ ){
    //  packagingPlanCell := packagingPlanCells.Element( i );
    //  packagingPlanRow := packagingPlanCell.PackagingPlanRow();
    //  packagingPlanColumn := packagingPlanCell.PackagingPlanColumn();
    //
    //  packagingPlanRowKey := packagingPlanRow.Category() + packagingPlanRow.Factory() + packagingPlanRow.ProductID() + packagingPlanRow.StockingPointID();
    //  packagingPlanColumnKey := packagingPlanColumn.StartDate().AsQUILL();
    //  packagingPlanCellKey := packagingPlanRowKey + packagingPlanColumnKey;
    //  packagingPlanCellHandle := packagingPlanCellIndexTree.GetHandle( packagingPlanCellKey );
    //
    //  packagingPlanCellIndexTree.Root().AddChild( packagingPlanCellHandle,i );
    //}
    archivePackagingPlanCells := selectset( archive,ArchivePackagingPlanRow.ArchivePackagingPlanCell,cell,true );
    archivePackagingPlanCellIndexTree := NamedValueTree::Create();
    for( i := 0; i < archivePackagingPlanCells.Size(); i++ ){
      archivePackagingPlanCell := archivePackagingPlanCells.Element( i );
      archivePackagingPlanRow := archivePackagingPlanCell.ArchivePackagingPlanRow();
      archivePackagingPlanColumn := archivePackagingPlanCell.ArchivePackagingPlanColumn();
      archivePackagingPlanRowKey := archivePackagingPlanRow.Category() + archivePackagingPlanRow.Factory() + archivePackagingPlanRow.ProductID() + archivePackagingPlanRow.StockingPointID();
      archivePackagingPlanColumnKey := archivePackagingPlanColumn.StartDate().AsQUILL();
      archivePackagingPlanCellKey := archivePackagingPlanRowKey + archivePackagingPlanColumnKey;
      archivePackagingPlanCellHandle := archivePackagingPlanCellIndexTree.GetHandle( archivePackagingPlanCellKey );
      archivePackagingPlanCellIndexTree.Root().AddChild( archivePackagingPlanCellHandle,i );
    }
    archivePackagingPlanRows := selectset( archive,ArchivePackagingPlanRow,row,true );
    archivePackagingPlanRowIndexTree := NamedValueTree::Create();
    for( i := 0; i < archivePackagingPlanRows.Size(); i++ ){
      archivePackagingPlanRow := archivePackagingPlanRows.Element( i );
      archivePackagingPlanRowKey := archivePackagingPlanRow.Category() + archivePackagingPlanRow.Factory() + archivePackagingPlanRow.ProductID() + archivePackagingPlanRow.StockingPointID();
      archivePackagingPlanRowHandle := archivePackagingPlanRowIndexTree.GetHandle( archivePackagingPlanRowKey );
      archivePackagingPlanRowIndexTree.Root().AddChild( archivePackagingPlanRowHandle,i );
    }
    archivePackagingPlanColumns := selectset( archive,ArchivePackagingPlanColumn,row,true );
    archivePackagingPlanColumnIndexTree := NamedValueTree::Create();
    for( i := 0; i < archivePackagingPlanColumns.Size(); i++ ){
      archivePackagingPlanColumn := archivePackagingPlanColumns.Element( i );
      archivePackagingPlanColumnKey := archivePackagingPlanColumn.StartDate().AsQUILL();
      archivePackagingPlanColumnHandle := archivePackagingPlanColumnIndexTree.GetHandle( archivePackagingPlanColumnKey );
      archivePackagingPlanColumnIndexTree.Root().AddChild( archivePackagingPlanColumnHandle,i );
    }
    traverse( macroPlan,PackagingPlanRow.PackagingPlanCell,packagingPlanCell ){
      packagingPlanRow := packagingPlanCell.PackagingPlanRow();
      packagingPlanColumn := packagingPlanCell.PackagingPlanColumn();
      packagingPlanRowKey := packagingPlanRow.Category() + packagingPlanRow.Factory() + packagingPlanRow.ProductID() + packagingPlanRow.StockingPointID();
      packagingPlanColumnKey := packagingPlanColumn.StartDate().AsQUILL();
      packagingPlanCellKey := packagingPlanRowKey + packagingPlanColumnKey;
      archivePackagingPlanCell := null( ArchivePackagingPlanCell );
      archivePackagingPlanCellHandle := archivePackagingPlanCellIndexTree.GetHandle( packagingPlanCellKey );
      archivePackagingPlanCellIndex := guard( archivePackagingPlanCellIndexTree.Root().Child( archivePackagingPlanCellHandle ),null( NamedValue ) );
      if( isnull( archivePackagingPlanCellIndex )){
        archivePackagingPlanRow := null( ArchivePackagingPlanRow );
        archivePackagingPlanRowHandle := archivePackagingPlanRowIndexTree.GetHandle( packagingPlanRowKey );
        archivePackagingPlanRowIndex := guard( archivePackagingPlanRowIndexTree.Root().Child( archivePackagingPlanRowHandle ),null( NamedValue ));
        if( isnull( archivePackagingPlanRowIndex )){
          archivePackagingPlanRow := archive.ArchivePackagingPlanRow( relnew,Category := packagingPlanRow.Category(),Factory := packagingPlanRow.Factory(),ProductID := packagingPlanRow.ProductID(),StockingPointID := packagingPlanRow.StockingPointID() );
          archivePackagingPlanRows.Add( archivePackagingPlanRow );
          archivePackagingPlanRowIndexTree.Root().AddChild( archivePackagingPlanRowHandle,archivePackagingPlanRows.Size() - 1 );
        }else{
          archivePackagingPlanRow := archivePackagingPlanRows.Element( archivePackagingPlanRowIndex.GetValueAsNumber() );
        }
        archivePackagingPlanColumn := null( ArchivePackagingPlanColumn );
        archivePackagingPlanColumnHandle := archivePackagingPlanColumnIndexTree.GetHandle( packagingPlanColumnKey );
        archivePackagingPlanColumnIndex := guard( archivePackagingPlanColumnIndexTree.Root().Child( archivePackagingPlanColumnHandle ),null( NamedValue ));
        if( isnull( archivePackagingPlanColumnIndex )){
          archivePackagingPlanColumn := archive.ArchivePackagingPlanColumn( relnew,StartDate := packagingPlanColumn.StartDate() );
          archivePackagingPlanColumns.Add( archivePackagingPlanColumn );
          archivePackagingPlanColumnIndexTree.Root().AddChild( archivePackagingPlanColumnHandle,archivePackagingPlanColumns.Size() - 1 );
        }else{
          archivePackagingPlanColumn := archivePackagingPlanColumns.Element( archivePackagingPlanColumnIndex.GetValueAsNumber() );
        }
        archivePackagingPlanCell := archivePackagingPlanRow.ArchivePackagingPlanCell( relnew,ArchivePackagingPlanColumn := archivePackagingPlanColumn );
        archivePackagingPlanCells.Add( archivePackagingPlanCell );
        archivePackagingPlanCellIndexTree.Root().AddChild( archivePackagingPlanCellHandle,archivePackagingPlanCells.Size() - 1 );
      }else{
        archivePackagingPlanCell := archivePackagingPlanCells.Element( archivePackagingPlanCellIndex.GetValueAsNumber());
      }
      archivePackagingPlanCell.CC_PackagingInventory( packagingPlanCell.CC_PackagingInventory() );
      archivePackagingPlanCell.CC_UnpackagedInventory( packagingPlanCell.CC_UnpackagedInventory() );
      archivePackagingPlanCell.EndingInventory( packagingPlanCell.EndingInventory() );
      archivePackagingPlanCell.InitialPackagingInventory( packagingPlanCell.InitialPackagingInventory() );
      archivePackagingPlanCell.NetDemand( packagingPlanCell.NetDemand() );
      archivePackagingPlanCell.NewSupply( packagingPlanCell.NewSupply() );
      archivePackagingPlanCell.Out( packagingPlanCell.Out() );
      archivePackagingPlanCell.Package( packagingPlanCell.Package() );
      archivePackagingPlanCell.PackagingInventory( packagingPlanCell.PackagingInventory() );
      archivePackagingPlanCell.TransferIn( packagingPlanCell.TransferIn() );
      archivePackagingPlanCell.UnpackagedInventory( packagingPlanCell.UnpackagedInventory() );
      archivePackagingPlanCell.Unpacking( packagingPlanCell.Unpacking() );
    }
  *]
}
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_CalculationPackagingPlanProperties.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_GenerateReport.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_Package.qbl
文件已删除
_Main/BL/Type_ArchivePackagingPlanCell/StaticMethod_SetPackagingAndUnpackingValues.qbl
文件已删除
_Main/BL/Type_LocalTool/StaticMethod_IsOverlap.qbl
@@ -10,6 +10,6 @@
  TextBody:
  [*
    // rislai Jun-14-2024 (created)
    return start1 <= start2 and end1 >= end2 ;
    return start1 <= start2 and end1 + 1 >= end2 ;
  *]
}