Merge remote-tracking branch 'refs/remotes/origin/dev'

chaiyunying

2023-10-30 8eb6a6c8fe153acdf6452faef6aad1f083b16bc5

Merge remote-tracking branch 'refs/remotes/origin/dev'

 _Main/BL/Type_Global_MAPISPIPCategory/Attribute_Critical.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Critical
{
  #keys: '3[414882.0.72610025][414882.0.72610024][414882.0.72610026]'
  Description: '关键物料'
  ValueType: Boolean
}

 _Main/BL/Type_Global_MAPISPIPCategory/Function_CalcCritical.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
Quintiq file version 2.0
#parent: #root
Function CalcCritical
{
  TextBody:
  [*
    // hongjli Oct-24-2023 (created)
    
    value := guard( select( this, Global_MappingProduct_MP, tempGMPMP, true ).Critical(), false );
    
    this.Critical(value);
  *]
}

 _Main/BL/Type_Global_MappingProduct_MP/Attribute_Critical.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Critical
{
  #keys: '3[414882.0.72574612][414882.0.72574611][414882.0.72574613]'
  Description: '关键物料'
  ValueType: Boolean
}

 _Main/BL/Type_Global_MappingProduct_MP/Attribute_KeyProduct.qbl

@@ -3,5 +3,10 @@
Attribute KeyProduct
{
  #keys: '3[414702.0.247711010][414702.0.247711009][414702.0.247711011]'
  Description:
  [*
    å·²å¼ƒç”¨
    å…³é”®ç‰©æ–™æ²¡æœ‰æ•°æ®æ¥æºï¼Œä»¥åŽä»Žå…¶ä»–属性计算得到，改为Critical
  *]
  ValueType: Boolean
}

 _Main/BL/Type_Global_MappingProduct_MP/Function_CalcCritical.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
Quintiq file version 2.0
#parent: #root
Function CalcCritical
{
  TextBody:
  [*
    // renhao Oct-30-2023 (created)
    value := this.ProductMajorType()="成品" or this.ProductMajorType()="半成品";
    
    this.Critical(value);
  *]
}

 _Main/BL/Type_MacroPlan/Method_DoASyncMappingActualPISPIPData.qbl

@@ -36,10 +36,11 @@
        info( "Now is dealing with the " + count.AsQUILL() + "ActualPISPIP " + "( " + count.AsQUILL() + "/" + totalcount.AsQUILL() + " ) " + (count/totalcount*100).Round( 1 ).AsQUILL() + "%" );
        }
      //product := select( globalOTDTable,Global_MappingProduct_MP,product,product.ID() = actual.ProductID() and product.KeyProduct() = nuclear,true);
      if( /*not isnull( product*/ guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){
      //if( guard( actual.Global_MAPISPIPCategory().KeyProduct() = nuclear, false ) ){
      if( not nuclear or (nuclear and actual.Global_MAPISPIPCategory().Critical() = nuclear) ){
      if( not isnull(businessTypes)){
      
        for( i :=0 ;i < businessTypes.Size();i++ ){
        
          //businessType := businessTypes.Element( i );
          if( /*product.BusinessType() = businessType and not product.IsCommon()*/ not actual.Global_MAPISPIPCategory().IsCommon() ){
            ActualProductInStockingPointInPeriod::CreateOrUpdate( this,
@@ -49,7 +50,7 @@
                                                                  actual.ActualInventoryLevelEnd(),
                                                                  actual.ManufacturedDate());
          }
        }
        
        
      }else{
        ActualProductInStockingPointInPeriod::CreateOrUpdate( this,