Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

limj

2023-09-26 f440868e3bc53beaf4f8f97df0018f0108fc4c48

Merge branch 'dev' of http://47.101.211.7:10101/r/TIANMA_JITUAN into dev

 _Main/BL/Relations/Relation_H_CustomOrder_MacroPlan_MacroPlan_H_CustomOrder.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
Quintiq file version 2.0
#parent: #root
Relation H_CustomOrder_MacroPlan_MacroPlan_H_CustomOrder
{
  #keys: '1[414724.0.177854649]'
  DefaultRelationStrategy
  {
  }
  RelationSide.LeftSide MacroPlan
  {
    #keys: '3[414724.0.177854651][414724.0.177854650][414724.0.177854652]'
    Cardinality: '0to1'
    ObjectDefinition: H_CustomOrder
    OwningSide: 'Reference'
  }
  RelationSide.RightSide H_CustomOrder
  {
    #keys: '3[414724.0.177854654][414724.0.177854653][414724.0.177854655]'
    Cardinality: '1toN'
    ObjectDefinition: MacroPlan
    OwningSide: 'Owned'
  }
}

 _Main/BL/Type_CustomerOrder/Attribute_OrderTag.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute OrderTag
{
  #keys: '3[414724.0.177854629][414724.0.177854628][414724.0.177854630]'
  Description: '订单状态，冲减后赋值，纯预测,有预测，无预测，反签，授权'
  ValueType: String
}

 _Main/BL/Type_GlobalDTOTable/Method_SetIsLinkedWithFinishedGoodAttributes.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,41 @@
Quintiq file version 2.0
#parent: #root
Method SetIsLinkedWithFinishedGoodAttributes
{
  Description: 'Method to traverse the supply chain to determine if there are any products that are not used to produce finished goods.'
  TextBody:
  [*
    // Reset IsLinkedWithFinishedGood
    traverse( this, Global_MappingProduct_MP, instance )
    {
      instance.IsLinkedWithFinishedGood( false );
    }
    
    traverse( this, Global_MappingOperation, instance )
    {
      instance.IsLinkedWithFinishedGood( false );
    }
    
    traverse( this, Global_MappingOperationBOM, instance )
    {
      instance.IsLinkedWithFinishedGood( false );
    }
    
    productspool := selectset( this, Global_MappingProduct_MP, product,
                               product.ProductMajorType() <> "成品" );
    operationspool := this.Global_MappingOperation( relget );
    operationbomspool := this.Global_MappingOperationBOM( relget );
    
    // Traverse each finished good and search for linked products/operations/lanes
    traverse( this, Global_MappingProduct_MP, product,
              product.ProductMajorType() = "成品" )
    {
      product.SetIsLinkedWithFinishedGoodAttributes_Recursive( 0, // depth
                                                               100, // maxdepth
                                                               productspool,
                                                               operationspool,
                                                               operationbomspool );
      
    }
  *]
}

 _Main/BL/Type_Global_MappingOperation/Attribute_IsLinkedWithFinishedGood.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute IsLinkedWithFinishedGood
{
  #keys: '3[157968.0.1145180207][157968.0.1145180206][157968.0.1145180208]'
  Description: 'Updated procedurally for checking whether this object is used to produce a finished good.'
  ValueType: Boolean
}

 _Main/BL/Type_Global_MappingOperationBOM/Attribute_IsLinkedWithFinishedGood.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute IsLinkedWithFinishedGood
{
  #keys: '3[157968.0.1145180190][157968.0.1145180189][157968.0.1145180191]'
  Description: 'Updated procedurally for checking whether this object is used to produce a finished good.'
  ValueType: Boolean
}

 _Main/BL/Type_Global_MappingProduct_MP/Attribute_IsLinkedWithFinishedGood.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute IsLinkedWithFinishedGood
{
  #keys: '3[157968.0.1145180168][157968.0.1145180167][157968.0.1145180169]'
  Description: 'Updated procedurally for checking whether this product is used to produce a finished good.'
  ValueType: Boolean
}

 _Main/BL/Type_Global_MappingProduct_MP/Method_SetIsLinkedWithFinishedGoodAttributes_Recursive.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,83 @@
Quintiq file version 2.0
#parent: #root
Method SetIsLinkedWithFinishedGoodAttributes_Recursive (
  Number depth,
  Number maxdepth,
  Global_MappingProduct_MPs productspool,
  Global_MappingOperations operationspool,
  Global_MappingOperationBOMs operationbomspool
)
{
  Description: 'Method to traverse the supply chain recursively to determine if there are any products that are not used to produce finished goods.'
  TextBody:
  [*
    if( not this.IsLinkedWithFinishedGood() )
    {
      depth := depth + 1;
      this.IsLinkedWithFinishedGood( true );
      
      if( depth <= maxdepth )
      {
        operations := selectset( operationspool, Elements, operation,
                                 not operation.IsLinkedWithFinishedGood()
                                 and operation.BusinessType() = this.BusinessType()
                                 and operation.ProductID() = this.ID() );
        operationspool.Remove( operations );
        
        traverse( operations, Elements, operation )
        {
          operation.IsLinkedWithFinishedGood( true );
          
          operationboms := selectset( operationbomspool, Elements, operationbom,
                                      not operationbom.IsLinkedWithFinishedGood()
                                      and operationbom.BusinessType() = operation.BusinessType()
                                      and operationbom.OrganCode() = operation.OrganCode()
                                      and operationbom.ProcessSection() = operation.ProcessSection()
                                      and operationbom.ProductCode() = operation.ProductID() );
          operationbomspool.Remove( operationboms );
          
          traverse( operationboms, Elements, operationbom )
          {
            operationbom.IsLinkedWithFinishedGood( true );
            
            componentproduct := Global_MappingProduct_MP::FindTypeIndexIDAndBusinessType( operationbom.ComponentCode(),
                                                                                          operationbom.BusinessType() );
            
            if( guard( not componentproduct.IsLinkedWithFinishedGood(), false ) )
            {
              productspool.Remove( componentproduct );
              componentproduct.SetIsLinkedWithFinishedGoodAttributes_Recursive( depth,
                                                                                maxdepth,
                                                                                productspool,
                                                                                operationspool,
                                                                                operationbomspool );
            }
            
            if( operationbom.AlternativeMaterialCode() <> ""
                and operationbom.AlternativeMaterialCode() <> operationbom.ComponentCode() )
            {
              alternativeproduct := Global_MappingProduct_MP::FindTypeIndexIDAndBusinessType( operationbom.AlternativeMaterialCode(),
                                                                                              operationbom.BusinessType() );
              
              if( guard( not alternativeproduct.IsLinkedWithFinishedGood(), false ) )
              {
                productspool.Remove( alternativeproduct );
                alternativeproduct.SetIsLinkedWithFinishedGoodAttributes_Recursive( depth,
                                                                                    maxdepth,
                                                                                    productspool,
                                                                                    operationspool,
                                                                                    operationbomspool );
              }
            }
          }
        }
      }
      else
      {
        debuginfo( "Product:", this.ID(),
                   "| BusinessType:", this.BusinessType(),
                   "| Max depth reached, stop searching... (", depth, ")" );
      }
    }
  *]
}

 _Main/BL/Type_H_CustomOrder/_ROOT_Type_H_CustomOrder.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
#root
#parent: #DomainModel
Type H_CustomOrder
{
  #keys: '5[414724.0.177854646][414724.0.177854644][0.0.0][414724.0.177854645][414724.0.177854647]'
  BaseType: Object
  Description: '重建后的订单'
  StructuredName: 'H_CustomOrders'
}

 _Main/BL/Type_H_FunctionClass/StaticMethod_NewStaticMethod.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetALlBOM.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetBOMBySKU.qbl

