yunchai
2023-09-25 b657c5fd801862617d956d37bed963cc039ef831
20230925Mapping数据换数据源
已修改11个文件
已删除2个文件
233 ■■■■ 文件已修改
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetBOMBySKU.qbl 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetMaterialData.qbl 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetProductInfo#1.qbl 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_InitialForcastData.qbl 111 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_InitialForcastDataEx.qbl 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmAuthorizeAndCountersign_Material/Response_OnCreated.def 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_List832_OnDoubleClick.def 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmMaterial/Response_Panel418_btn_Add_FM_OnClick#975.def 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Component_Panel351.def 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Order_FOF449_OnClick#880.def 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_InitialData778_OnClick#971.def 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
_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();
@@ -59,7 +60,7 @@
              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());
_Main/BL/Type_H_FunctionClass/StaticMethod_SM_GetProductInfo#1.qbl
@@ -3,17 +3,17 @@
StaticMethod SM_GetProductInfo (
  MacroPlan Owner,
  String SKU
) as MappingProduct
) as Product_MP
{
  Description: '根据SKU获取物料信息'
  TextBody:
  [*
    // æ ¹æ®SKU获取物料信息
    // æ³¨æ„ï¼šç‰©æ–™ç±»åž‹å– ParentID,
    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
@@ -43,12 +43,15 @@
      idx:=0;
      RQty:=0;
      ObjOrderRealQty:=null( H_OrderForecastRealQty,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)
@@ -56,6 +59,14 @@
          DepartMent:=Obj.SalesSegmentName().SubString( 0,idx);
          CustomName := Obj.SalesSegmentName().SubString( idx+1, Obj.SalesSegmentName().Length() - (idx+1));
        }
        // èŽ·å–ç‰©æ–™ä¿¡æ¯
        ObjMaterial := H_FunctionClass::SM_GetProductInfo( Owner,Obj.ProductID());
        if(not isnull( ObjMaterial))
        {
          SKUName := ObjMaterial.Name();
        }
         // æ›´æ–°é¢„测信息,非新数据更新信息。
         ObjOrderRealQty := select( Owner,H_OrderForecastRealQty,ObjO,ObjO.CustomCode()=CustomName and ObjO.SKU()=Obj.ProductID() 
                                    and ObjO.Month().StartOfMonth() = Obj.EndDate().StartOfMonth() )
@@ -64,7 +75,7 @@
           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);
                                         ,Department := DepartMent,VCode := VersionCode,SKUName := SKUName);
         }
         else
         {
_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
@@ -16,6 +16,7 @@
        // é¢„测订单基本信息
        CustomCode:="";
        CustomName:="";
        SKUName:="";
        SValueJsonString:="";
        // èŽ·å–å®¢æˆ·åç§°å’Œå®¢æˆ·ID
        if(txtSaveForecastData_FM.Text().Length()>0)
@@ -23,6 +24,7 @@
           jForecast := JSON::Parse( txtSaveForecastData_FM.Text());
           CustomCode := jForecast.Get( "CustomCode").GetString();
           CustomName := jForecast.Get( "CustomName").GetString();
           SKUName := jForecast.Get( "SKUName").GetString();
        }
        
        if(selection.MaterialType()="半成品")
@@ -33,7 +35,7 @@
            JForecast := JSON::Parse(txtSaveForecastData_FM.Text());
            ForecastID := JForecast.Get( "ForecastID").GetString();
          }
         jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.NeedQty(), ForecastID,"-",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()