@@ -1,17 +1,17 @@
Quintiq file version 2.0
#parent: #root
StaticMethod SM_GetBOMBySKU (
  MacroPlan Owner,
  GlobalOTDTable GlobData,
  String SKU
) as MappingBOM
) as Global_MappingOperationBOM
{
  Description: '根据SKU获取BOM'
  TextBody:
  [*
    Obj :=null( MappingBOM,constcontent );
    if( not isnull( Owner) and SKU.Length()>0)
    Obj :=null( Global_MappingOperationBOM,constcontent );
    if( not isnull( GlobData) and SKU.Length()>0)
    {
      Obj := select( Owner,MappingBOM,ObjM,ObjM.ProductCode()=SKU);
      Obj := select( GlobData,Global_MappingOperationBOM,ObjM,ObjM.ProductCode()=SKU);
    }
    return Obj;
  *]

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetMaterialData.qbl

@@ -6,7 +6,8 @@
  Number ProductQty,
  String ForecastId,
  String VCode,
  Date NDate
  Date NDate,
  GlobalOTDTable GlobData
) as owning JSON
{
  Description: '获取物料信息'
@@ -26,15 +27,15 @@
      if( Owner.MappingBOM(relsize )>0)
      {
        // å¾—到下一级数据
        AllData:= selectset( Owner, MappingBOM,object,object.ComponentCode()=ParentSKU);
        ObjProduct := null( MappingProduct,constcontent );
        AllData:= selectset( GlobData, Global_MappingOperationBOM,object,object.ComponentCode()=ParentSKU);
        ObjProduct := null( Product_MP,constcontent );
        ObjUnit := null( Unit,constcontent );
        MaterialType:="";
        MaterialName:="-";
        StockPoint := "";
        NRate:=1.0;
        NComponentsUsed :=0.0;
        ObjBOM := H_FunctionClass::SM_GetBOMBySKU( Owner,ParentSKU);
        ObjBOM := H_FunctionClass::SM_GetBOMBySKU(GlobData,ParentSKU);
        if(not isnull( ObjBOM))
        {
          NRate := ObjBOM.ComponentOutputRate();
@@ -56,10 +57,10 @@
              // ç‰©æ–™ç±»åž‹
              MaterialType := Obj.ProductType();
              // å¾—到物料信息
              ObjProduct:= H_FunctionClass::SM_GetProductInfo(Owner, Obj.ProductCode());
              ObjProduct:= H_FunctionClass::SM_GetProductInfo(Owner,Obj.ProductCode());
              if( not isnull( ObjProduct))
              {
                MaterialType:= ObjProduct.ProductMajorType();
                MaterialType:= ObjProduct.ParentID();
                MaterialName:=ObjProduct.Name();
              }
              ObjUnit:= H_FunctionClass::SM_GetUnitBySKU( Owner,Obj.ProductCode());
@@ -87,6 +88,10 @@
                                    ,ID := H_FunctionClass::SM_GenerateID( "MI"),MaterialType := "原材料",NeedDate := NDate
                                    ,NeedQty := [Number](ProductQty*0.8).Round( 0),Unit := "PCS"
                                    ,StockPoint :="测试",MaterialName := "测试数据" );
        Owner.H_MaterialInfo(relnew,ParentSKU := ParentSKU,SKU := "SKU_M"+ (nCount+1).AsQUILL() ,ForecastID := ForecastId,OrgCode := "ORG_000",VCode := VCode
                                    ,ID := H_FunctionClass::SM_GenerateID( "MI"),MaterialType := "半成品",NeedDate := NDate
                                    ,NeedQty := [Number](ProductQty*0.8).Round( 0),Unit := "PCS"
                                    ,StockPoint :="测试",MaterialName := "测试数据" );
      }
      bStatus := true;
      strMsg :="";

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetProductInfo#1.qbl

@@ -3,16 +3,17 @@
StaticMethod SM_GetProductInfo (
  MacroPlan Owner,
  String SKU
) as MappingProduct
) as Product_MP
{
  Description: '根据SKU获取物料信息'
  TextBody:
  [*
    // æ ¹æ®SKU获取物料信息
    Obj := null( MappingProduct,constcontent );
    // æ³¨æ„ï¼šç‰©æ–™ç±»åž‹å– ParentID
    Obj := null( Product_MP,constcontent );
    if( not isnull( Owner) and SKU.Length()>0)
    {
      Obj:= select( Owner,MappingProduct,ObjMP,ObjMP.ID()=SKU);
      Obj:= select( Owner,Product_MP,ObjMP,ObjMP.ID()=SKU);
    }
    return Obj;
  *]

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_InitialForcastData.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_InitialForcastDataEx.qbl

@@ -2,7 +2,8 @@
#parent: #root
StaticMethod SM_InitialForcastDataEx (
  MacroPlan Owner,
  Boolean IsNew
  Boolean IsNew,
  String VersionCode
) as owning JSON
{
  Description: '初始化订单预测信息'
@@ -11,36 +12,46 @@
    /**********************************初始化订单预测信息***************************************
    *注：未确定上游预测订单更新逻辑和数据有效性，这里进行二次处理，新生成一个列表，避免上游信息变动严重
    *    å½±å“åŠŸèƒ½
    *
    *参数：IsNew æ˜¯å¦æ—¶å…¨æ–°æ•°æ®ï¼Œå…¨æ–°æ•°æ®ä¼šå°†æ—§çš„数据清除，然后重新填充，不是全新数据，将累计和更新
    *****************************************************************************************/
    // åˆå§‹åŒ–结果
    bStatus := false;
    strMsg :="";
    
    try{
      // æ¸…除旧数据，重新拉取
      if(Owner.H_Forecast(relget ).Size()>0)
      // 20230925 ä¼˜åŒ–的业务逻辑,如果时新数据，则预测数据全部干掉，然后重新生成
      if( IsNew)
      {
        traverse( Owner,H_Forecast,Obj,not isnull( Obj))
        if( Owner.H_OrderForecastRealQty(relsize )>0)
        {
          Owner.H_Forecast(reldelete, Obj);
          traverse( Owner,H_OrderForecastRealQty,Obj,not isnull( Obj))
          {
            Owner.H_OrderForecastRealQty(reldelete, Obj);
          }
        }
      }
      
      // èŽ·å–预测订单：当月和之后的3个月预测数据 ä¸”预测数量>0的
      AllData:= selectset( Owner, Product_MP.SalesDemand.astype( Forecast ),object,object.EndDate().DateTime().Date() >= Date::ActualDate().StartOfMonth() 
                           and object.EndDate().DateTime().Date() <= Date::ActualDate().StartOfNextMonth().StartOfNextMonth().StartOfNextMonth().StartOfNextMonth()
      AllData:= selectset( Owner, Product_MP.SalesDemand.astype( Forecast ),object,
                           object.EndDate().DateTime().Date() >= Date::ActualDate().StartOfMonth() 
                           // éœ€æ±‚给未来4个月的数据，但可能并不准确，暂时注释掉，四个月限制
                           //and object.EndDate().DateTime().Date() <= Date::ActualDate().StartOfNextMonth().StartOfNextMonth().StartOfNextMonth().StartOfNextMonth()
                           and object.Quantity()>0 );
      
      CustomName:="";
      DepartMent:="";
      idx:=0;
      strOrderCode:="";
      RQty:=0;
      ObjOrderRealQty:=null( H_OrderForecastRealQty,constcontent );
    //  ObjPruduct :=null( MappingProduct,constcontent );
      SKU:="";
      SKUName := "";
    
      traverse( AllData,Elements,Obj,not isnull(Obj))
      {
        // æ²¡æœ‰å®¢æˆ·ä¿¡æ¯å’Œéƒ¨é—¨ä¿¡æ¯ï¼ŒSalesSegmentName=事业部+“-”+客户名称
        CustomName := Obj.SalesSegmentName();
        DepartMent := Obj.SalesSegmentName();
        SKU :=Obj.ProductID();
        // è¿™é‡Œç”¨æŸ¥æ‰¾åŽæˆªå–，因为不确定有几个横线，以第一个为准
        idx:=Obj.SalesSegmentName().FindString( "-",0);
        if(idx>0)
@@ -48,61 +59,40 @@
          DepartMent:=Obj.SalesSegmentName().SubString( 0,idx);
          CustomName := Obj.SalesSegmentName().SubString( idx+1, Obj.SalesSegmentName().Length() - (idx+1));
        }
        else
        
        // èŽ·å–物料信息
        ObjMaterial := H_FunctionClass::SM_GetProductInfo( Owner,Obj.ProductID());
        if(not isnull( ObjMaterial))
        {
          CustomName :=Obj.SalesSegmentName();
          DepartMent := "部门数据获取失败！"
          SKUName := ObjMaterial.Name();
        }
    //    // ä»Žç‰©æ–™è¡¨èŽ·å–物料信息
    //    ObjPruduct := H_FunctionClass::SM_GetProductInfo( Owner,Obj.ProductID());
    //    if( not isnull( ObjPruduct))
    //    {
    //      
    //    }
         // å†™å…¥é¢„测订单信息表
         strOrderCode:=H_FunctionClass::SM_GenerateID( "OF");
         Owner.H_Forecast(relnew,OrderCode := strOrderCode,
                                SKU := Obj.ProductID(),
                               CustomCode := CustomName,
                               CustomName := CustomName,
                               Util:=Obj.UnitOfMeasureName(),
                               NeedTime:=Obj.EndDate(),
                               ForecastQty:=[Number]Obj.Quantity().Round( 0),
                               StockingPointID := Obj.StockingPointID(),
                               Department:=DepartMent);
         // å†™å…¥é¢„测实时信息
         ObjOrderRealQty := select( Owner,H_OrderForecastRealQty,ObjO,ObjO.CustomID()=CustomName and ObjO.SKU()=Obj.ProductID() 
        
         // æ›´æ–°é¢„测信息，非新数据更新信息。
         ObjOrderRealQty := select( Owner,H_OrderForecastRealQty,ObjO,ObjO.CustomCode()=CustomName and ObjO.SKU()=Obj.ProductID() 
                                    and ObjO.Month().StartOfMonth() = Obj.EndDate().StartOfMonth() )
         if( isnull( ObjOrderRealQty))
         if( IsNew or isnull( ObjOrderRealQty))
         {
             Owner.H_OrderForecastRealQty(relnew,CustomID := CustomName,CustomName := CustomName,ForecatsQty := [Number]Obj.Quantity().Round( 0)
                                           ,ForecatsRealQty := [Number]Obj.Quantity().Round( 0),ID := H_FunctionClass::SM_GenerateID( "OR")
                                           ,Month := Obj.EndDate(),OrderCode := strOrderCode,SKU := Obj.ProductID(),Unit := Obj.UnitOfMeasureName());
           Owner.H_OrderForecastRealQty(relnew,CustomCode := CustomName,CustomName := CustomName,ForecastQty := [Number]Obj.Quantity().Round( 0)
                                         ,ForecatsRealQty := [Number]Obj.Quantity().Round( 0),ID := H_FunctionClass::SM_GenerateID( "OR")
                                         ,Month := Obj.EndDate(),SKU := Obj.ProductID(),Unit := Obj.UnitOfMeasureName()
                                         ,Department := DepartMent,VCode := VersionCode,SKUName := SKUName);
         }
         else
         {
           if( IsNew)
           {
              ObjOrderRealQty.ForecatsQty([Number]Obj.Quantity().Round( 0));
              ObjOrderRealQty.ForecatsRealQty([Number]Obj.Quantity().Round( 0));
           }
           else
           {
              if( [Number]Obj.Quantity().Round( 0)<> ObjOrderRealQty.ForecatsQty())
              {
                    RQty := [Number]Obj.Quantity().Round( 0) - ObjOrderRealQty.ForecatsQty();
                    RQty := ObjOrderRealQty.ForecatsRealQty() + RQty;
                    if( RQty<0)
                    {
                        RQty :=0;
                    }
                    ObjOrderRealQty.ForecatsQty([Number]Obj.Quantity().Round( 0));
                    ObjOrderRealQty.ForecatsRealQty(RQty);
              }
           }
           // æ›´æ–°äº†é¢„测数据，则计算实时数据增减
            if( [Number]Obj.Quantity().Round( 0)<> ObjOrderRealQty.ForecastQty())
            {
                  RQty := [Number]Obj.Quantity().Round( 0) - ObjOrderRealQty.ForecastQty();
                  RQty := ObjOrderRealQty.ForecatsRealQty() + RQty;
                  if( RQty<0)
                  {
                      RQty :=0;
                  }
                  ObjOrderRealQty.ForecastQty([Number]Obj.Quantity().Round( 0));
                  ObjOrderRealQty.ForecatsRealQty(RQty);
            }
         }
      }
     
      
      bStatus := true;
      strMsg :="订单预测初始化成功!";

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_MaterialReverse.qbl

@@ -39,7 +39,7 @@
        nNoHaveForecastQty:=0;//五预测数量
        // èŽ·å–预测数量（客户+SKU+月份 ç†è®ºæ˜¯æ²¡æœ‰ç‰©æ–™é¢„测）
        OrderForecast := select(Owner, H_OrderForecastRealQty , Obj, Obj.SKU() = SKU 
                                              and Obj.CustomID() = CustomerCode 
                                              and Obj.CustomCode() = CustomerCode 
                                              and Obj.Month().Format( "YM2") = Date::ActualDate().Format( "YM2"));                                   
        if ( not isnull(OrderForecast))
        {
@@ -195,10 +195,9 @@
          {
            Owner.H_OrderForecastRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "OF"),SKU := SKU,
                                                                                            Month := Date::ActualDate(),
                                                                                            CustomID := CustomerCode,
                                                                                            CustomCode := CustomerCode,
                                                                                            CustomName := "客户表获取",
                                                                                            OrderCode := "-",
                                                                                            ForecatsQty :=0,
                                                                                            ForecastQty := 0,
                                                                                            ForecatsRealQty :=nForecastQtyNew,
                                                                                            Unit := "SKU åˆ°ç‰©æ–™è¡¨èŽ·å–");
          } 

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_OrderHedging.qbl

@@ -26,161 +26,198 @@
      if( not isnull( Owner))
      {
        // åˆå§‹åŒ–预测信息
        JResult := H_FunctionClass::SM_InitialForcastDataEx( Owner,IsNew);
        JResult := H_FunctionClass::SM_InitialForcastDataEx( Owner,IsNew,"--");
        // é¢„测初始化完成
        if( JResult.Get( "Status").GetBoolean())
        {
          traverse( Owner,SalesDemand.astype( CustomerOrder ),ObjOrder,not isnull( ObjOrder))
          nForecastQtyOld := 0; //原预测数量
          nReverseQtyOld :=0;   //原反签数量
          nAuthorizeQtyOld :=0; //原授权数量
          nForecastQtyNew :=0;  //计算后的预测数量
          nReverseQtyNew :=0;   //计算后的反签数量
          nAuthorizeQtyNew :=0; //计算后的授权数量
          nHaveForecastQty :=0; //有预测数量
          nNoHaveForecastQty:=0;//五预测数量
          OrderQuantity := 0;   //剩余订单数量
          traverse( Owner,SalesDemand.astype( CustomerOrder ),ObjOrder)
          {
            //----------------------------------------以下后去预测 åç­¾ æŽˆæƒæ•°æ®ä¿¡æ¯----------------
            nForecastQtyOld := 0; //原预测数量
            nReverseQtyOld :=0;   //原反签数量
            nAuthorizeQtyOld :=0; //原授权数量
            nForecastQtyNew :=0;  //计算后的预测数量
            nReverseQtyNew :=0;   //计算后的反签数量
            nAuthorizeQtyNew :=0; //计算后的授权数量
            nHaveForecastQty :=0; //有预测数量
            nNoHaveForecastQty:=0;//五预测数量
            OrderQuantity := 0;   //剩余订单数量
           
            // èŽ·å–预测数量（客户+SKU+月份 ç†è®ºæ˜¯æ²¡æœ‰ç‰©æ–™é¢„测）
            OrderForecast := select(Owner, H_OrderForecastRealQty , Obj, Obj.SKU() = ObjOrder.ProductID() 
                                                  and Obj.CustomID() = ObjOrder.CustomerName() 
                                                  and Obj.Month().Format( "YM2") =ObjOrder.EndDate().Format( "YM2"));
            if ( not isnull(OrderForecast))
            // ç›´æŽ¥åˆ é™¤æœ¬æœˆä¹‹å‰çš„订单
            if( ObjOrder.EndDate()<Date::ActualDate().StartOfMonth())
            {
                nForecastQtyOld := OrderForecast.ForecatsRealQty();
                nForecastQtyNew := nForecastQtyOld;
            }
            
            // èŽ·å–反签数量（只判断SKU）
            ObjReverse := select(Owner, H_ReverseRealQty , Obj, Obj.SKU() = ObjOrder.ProductID());
            if ( not isnull(ObjReverse))
            {
                nReverseQtyOld := ObjReverse.ReverseRealQty();
                nReverseQtyNew := nReverseQtyOld;
            }
            
            // èŽ·å–授权数量（客户ID+SKU）
            ObjAuthorize := select(Owner, H_AuthorizeRealQty , Obj, Obj.SKU() = ObjOrder.ProductID() 
                                                                    and Obj.CustomID() = ObjOrder.CustomerName());
            if ( not isnull(ObjAuthorize))
            {
                nAuthorizeQtyOld := ObjAuthorize.AuthorizeRealQty();
                nAuthorizeQtyNew :=nAuthorizeQtyOld;
            }
            //-----------------------------以下订单冲减--------------------
            // æŽˆæƒè®°å½•ID
            AQID := H_FunctionClass::SM_GenerateID( "AQ");
            // è®¢å•å‰©ä½™æ•°é‡
            OrderQuantity := [Number]ObjOrder.Quantity().Round( 0);
            // 1 å…ˆå†²æŽˆæƒ
            if( OrderQuantity>0 and nAuthorizeQtyOld>0)
            { 
               OrderQuantity := OrderQuantity-nAuthorizeQtyOld;
               nAuthorizeQtyNew :=0; 
               if( OrderQuantity<0)
               {
                 nAuthorizeQtyNew := abs(OrderQuantity);
                 OrderQuantity :=0;
               }
            }
            // 2 å†å†²åç­¾
            if( OrderQuantity>0 and nReverseQtyOld>0)
            { 
               OrderQuantity := OrderQuantity-nReverseQtyOld;
               nReverseQtyNew :=0; 
               if( OrderQuantity<0)
               {
                 nReverseQtyNew := abs(OrderQuantity);
                 OrderQuantity :=0;
               }
            }
            // 3 æœ€åŽå†²é¢„测
            if( OrderQuantity>0 and nForecastQtyOld>0)
            { 
               //默认订单数量>预测数量
               OrderQuantity := OrderQuantity-nForecastQtyOld;
               nForecastQtyNew :=0;
               nHaveForecastQty := nForecastQtyOld;
               nNoHaveForecastQty := OrderQuantity; 
               if( OrderQuantity<0)
               {
                 nForecastQtyNew := abs(OrderQuantity);
                 OrderQuantity :=0;
                 nHaveForecastQty := nForecastQtyOld - nForecastQtyNew;
                 nNoHaveForecastQty := 0;
               }
            }
            // è®°å½•åŠ¨ä½œ
            Owner.H_OrderRecord(relnew,
                                   ID := AQID,
                                   VCode:=VCode,
                                   SKU:=ObjOrder.ProductID(),
                                   ReverseQty := nReverseQtyNew,
                                   CustomerCode := ObjOrder.CustomerName(),
                                   CustomerName := ObjOrder.CustomerName(),
                                   ForecastQty := nForecastQtyNew,
                                   OrderDateTime := ObjOrder.EndDate(),
                                   OrderQty := [Number]ObjOrder.Quantity().Round( 0),
                                   OrderCode:=ObjOrder.OrderID(),
                                   AuthorizeQty := nAuthorizeQtyNew,
                                   ReverseDeductQty := nReverseQtyOld - nReverseQtyNew,
                                   AuthorizeDeductQty := 0,
                                   ForecastHitQty :=nHaveForecastQty,
                                   ForecastNoHitQty :=nNoHaveForecastQty,
                                   OperateType := OperatorType,
                                   Operator := Operator,
                                   Unit := ObjOrder.UnitOfMeasureName(),
                                   OperateQty := [Number]ObjOrder.Quantity().Round( 0),
                                   OperateTime := DateTime::ActualTime());
                                   
            // æ›´æ–°å½“前反签数量
            if( not isnull( ObjReverse))
            {
              ObjReverse.ReverseRealQty(nReverseQtyNew);
               ObjOrder.Delete();  
            }
            else
            {
              Owner.H_ReverseRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "RQ"),SKU := ObjOrder.ProductID(),Unit := ObjOrder.UnitOfMeasureName()
                                      ,ReverseRealQty := nReverseQtyNew);
            } 
            // æ›´æ–°æŽˆæƒ
            if( not isnull( ObjAuthorize))
            {
              ObjAuthorize.AuthorizeRealQty(nAuthorizeQtyNew);
              //----------------------------------------以下后去预测 åç­¾ æŽˆæƒæ•°æ®ä¿¡æ¯----------------
              nForecastQtyOld := 0; //原预测数量
              nReverseQtyOld :=0;   //原反签数量
              nAuthorizeQtyOld :=0; //原授权数量
              nForecastQtyNew :=0;  //计算后的预测数量
              nReverseQtyNew :=0;   //计算后的反签数量
              nAuthorizeQtyNew :=0; //计算后的授权数量
              nHaveForecastQty :=0; //有预测数量
              nNoHaveForecastQty:=0;//五预测数量
              OrderQuantity := 0;   //剩余订单数量
              // èŽ·å–预测数量（客户+SKU+月份 ç†è®ºæ˜¯æ²¡æœ‰ç‰©æ–™é¢„测）
              OrderForecast := select(Owner, H_OrderForecastRealQty , Obj, Obj.SKU() = ObjOrder.ProductID() 
                                                    and Obj.CustomCode() = ObjOrder.CustomerName() 
                                                    and Obj.Month().Format( "YM2") =ObjOrder.EndDate().Format( "YM2"));
              if ( not isnull(OrderForecast))
              {
                  nForecastQtyOld := OrderForecast.ForecatsRealQty();
                  nForecastQtyNew := nForecastQtyOld;
              }
              // èŽ·å–反签数量（只判断SKU）
              ObjReverse := select(Owner, H_ReverseRealQty , Obj, Obj.SKU() = ObjOrder.ProductID());
              if ( not isnull(ObjReverse))
              {
                  nReverseQtyOld := ObjReverse.ReverseRealQty();
                  nReverseQtyNew := nReverseQtyOld;
              }
              // èŽ·å–授权数量（客户ID+SKU）
              ObjAuthorize := select(Owner, H_AuthorizeRealQty , Obj, Obj.SKU() = ObjOrder.ProductID() 
                                                                      and Obj.CustomID() = ObjOrder.CustomerName());
              if ( not isnull(ObjAuthorize))
              {
                  nAuthorizeQtyOld := ObjAuthorize.AuthorizeRealQty();
                  nAuthorizeQtyNew :=nAuthorizeQtyOld;
              }
              //-----------------------------以下订单冲减--------------------
              // æŽˆæƒè®°å½•ID
              AQID := H_FunctionClass::SM_GenerateID( "AQ");
              // è®¢å•å‰©ä½™æ•°é‡
              OrderQuantity := [Number]ObjOrder.Quantity().Round( 0);
              // 1 å…ˆå†²æŽˆæƒ
              if( OrderQuantity>0 and nAuthorizeQtyOld>0)
              { 
                 OrderQuantity := OrderQuantity-nAuthorizeQtyOld;
                 nAuthorizeQtyNew :=0; 
                 if( OrderQuantity<0)
                 {
                   nAuthorizeQtyNew := abs(OrderQuantity);
                   OrderQuantity :=0;
                 }
              }
              // 2 å†å†²åç­¾
              if( OrderQuantity>0 and nReverseQtyOld>0)
              { 
                 OrderQuantity := OrderQuantity-nReverseQtyOld;
                 nReverseQtyNew :=0; 
                 if( OrderQuantity<0)
                 {
                   nReverseQtyNew := abs(OrderQuantity);
                   OrderQuantity :=0;
                 }
              }
              // 3 æœ€åŽå†²é¢„测
              if( OrderQuantity>0)
              { 
                 //默认订单数量>预测数量
                 OrderQuantity := OrderQuantity-nForecastQtyOld;
                 nForecastQtyNew :=0;
                 nHaveForecastQty := nForecastQtyOld;
                 nNoHaveForecastQty := OrderQuantity; 
                 if( OrderQuantity<0)
                 {
                   nForecastQtyNew := abs(OrderQuantity);
                   OrderQuantity :=0;
                   nHaveForecastQty := nForecastQtyOld - nForecastQtyNew;
                   nNoHaveForecastQty := 0;
                 }
              }
              // è®°å½•åŠ¨ä½œ
              Owner.H_OrderRecord(relnew,
                                     ID := AQID,
                                     VCode:=VCode,
                                     SKU:=ObjOrder.ProductID(),
                                     ReverseQty := nReverseQtyNew,
                                     CustomerCode := ObjOrder.CustomerName(),
                                     CustomerName := ObjOrder.CustomerName(),
                                     ForecastQty := nForecastQtyNew,
                                     OrderDateTime := ObjOrder.EndDate(),
                                     OrderQty := [Number]ObjOrder.Quantity().Round( 0),
                                     OrderCode:=ObjOrder.OrderID(),
                                     AuthorizeQty := nAuthorizeQtyNew,
                                     ReverseDeductQty := nReverseQtyOld - nReverseQtyNew,
                                     AuthorizeDeductQty := 0,
                                     ForecastHitQty :=nHaveForecastQty,
                                     ForecastNoHitQty :=nNoHaveForecastQty,
                                     OperateType := OperatorType,
                                     Operator := Operator,
                                     Unit := ObjOrder.UnitOfMeasureName(),
                                     OperateQty := [Number]ObjOrder.Quantity().Round( 0),
                                     OperateTime := DateTime::ActualTime());
              // çº¯é¢„测订单
              if( nForecastQtyNew>0)
              {
                FOrder := ObjOrder.Copy();
                FOrder.OrderTag("纯预测");
                FOrder.Quantity(nForecastQtyNew);
              }
              // æœ‰é¢„测订单
              if(nHaveForecastQty>0)
              {
                HFOrder := ObjOrder.Copy();
                HFOrder.OrderTag("有预测");
                HFOrder.Quantity(nHaveForecastQty);
              }
              // æ— é¢„测
              if(nNoHaveForecastQty>0)
              {
                NHFOrder := ObjOrder.Copy();
                NHFOrder.OrderTag("无预测");
                NHFOrder.Quantity(nNoHaveForecastQty);
              }
              // ERP反签授权订单-接口未提供
             
              // æ›´æ–°å½“前反签数量
              if( not isnull( ObjReverse))
              {
                ObjReverse.ReverseRealQty(nReverseQtyNew);
              }
              else
              {
                Owner.H_ReverseRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "RQ"),SKU := ObjOrder.ProductID(),Unit := ObjOrder.UnitOfMeasureName()
                                        ,ReverseRealQty := nReverseQtyNew);
              } 
              // æ›´æ–°æŽˆæƒ
              if( not isnull( ObjAuthorize))
              {
                ObjAuthorize.AuthorizeRealQty(nAuthorizeQtyNew);
              }
              else
              {
                Owner.H_AuthorizeRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "AR"),SKU := ObjOrder.ProductID(),
                                                                                                Month := ObjOrder.EndDate(),
                                                                                                CustomID := ObjOrder.CustomerName(),
                                                                                                CustomName := ObjOrder.CustomerName(),
                                                                                                OrderCode := "-",
                                                                                                AuthorizeRealQty :=nAuthorizeQtyNew,
                                                                                                Unit := ObjOrder.UnitOfMeasureName());
              } 
              // æ›´æ–°é¢„测
              if( not isnull( OrderForecast))
              {
                OrderForecast.ForecatsRealQty(nForecastQtyNew);
              }
              else
              {
                Owner.H_OrderForecastRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "OF"),SKU := ObjOrder.ProductID(),
                                                                                                Month := ObjOrder.EndDate(),
                                                                                                CustomCode := ObjOrder.CustomerName(),
                                                                                                CustomName := ObjOrder.CustomerName(),
                                                                                                ForecastQty := 0,
                                                                                                ForecatsRealQty :=nForecastQtyNew,
                                                                                                Unit := ObjOrder.UnitOfMeasureName());
              }
              ObjOrder.Delete();
            }
            else
            {
              Owner.H_AuthorizeRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "AR"),SKU := ObjOrder.ProductID(),
                                                                                              Month := ObjOrder.EndDate(),
                                                                                              CustomID := ObjOrder.CustomerName(),
                                                                                              CustomName := ObjOrder.CustomerName(),
                                                                                              OrderCode := "-",
                                                                                              AuthorizeRealQty :=nAuthorizeQtyNew,
                                                                                              Unit := ObjOrder.UnitOfMeasureName());
            } 
            // æ›´æ–°é¢„测
            if( not isnull( OrderForecast))
            {
              OrderForecast.ForecatsRealQty(nForecastQtyNew);
            }
            else
            {
              Owner.H_OrderForecastRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "OF"),SKU := ObjOrder.ProductID(),
                                                                                              Month := ObjOrder.EndDate(),
                                                                                              CustomID := ObjOrder.CustomerName(),
                                                                                              CustomName := ObjOrder.CustomerName(),
                                                                                              OrderCode := "-",
                                                                                              ForecatsQty :=0,
                                                                                              ForecatsRealQty :=nForecastQtyNew,
                                                                                              Unit := ObjOrder.UnitOfMeasureName());
            } 
          }
        }
        else
        {
          strMsg:="预测订单信息加载失败，请联系系统管理员！";
        }    
        }  
      }
    }
    onerror

 _Main/BL/Type_H_FunctionClass/StaticMethod_SM_OrderReverseOrAuthorize.qbl

@@ -42,7 +42,7 @@
        nNoHaveForecastQty:=0;//五预测数量
        // èŽ·å–预测数量（客户+SKU+月份 ç†è®ºæ˜¯æ²¡æœ‰ç‰©æ–™é¢„测）
        OrderForecast := select(Owner, H_OrderForecastRealQty , Obj, Obj.SKU() = SKU 
                                              and Obj.CustomID() = CustomerCode 
                                              and Obj.CustomCode() = CustomerCode 
                                              and Obj.Month().Format( "YM2") = Date::ActualDate().Format( "YM2"));
        if ( not isnull(OrderForecast))
        {
@@ -189,10 +189,9 @@
          {
            Owner.H_OrderForecastRealQty(relnew,ID := H_FunctionClass::SM_GenerateID( "OF"),SKU := SKU,
                                                                                            Month := Date::ActualDate(),
                                                                                            CustomID := CustomerCode,
                                                                                            CustomCode := CustomerCode,
                                                                                            CustomName := CustomName,
                                                                                            OrderCode := "-",
                                                                                            ForecatsQty :=0,
                                                                                            ForecastQty := 0,
                                                                                            ForecatsRealQty :=nForecastQtyNew,
                                                                                            Unit := Unit);
          } 

 _Main/BL/Type_H_FunctionClass/StaticMethod_UpdateOrderForecastRealQty.qbl

@@ -24,7 +24,7 @@
        for ( x := 1; x <= 10; x := x + 1 )
        {
            Owner.H_OrderForecastRealQty(relnew,ID := "AAAAA_"+ x.AsQUILL(),SKU := "OTN-01-ACC-00"+ x.AsQUILL() , Month := Date::ActualDate(),CustomName := "小米",
                                          CustomID := "XM0001",OrderCode:="OD0001",ForecatsQty:=1000,ForecatsRealQty:=1000, Unit := "PCS");
                                          CustomCode := "XM0001",ForecastQty := 1000,ForecatsRealQty:=1000, Unit := "PCS");
        }
      }
      //H_FunctionClass := Owner.H_FunctionClass(relnew,VCode_Material := VCode,UpdateTime_Material := Date::ActualDate());

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_CustomCode.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute CustomCode
{
  #keys: '3[414724.0.174571651][414724.0.174571650][414724.0.174571652]'
  Description: '客户ID，唯一建之一'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_CustomID.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_Department.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute Department
{
  #keys: '3[414724.0.174571661][414724.0.174571660][414724.0.174571662]'
  Description: '部门，没有价值，显示使用'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_ForecastQty.qbl

ÎļþÃû´Ó _Main/BL/Type_H_OrderForecastRealQty/Attribute_ForecatsQty.qbl ÐÞ¸Ä
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
Attribute ForecatsQty
Attribute ForecastQty
{
  #keys: '3[414724.0.46380358][414724.0.46380357][414724.0.46380359]'
  Description: '预测数量'

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_Month.qbl

@@ -3,6 +3,6 @@
Attribute Month
{
  #keys: '3[414724.0.46380308][414724.0.46380307][414724.0.46380309]'
  Description: '月份'
  Description: '月份，唯一键之一'
  ValueType: Date
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_OrderCode.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_SKU.qbl

@@ -3,6 +3,6 @@
Attribute SKU
{
  #keys: '3[414724.0.46380348][414724.0.46380347][414724.0.46380349]'
  Description: 'SKU编码'
  Description: 'SKU编码，唯一键之一'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_SKUName.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute SKUName
{
  #keys: '3[414724.0.174572228][414724.0.174572227][414724.0.174572229]'
  Description: 'SKU名称'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_StockingPointID.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute StockingPointID
{
  #keys: '3[414724.0.174571671][414724.0.174571670][414724.0.174571672]'
  Description: '库存点，没有价值，显示使用'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_Unit.qbl

@@ -3,6 +3,6 @@
Attribute Unit
{
  #keys: '3[414724.0.46380378][414724.0.46380377][414724.0.46380379]'
  Description: '单位'
  Description: '单位，没有价值，显示使用'
  ValueType: String
}

 _Main/BL/Type_H_OrderForecastRealQty/Attribute_VCode.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
#parent: #root
Attribute VCode
{
  #keys: '3[414724.0.174571641][414724.0.174571640][414724.0.174571642]'
  Description: '版本号，暂时不适用，默认-'
  ValueType: String
}

 _Main/BL/Type_MacroPlan/Method_MappingUnitData.qbl

@@ -42,12 +42,13 @@
                          infinite, 
                          unitofmeasurename );
    
    Unit::CreateOrUpdate( this, 
    supplyunit := Unit::CreateOrUpdate( this, 
                          "供应商", 
                          "供应商", 
                          "天马集团", 
                          infinite, 
                          unitofmeasurename );
    supplyunit.IsSupplier(true);
    
    Unit::CreateOrUpdate( this, 
                          "整车运输", 

 _Main/BL/Type_Operation/Method_GetHasValidOperationInputOutput.qbl

ÎļþÒÑɾ³ý

 _Main/BL/Type_Routing/Method_DoSanityCheckData.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: #root
Method DoSanityCheckData (
  output Strings feedback_o,
  output Strings sanitycheckfeedback_o
) declarative remote #extension
{
  TextBody:
  [*
    // Adhi Feb-10-2016 (created)
    
    isvalid := true;
    
    isvalid := this.GetHasValidInput( feedback_o, sanitycheckfeedback_o ) and isvalid;
    
    isvalid := this.GetHasTianmaNonSupplierOperationWithNoInput( feedback_o, sanitycheckfeedback_o ) and isvalid;
    
    return isvalid;
  *]
}

 _Main/BL/Type_Routing/Method_GetHasTianmaNonSupplierOperationWithNoInput.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
Quintiq file version 2.0
#parent: #root
Method GetHasTianmaNonSupplierOperationWithNoInput (
  output Strings feedback_o,
  output Strings sanitycheckfeedback_o
) declarative remote as Boolean
{
  TextBody:
  [*
    // Tianma change 20230925: If the unit is not a supplier, raise a data issue if there's no input
    value := forall( this, RoutingStep.Operation, operation,
                     guard( operation.Unit().IsSupplier(), false )
                     or operation.OperationInput( relsize ) > 0 );
    
    if( not value )
    {
      // Add instance text
      routingname := MacroPlan::GetSubstituteName( this.Name() );
      instance := Translations::MP_Routing_Instance( routingname );
      feedback := SanityCheckMessage::GetFormattedMessage( instance,
                                                           "非供应商操作没有投入料。" );
      feedback_o.Add( feedback );
      sanitycheckfeedback_o.Add( SanityCheckCategoryLevel::GetSanityCheckCategoryDataWarning() );
    }
    
    return value;
  *]
}

 _Main/BL/Type_Unit/StaticMethod_CreateOrUpdate.qbl

@@ -7,7 +7,7 @@
  String parentunitid,
  String capacitytype,
  String unitofmeasurename
)
) as Unit
{
  TextBody:
  [*
@@ -21,7 +21,7 @@
    unit := Unit::FindById( owner, id );
    
    if( id="天马集团" and isnull( unit ) ){
      owner.Unit( relnew, 
      unit := owner.Unit( relnew, 
                 ID := id, 
                 Name := name, 
                 UnitOfMeasureName := unitofmeasurename, 
@@ -31,7 +31,7 @@
                 CapacityType := capacitytype );
      }else{
      if( isnull( unit ) ){
        owner.Unit( relnew, ID := id, 
        unit := owner.Unit( relnew, ID := id, 
                   Name := name, 
                   ParentUnitID := parentunitid, 
                   CapacityType := capacitytype, 
@@ -46,5 +46,7 @@
          unit.UnitOfMeasureName( unitofmeasurename );
          }
        }
    
    return unit;
  *]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_ListSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@
Quintiq file version 2.0
Component ListSalesDemands #extension
{
  Children:
  [
    Component DataSetLevelSalesDemands #extension
    {
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPoint_MP.ID","title":"Stocking point","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"StockingPoint_MP.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegment_MP.Name","title":"Sales segment","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"SalesSegment_MP.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerName","title":"Customer name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerID","title":"Customer ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"Order ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderLineID","title":"Order line ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderLineID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"Order date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product_MP.ID","title":"Product","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"Product_MP.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasure_MP.Name","title":"UoM","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"UnitOfMeasure_MP.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FulfilledQuantity","title":"Fulfilled","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"FulfilledQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeChart","columnid":"Fulfillment","title":"Fulfillment","subtotals":"","tooltip":"","width":-1,"display":"shown","type":"stackbar","relative":true,"attributes":[{"name":"Unfulfilled demand","color":"rgb(232,123,0)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Unfulfilled demand","title":"Unfulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"maxvalue( object.Quantity() - object.FulfilledQuantity(), 0.0).Round( 2)"}},{"name":"Fulfilled demand","color":"rgb(87,184,71)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Fulfilled demand","title":"Fulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.FulfilledQuantity().Round( 2)"}}]}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsFirmed","title":"Is firmed","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsFirmed"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsEligibleForNetting","title":"Is eligible for netting","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsEligibleForNetting"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Price","title":"Price","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Price"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PriceUoM","title":"PriceUoM","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"PriceUoM"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderTag","title":"订单标签","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderTag"}}]'
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelAllSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
Component PanelAllSalesDemands #extension
{
  Children:
  [
    #child: ListSalesDemands
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/Component_PanelSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
Quintiq file version 2.0
Component PanelSalesDemands #extension
{
  Children:
  [
    #child: PanelAllSalesDemands
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders/_ROOT_Component_FormCustomerOrders.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,10 @@
Quintiq file version 2.0
#root
#parent: LibMacroPlannerWebUI
OrphanComponent FormCustomerOrders #extension
{
  Children:
  [
    #child: PanelSalesDemands
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Component_ListSDIP.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
Component ListSDIP
{
  #keys: '[134266.1.1970512356]'
  BaseType: 'ListSDIP'
  IsDerived: true
  Children:
  [
    Component DataSetLevelSDIP
    {
      #keys: '[134266.1.1970512358]'
      BaseType: 'DataSetLevelSDIP'
      IsDerived: true
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsRestricted","title":"ImgIsRestricted","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsRestricted"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegmentName","title":"Sales segment","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"SalesSegmentName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"Product","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPointID","title":"Stocking point","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"StockingPointID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"Start","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"EndDate","title":"End","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"EndDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"MasterSalesDemand.UnitOfMeasureName","title":"UoM","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"MasterSalesDemand.UnitOfMeasureName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"QuantityInSalesDemandUOM","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"QuantityInSalesDemandUOM"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FulfilledQuantityInSalesDemandUOM","title":"Fulfilled","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"FulfilledQuantityInSalesDemandUOM"}},{"attribute":{"classtype":"WebApiDefinitionAttributeChart","columnid":"Fulfillment","title":"Fulfillment","subtotals":"","tooltip":"","width":-1,"display":"shown","type":"stackbar","relative":true,"attributes":[{"name":"Fulfilled demand","color":"rgb(87,184,71)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Fulfilled demand","title":"Fulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.FulfilledQuantity().Round( 2)"}},{"name":"Unfulfilled demand","color":"rgb(232,123,0)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Unfulfilled demand","title":"Unfulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"maxvalue( object.Quantity()-object.FulfilledQuantity(),0.0)"}}]}}]'
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Component_ListSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
Quintiq file version 2.0
Component ListSalesDemands
{
  #keys: '[134266.1.1970507083]'
  BaseType: 'ListSalesDemands'
  IsDerived: true
  Children:
  [
    Component DataExtractorSalesDemands
    {
      #keys: '[134266.1.1970507084]'
      BaseType: 'DataExtractorSalesDemands'
      IsDerived: true
      Properties:
      [
        Transformation: 'Elements.astype(CustomerOrder)'
      ]
    }
    Component DataSetLevelSalesDemands
    {
      #keys: '[134266.1.1970507085]'
      BaseType: 'DataSetLevelSalesDemands'
      IsDerived: true
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeAllConstraint","columnid":"All constraints","title":"All constraints","subtotals":"","tooltip":"","width":1,"display":"shown"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockingPoint_MP.ID","title":"Stocking point","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"StockingPoint_MP.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SalesSegment_MP.Name","title":"Sales segment","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"SalesSegment_MP.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerName","title":"Customer name","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomerID","title":"Customer ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomerID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderID","title":"Order ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderLineID","title":"Order line ID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderLineID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StartDate","title":"Order date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StartDate"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Product_MP.ID","title":"Product","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"Product_MP.ID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"UnitOfMeasure_MP.Name","title":"UoM","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"UnitOfMeasure_MP.Name"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"FulfilledQuantity","title":"Fulfilled","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"FulfilledQuantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeChart","columnid":"Fulfillment","title":"Fulfillment","subtotals":"","tooltip":"","width":-1,"display":"shown","type":"stackbar","relative":true,"attributes":[{"name":"Unfulfilled demand","color":"rgb(232,123,0)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Unfulfilled demand","title":"Unfulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"maxvalue( object.Quantity() - object.FulfilledQuantity(), 0.0).Round( 2)"}},{"name":"Fulfilled demand","color":"rgb(87,184,71)","expression":{"classtype":"WebApiDefinitionAttributeExpression","columnid":"Fulfilled demand","title":"Fulfilled demand","subtotals":"","tooltip":"","width":-1,"display":"shown","expressionbody":"object.FulfilledQuantity().Round( 2)"}}]}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsFirmed","title":"Is firmed","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsFirmed"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"IsEligibleForNetting","title":"Is eligible for netting","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"IsEligibleForNetting"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Price","title":"Price","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Price"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PriceUoM","title":"PriceUoM","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"PriceUoM"}}]'
      ]
    }
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Component_PanelAllSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,11 @@
Quintiq file version 2.0
Component PanelAllSalesDemands
{
  #keys: '[134266.1.1970497658]'
  BaseType: 'PanelAllSalesDemands'
  IsDerived: true
  Children:
  [
    #child: ListSalesDemands
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Component_PanelSDIP.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,15 @@
Quintiq file version 2.0
Component PanelSDIP
{
  #keys: '[134266.1.1970511019]'
  BaseType: 'PanelSDIP'
  IsDerived: true
  Children:
  [
    #child: ListSDIP
  ]
  Properties:
  [
    Title: 'Customer orders at planning level'
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Component_PanelSalesDemands.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
Quintiq file version 2.0
Component PanelSalesDemands
{
  #keys: '[134266.1.1970506995]'
  BaseType: 'PanelSalesDemands'
  IsDerived: true
  Children:
  [
    #child: PanelSDIP
    #child: PanelAllSalesDemands
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Response_ListSalesDemands_MenuCopy_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: ListSalesDemands
Response OnClick () inherited id:Response_ListSalesDemands_MenuCopy_OnClick
{
  #keys: '[136682.1.799924425]'
  BaseType: 'Response_ListSalesDemands_MenuCopy_OnClick'
  DefinitionID: 'Responsedef_ListSalesDemands_WebMenu_OnClick'
  Initiator: 'MenuCopy'
  QuillAction
  {
    Body:
    [*
      // Copy sales demand
      data := selectset( selection, Elements.astype( CustomerOrder ), co, true, true );
      CustomerOrder::Copy( data );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Response_ListSalesDemands_MenuCreate_OnClick#715.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
Quintiq file version 2.0
#parent: ListSalesDemands
Response OnClick () inherited id:Response_ListSalesDemands_MenuCreate_OnClick_715
{
  #keys: '[136682.1.803262814]'
  BaseType: 'Response_ListSalesDemands_MenuCreate_OnClick_715'
  DefinitionID: 'Responsedef_ListSalesDemands_WebMenu_OnClick'
  Initiator: 'MenuCreate'
  QuillAction
  {
    Body:
    [*
      //Create new sales demand
      dlg := construct( DialogCreateEditCustomerOrder );
      dlg.New();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/Response_ListSalesDemands_MenuEdit_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
Quintiq file version 2.0
#parent: ListSalesDemands
Response OnClick () inherited id:Response_ListSalesDemands_MenuEdit_OnClick
{
  #keys: '[136682.1.803135245]'
  BaseType: 'Response_ListSalesDemands_MenuEdit_OnClick'
  DefinitionID: 'Responsedef_ListSalesDemands_WebMenu_OnClick'
  Initiator: 'MenuEdit'
  QuillAction
  {
    Body:
    [*
      //Edit sales demand
      dlg := construct( DialogCreateEditCustomerOrder );
      
      data := selectset( selection, Elements.astype( CustomerOrder ), f, true, true );
      dlg.Edit( data );
    *]
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FormCustomerOrders226/_ROOT_Component_FormCustomerOrders226.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
Quintiq file version 2.0
#root
#parent: MacroPlannerWebApp
OrphanComponent FormCustomerOrders226
{
  #keys: '[414724.0.179160850]'
  Accessibility: 'Extensible'
  BaseType: 'FormSalesDemands'
  Children:
  [
    #child: PanelSalesDemands
  ]
  Properties:
  [
    Image: 'SALES_QUOTATION'
    Title: 'Customer orders'
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def

@@ -21,9 +21,12 @@
        {
          JInfo := JSON::Parse( SelectItem.ValueJsonString());
          lb_SUK_FAACM.Text(JInfo.Get( "ParentSKU").GetString());
          lb_SKUName_FAACM.Text(JInfo.Get( "ParentSKUName").GetString());
          lb_MaterialCode_FAACM.Text(JInfo.Get( "SKU").GetString());
          lb_MaterialName.Text(JInfo.Get( "MaterialName").GetString());
          lb_Unit_FAACM.Text(JInfo.Get( "Unit").GetString());
          lb_Operator_FAACM.Text(ApplicationMacroPlanner.GetUserName());
          lb_MaterialType_FAACM.Text(JInfo.Get( "MaterialType").GetString());
          txt_CustomID_FAACM.Text(JInfo.Get( "CustomCode").GetString());
          txt_CustomName_FAACM.Text(JInfo.Get( "CustomName").GetString());
        }

 _Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def

@@ -13,19 +13,33 @@
    [*
      if( not isnull( selection))
      {
        // é¢„测订单基本信息
        CustomCode:="";
        CustomName:="";
        SKUName:="";
        SValueJsonString:="";
        // èŽ·å–客户名称和客户ID
        if(txtSaveForecastData_FM.Text().Length()>0)
        {
           jForecast := JSON::Parse( txtSaveForecastData_FM.Text());
           CustomCode := jForecast.Get( "CustomCode").GetString();
           CustomName := jForecast.Get( "CustomName").GetString();
           SKUName := jForecast.Get( "SKUName").GetString();
        }
        
        if(selection.MaterialType()="半成品")
        {
          OrderCode:="";
          ForecastID:="";
          if( txtSaveForecastData_FM.Text().Length()>0)
          {
            JForecast := JSON::Parse( txtSaveForecastData_FM.Text());
            OrderCode := JForecast.Get( "OrderCode").GetString();
            JForecast := JSON::Parse(txtSaveForecastData_FM.Text());
            ForecastID := JForecast.Get( "ForecastID").GetString();
          }
         jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.NeedQty(), OrderCode,"-",selection.NeedDate());
         jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.NeedQty(), ForecastID,"-",selection.NeedDate(),GlobalOTDTable);
          if(jResult.Get( "Status").GetBoolean())
          {
                de_dh_FM_ProductMP.FixedFilter( "object.ParentSKU() = " +  selection.SKU().AsQUILL()
                                                + " and object.ForecastID() = " + OrderCode.AsQUILL()
                                                + " and object.ForecastID() = " + ForecastID.AsQUILL()
                                                );
          }
          else
@@ -35,7 +49,28 @@
        }
        else
        {
            // å¼¹å‡ºç‰©æ–™åç­¾æŽˆæƒ
          SelectItem :=  select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmMaterial" and Obj.ItemKey()="ListSelect");
          if(not isnull(selection))
          {
            SValueJsonString:= JSON::Object().Add( "SKU",selection.SKU())
                        .Add( "MaterialName",selection.MaterialName())
                        .Add( "MaterialType",selection.MaterialType())
                        .Add( "OrgCode",selection.OrgCode())
                        .Add( "Unit",selection.Unit())
                        .Add( "CustomCode",CustomCode)
                        .Add( "ParentSKU",lb_SUK_FM.Text())
                        .Add( "ParentSKUName",SKUName)
                        .Add( "CustomName",CustomName).Build().AsString();
          }
          if(isnull( SelectItem))
          {
            MacroPlan.H_MessagePassing(relnew,FKey := "FrmMaterial",ItemKey := "ListSelect", ValueJsonString:=SValueJsonString);
          }
          else
          {
            SelectItem.ValueJsonString( SValueJsonString);
          }
          Application.OpenForm( "FrmAuthorizeAndCountersign_Material","modal");
        }
      }
    *]

 _Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_OnCreated.def

@@ -17,11 +17,11 @@
      {
        if( SelectItem.ValueJsonString().Length()>0)
        {
          txtSaveForecastData_FM.Text(  SelectItem.ValueJsonString());
          JSelect := JSON::Parse( SelectItem.ValueJsonString());
          txtSaveForecastData_FM.Text(SelectItem.ValueJsonString());
          JSelect := JSON::Parse(SelectItem.ValueJsonString());
          lb_SUK_FM.Text(JSelect.Get( "SKU").GetString());
          de_dh_FM_ProductMP.FixedFilter( "object.ParentSKU() = " + JSelect.Get( "SKU").GetString().AsQUILL()
                                          + " and object.ForecastID() = " + JSelect.Get( "OrderCode").GetString().AsQUILL()
                                          + " and object.ForecastID() = " + JSelect.Get( "ForecastID").GetString().AsQUILL()
                                          );
        }
      }

 _Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick#975.def

@@ -20,12 +20,14 @@
      CustomName:="";
      SValue:="";
      SValueJsonString:="";
      SKUName:="";
      // èŽ·å–客户名称和客户ID
      if(txtSaveForecastData_FM.Text().Length()>0)
      {
         jForecast := JSON::Parse( txtSaveForecastData_FM.Text());
         CustomCode := jForecast.Get( "CustomCode").GetString();
         CustomName := jForecast.Get( "CustomName").GetString();
         SKUName := jForecast.Get( "SKUName").GetString();
      }
      if(not isnull(selection))
      {
@@ -36,6 +38,7 @@
                    .Add( "Unit",selection.Unit())
                    .Add( "CustomCode",CustomCode)
                    .Add( "ParentSKU",lb_SUK_FM.Text())
                    .Add( "ParentSKUName",SKUName)
                    .Add( "CustomName",CustomName).Build().AsString();
      }
      if( isnull( SelectItem))

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def

@@ -11,9 +11,10 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '订单新增反签/授权'
        Label: '订单新增反签/授权'
        Taborder: 1
        Taborder: 0
      ]
      ResponseDefinitions:
      [
@@ -39,9 +40,10 @@
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '原料新增反签/授权'
        Label: '原料新增反签/授权'
        Taborder: 2
        Taborder: 1
      ]
      ResponseDefinitions:
      [
@@ -61,30 +63,42 @@
        }
      ]
    }
    Component btn_InitialData778
    {
      #keys: '[414724.0.115504406]'
      BaseType: 'WebButton'
      Properties:
      [
        Description: '加载数据（假的，后续需要对接数据）'
        Label: '加载预测订单数据'
        Taborder: 0
        Visible: false
      ]
    }
    Component btn_OrderH_FOF
    {
      #keys: '[414724.0.165490408]'
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: 'ERO订单冲减'
        Image: 'AMMUNITION_BOX_CLOSED'
        Label: 'ERP订单冲减'
        Taborder: 2
      ]
    }
    Component txt_QueryContent_FOF
    {
      #keys: '[414724.0.172390935]'
      BaseType: 'WebEditField'
      Properties:
      [
        PlaceHolder: '模糊搜索'
        Taborder: 3
      ]
    }
    Component btn_Query_FOF
    {
      #keys: '[414724.0.172390951]'
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '查询'
        Image: 'VIEW'
        Label: '查询'
        Taborder: 4
      ]
    }
  ]
  Properties:
  [

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel383.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel647.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel849.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_liH_Forecast.def

@@ -11,8 +11,8 @@
      BaseType: 'WebDataExtractor'
      Properties:
      [
        DataType: 'structured[H_Forecast]'
        Source: 'dh_FOF_H_Forecast'
        DataType: 'structured[H_OrderForecastRealQty]'
        Source: 'dh_FOF_H_OrderForecastRealQty'
        Taborder: 0
        Transformation: 'Elements'
      ]
@@ -28,7 +28,7 @@
      ]
      Properties:
      [
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"OrderCode","title":"订单编号","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"OrderCode"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SKU","title":"SKU编码","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SKU"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecastQty","title":"预测数量","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ForecastQty"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"NeedTime","title":"需求时间","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"NeedTime"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Util","title":"单位","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Util"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomName","title":"客户名称","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Department","title":"销售部门","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Department"}}]'
        Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Month","title":"月份","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Month"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"CustomName","title":"客户名称","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"CustomName"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"SKU","title":"SKU编号","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"SKU"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecatsQty","title":"预测数量","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ForecatsQty"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ForecatsRealQty","title":"纯预测数量","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ForecatsRealQty"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Unit","title":"单位","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Unit"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Department","title":"部门","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Department"}}]'
        ContextMenu: 'listContextMenu367'
        Taborder: 2
      ]
@@ -36,6 +36,6 @@
  ]
  Properties:
  [
    Taborder: 7
    Taborder: 3
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_listActionBarPage963.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_listContextMenu687.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_list_ForecastView_FOF#670.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_OnCreated.def

@@ -9,13 +9,15 @@
  {
    Body:
    [*
      // åˆå§‹åŒ–查询参数月份
      ds_Month_FOF.Date(Date::ActualDate());
      // åˆå§‹åŒ–预测数据
      JResult := H_FunctionClass::SM_InitialForcastData( MacroPlan);
      JResult := H_FunctionClass::SM_InitialForcastDataEx( MacroPlan,true,"-");
      if(not JResult.Get( "Status").GetBoolean())
      {
          WebMessageBox::Warning( JResult.Get( "Msg").GetString());
        WebMessageBox::Warning( JResult.Get( "Msg").GetString());
      }
      else
      {
        WebMessageBox::Information( JResult.Get( "Msg").GetString());
      }
    *]
    GroupServerCalls: false

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def

@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: Panel351/btn_Add_Material_FOF503
Response OnClick (
  H_Forecast selection
  H_OrderForecastRealQty selection
) id:Response_Panel351_btn_Add_Material_FOF503_OnClick_222
{
  #keys: '[414724.0.145178766]'
@@ -17,28 +17,28 @@
        if( isnull( SelectItem))
        {
           MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                       Value := selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName(),
                                       ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                         .Add( "Util",selection.Util())
                                                                         .Add( "CustomCode",selection.CustomCode())
                                                                         .Add( "CustomName",selection.CustomName())
                                                                         .Add( "ForecastQty",selection.ForecastQty())
                                                                         .Add( "NeedTime",selection.NeedTime().AsQUILL())
                                                                         .Add( "OrderCode",selection.OrderCode()).Build().AsString());
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "CustomName",selection.CustomName())
                                                                       .Add( "ForecastQty",selection.ForecastQty())
                                                                       .Add( "ForecastID",selection.ID())
                                                                       .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
        }
        else
        {
          SelectItem.Value(selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName());
          SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                   .Add( "Util",selection.Util())
                                   .Add( "CustomCode",selection.CustomCode())
                                   .Add( "CustomName",selection.CustomName())
                                   .Add( "ForecastQty",selection.ForecastQty())
                                   .Add( "NeedTime",selection.NeedTime().AsQUILL())
                                   .Add( "OrderCode",selection.OrderCode()).Build().AsString());
                                                   .Add( "SKUName",selection.SKUName())
                                                   .Add( "Util",selection.Unit())
                                                   .Add( "CustomCode",selection.CustomCode())
                                                   .Add( "CustomName",selection.CustomName())
                                                   .Add( "ForecastQty",selection.ForecastQty())
                                                   .Add( "ForecastID",selection.ID())
                                                   .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
        }
        
        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.OrderCode(),"-",selection.NeedTime());
        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable);
        if(jResult.Get( "Status").GetBoolean())
        {
            Application.OpenForm( "FrmMaterial","popout");

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick#880.def

@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: Panel351/btn_Add_Order_FOF449
Response OnClick (
  H_Forecast selection
  H_OrderForecastRealQty selection
) id:Response_Panel351_btn_Add_Order_FOF449_OnClick_880
{
  #keys: '[414724.0.141244111]'
@@ -16,20 +16,21 @@
        SelectItem :=  select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmOrderForecast" and Obj.ItemKey()="ListSelect");
        if( isnull( SelectItem))
        {
          
           MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                       Value := selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName(),
                                       ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                         .Add( "Util",selection.Util())
                                                                         .Add( "CustomCode",selection.CustomCode())
                                                                         .Add( "CustomName",selection.CustomName()).Build().AsString());
                                      ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "CustomName",selection.CustomName()).Build().AsString());
        }
        else
        {
          SelectItem.Value(selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName());
          SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                   .Add( "Util",selection.Util())
                                   .Add( "CustomCode",selection.CustomCode())
                                   .Add( "CustomName",selection.CustomName()).Build().AsString());
                                                   .Add( "Util",selection.Unit())
                                                   .Add( "CustomCode",selection.CustomCode())
                                                   .Add( "SKUName",selection.SKUName())
                                                   .Add( "CustomName",selection.CustomName()).Build().AsString());
        }
        Application.OpenForm( "FrmAuthorizeAndCountersign_Order","modal");  
      }

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_InitialData778_OnClick#971.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Query_FOF_OnClick.def

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
Quintiq file version 2.0
#parent: Panel351/btn_Query_FOF
Response OnClick () id:Response_Panel351_btn_Query_FOF_OnClick
{
  #keys: '[414724.0.172390950]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebButton_OnClick'
  QuillAction
  {
    Body:
    [*
      de_dh_FOF_H_Foecast.FixedFilter( "object.SKU().LikeUserLocale( " + txt_QueryContent_FOF.Text().AsQUILL() + " )"
                                                   + " or " + "object.CustomName().LikeUserLocale( " + txt_QueryContent_FOF.Text().AsQUILL() + " )"  
                                                   + " or " + "object.Unit().LikeUserLocale( " + txt_QueryContent_FOF.Text().AsQUILL() + " )" 
                                                   + " or " + "object.Department().LikeUserLocale( " + txt_QueryContent_FOF.Text().AsQUILL() + " )" 
                                                   + " or " + "object.StockingPointID().LikeUserLocale( " + txt_QueryContent_FOF.Text().AsQUILL() + " )"
                                      );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel383_btn_Query_FOF_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel647_btn_Add_Material_FOF_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel647_btn_Add_Order_FOF_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel647_btn_InitialData_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def

@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: liH_Forecast
Response OnDoubleClick (
  H_Forecast selection
  H_OrderForecastRealQty selection
) id:Response_liH_Forecast_OnDoubleClick
{
  #keys: '[414724.0.111761136]'
@@ -15,28 +15,28 @@
      if( isnull( SelectItem))
      {
         MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                     Value := selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName(),
                                     ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                       .Add( "Util",selection.Util())
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "CustomName",selection.CustomName())
                                                                       .Add( "ForecastQty",selection.ForecastQty())
                                                                       .Add( "NeedTime",selection.NeedTime().AsQUILL())
                                                                       .Add( "OrderCode",selection.OrderCode()).Build().AsString());
                                                                       .Add( "ForecastID",selection.ID())
                                                                       .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
      }
      else
      {
        SelectItem.Value(selection.SKU()+";"+selection.Util()+";"+selection.CustomCode()+";"+selection.CustomName());
        SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                 .Add( "Util",selection.Util())
                                 .Add( "CustomCode",selection.CustomCode())
                                 .Add( "CustomName",selection.CustomName())
                                 .Add( "ForecastQty",selection.ForecastQty())
                                 .Add( "NeedTime",selection.NeedTime().AsQUILL())
                                 .Add( "OrderCode",selection.OrderCode()).Build().AsString());
                                                 .Add( "SKUName",selection.SKUName())
                                                 .Add( "Util",selection.Unit())
                                                 .Add( "CustomCode",selection.CustomCode())
                                                 .Add( "CustomName",selection.CustomName())
                                                 .Add( "ForecastQty",selection.ForecastQty())
                                                 .Add( "ForecastID",selection.ID())
                                                 .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
      }
      
      jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.OrderCode(),"-",selection.NeedTime());
      jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable );
      if(jResult.Get( "Status").GetBoolean())
      {
        Application.OpenForm( "FrmMaterial","popout");

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_list_ForecastView_FOF_OnDoubleClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_list_ForecastView_FOF_OnSelectionChanged.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/_ROOT_Component_FrmOrderForecast.def

@@ -7,100 +7,12 @@
  BaseType: 'WebForm'
  Children:
  [
    #child: Panel849
    #child: list_ForecastView_FOF
    Component dh_FOF_Data
    {
      #keys: '[414724.0.86151860]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[SalesDemandBase]*'
      Children:
      [
        Component de_dh_FOF_Data
        {
          #keys: '[414724.0.86151875]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[SalesDemandBase]'
            Source: 'dh_FOF_ChildrenData'
            Taborder: 0
            Transformation: 'Elements'
          ]
        }
        Component DataExtractor819
        {
          #keys: '[414724.0.107645127]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 1
            Transformation: 'SalesDemand'
          ]
        }
      ]
      Properties:
      [
        Taborder: 4
      ]
    }
    #child: Panel961
    Component dh_FOF_ChildrenData
    {
      #keys: '[414724.0.106541535]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[SalesDemandBase]*'
      Children:
      [
        Component de_FOF_ChildrenData_0
        {
          #keys: '[414724.0.106541577]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[Product_MP]'
            Source: 'ApplicationMacroPlanner.DataHolderProduct'
            Taborder: 0
            Transformation: 'Elements.SalesDemand'
          ]
        }
        Component de_FOF_ChildrenData_1
        {
          #keys: '[414724.0.106541594]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[StockingPoint_MP]'
            Source: 'ApplicationMacroPlanner.DataHolderStockingPoint'
            Taborder: 1
            Transformation: 'Elements.SalesDemand'
          ]
        }
        Component de_FOF_ChildrenData_2
        {
          #keys: '[414724.0.106541611]'
          BaseType: 'WebDataExtractor'
          Properties:
          [
            DataType: 'structured[SalesSegment_MP]'
            Source: 'ApplicationMacroPlanner.DataHolderSalesSegment'
            Taborder: 2
            Transformation: 'Elements.SalesDemand'
          ]
        }
      ]
      Properties:
      [
        Taborder: 3
      ]
    }
    Component dh_FOF_H_Forecast
    Component dh_FOF_H_OrderForecastRealQty
    {
      #keys: '[414724.0.109053093]'
      BaseType: 'WebDataHolder'
      Databinding: 'structured[H_Forecast]*'
      Databinding: 'structured[H_OrderForecastRealQty]*'
      Children:
      [
        Component de_dh_FOF_H_Foecast
@@ -112,13 +24,13 @@
            DataType: 'MacroPlan'
            Source: 'MacroPlan'
            Taborder: 0
            Transformation: 'H_Forecast'
            Transformation: 'H_OrderForecastRealQty'
          ]
        }
      ]
      Properties:
      [
        Taborder: 6
        Taborder: 2
      ]
    }
    #child: liH_Forecast

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_List212.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listActionBarPage441.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Component_listContextMenu182.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_Button593_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/Response_ButtonERP¶©µ¥_OnClick.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Frm_TEST/_ROOT_Component_Frm_TEST.def

ÎļþÒÑɾ³ý