@@ -57,6 +59,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_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
@@ -14,7 +14,7 @@
        ButtonSize: 'compact'
        Description: '订单新增反签/授权'
        Label: '订单新增反签/授权'
        Taborder: 1
        Taborder: 0
      ]
      ResponseDefinitions:
      [
@@ -43,7 +43,7 @@
        ButtonSize: 'compact'
        Description: '原料新增反签/授权'
        Label: '原料新增反签/授权'
        Taborder: 2
        Taborder: 1
      ]
      ResponseDefinitions:
      [
@@ -63,19 +63,6 @@
        }
      ]
    }
    Component btn_InitialData778
    {
      #keys: '[414724.0.115504406]'
      BaseType: 'WebButton'
      Properties:
      [
        ButtonSize: 'compact'
        Description: '加载数据(假的,后续需要对接数据)'
        Label: '加载预测订单数据'
        Taborder: 0
        Visible: false
      ]
    }
    Component btn_OrderH_FOF
    {
      #keys: '[414724.0.165490408]'
@@ -86,7 +73,7 @@
        Description: 'ERO订单冲减'
        Image: 'AMMUNITION_BOX_CLOSED'
        Label: 'ERP订单冲减'
        Taborder: 3
        Taborder: 2
      ]
    }
    Component txt_QueryContent_FOF
@@ -96,7 +83,7 @@
      Properties:
      [
        PlaceHolder: '模糊搜索'
        Taborder: 4
        Taborder: 3
      ]
    }
    Component btn_Query_FOF
@@ -109,7 +96,7 @@
        Description: '查询'
        Image: 'VIEW'
        Label: '查询'
        Taborder: 5
        Taborder: 4
      ]
    }
  ]
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_Add_Material_FOF503_OnClick#222.def
@@ -18,6 +18,7 @@
        {
           MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                       ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "CustomName",selection.CustomName())
@@ -28,6 +29,7 @@
        else
        {
          SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                                   .Add( "SKUName",selection.SKUName())
                                                   .Add( "Util",selection.Unit())
                                                   .Add( "CustomCode",selection.CustomCode())
                                                   .Add( "CustomName",selection.CustomName())
@@ -36,7 +38,7 @@
                                                   .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
        }
        
        jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month());
        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
@@ -16,10 +16,12 @@
        SelectItem :=  select( MacroPlan,H_MessagePassing,Obj,Obj.FKey()="FrmOrderForecast" and Obj.ItemKey()="ListSelect");
        if( isnull( SelectItem))
        {
           MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                      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
@@ -27,6 +29,7 @@
          SelectItem.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());
        }
        Application.OpenForm( "FrmAuthorizeAndCountersign_Order","modal");  
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_Panel351_btn_InitialData778_OnClick#971.def
ÎļþÒÑɾ³ý
_Main/UI/MacroPlannerWebApp/Component_FrmOrderForecast/Response_liH_Forecast_OnDoubleClick.def
@@ -16,6 +16,7 @@
      {
         MacroPlan.H_MessagePassing(relnew,FKey :="FrmOrderForecast",ItemKey := "ListSelect",
                                     ValueJsonString := JSON::Object().Add( "SKU",selection.SKU())
                                                                       .Add( "SKUName",selection.SKUName())
                                                                       .Add( "Util",selection.Unit())
                                                                       .Add( "CustomCode",selection.CustomCode())
                                                                       .Add( "CustomName",selection.CustomName())
@@ -26,6 +27,7 @@
      else
      {
        SelectItem.ValueJsonString(JSON::Object().Add( "SKU",selection.SKU())
                                                 .Add( "SKUName",selection.SKUName())
                                                 .Add( "Util",selection.Unit())
                                                 .Add( "CustomCode",selection.CustomCode())
                                                 .Add( "CustomName",selection.CustomName())
@@ -34,7 +36,7 @@
                                                 .Add( "NeedTime",selection.Month().AsQUILL()).Build().AsString());
      }
      
      jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month());
      jResult := H_FunctionClass::SM_GetMaterialData( MacroPlan,selection.SKU(),selection.ForecastQty(),selection.ID(),"-",selection.Month(),GlobalOTDTable );
      if(jResult.Get( "Status").GetBoolean())
      {
        Application.OpenForm( "FrmMaterial","popout");