Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-26 830461b340837471a8fff6eabc7145f8d544b4ad

Merge branch 'dev' into dev_yy

 _Main/BL/Type_PRData/StaticMethod_ExportTheFileStream.qbl

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
Quintiq file version 2.0
#parent: #root
StaticMethod ExportTheFileStream (
  PRDatas toExportList
) as BinaryValue
{
  TextBody:
  [*
    text:= '<?xml version="1.0" encoding="utf-8" standalone="yes"?><table><name>PR</name><column><name>物料编码</name><type>String</type></column><column><name>物料名称</name><type>String</type></column><column><name>面板物料标识</name><type>String</type></column><column><name>交货日期</name><type>String</type></column><column><name>PR建议日期</name><type>String</type></column><column><name>交货数量</name><type>Number</type></column><column><name>MRP计算版本号</name><type>String</type></column><column><name>业务类型</name><type>String</type></column><column><name>组织编码</name><type>String</type></column><column><name>是否长周期</name><type>String</type></column><column><name>是否专用料</name><type>String</type></column><column><name>物料计划策略</name><type>String</type></column><column><name>提前期</name><type>Number</type></column><column><name>供应商代码</name><type>String</type></column><column><name>供应商名称</name><type>String</type></column><column><name>收货库存点</name><type>String</type></column><column><name>计量单位</name><type>String</type></column><column><name>PR数据发送状态</name><type>String</type></column><column><name>发送时间</name><type>String</type></column><column><name>发送人</name><type>String</type></column></table>';
    
    sc := DateToString::StandardConverter();
    sc.SetCustomConversion();
    sc.CustomFormatString( 'yyyy-MM-dd' );
    
    xmlDOMImplementation := XMLDOMImplementation::Create();
    xmlDOMDocument := xmlDOMImplementation.CreateDocumentFromString( text );
    
    tableElement:= xmlDOMDocument.GetElementByTagName( "table", 0 );
    
    traverse ( toExportList, Elements, prd ) {
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.ProductID(), "物料编码" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.ProductName(), "物料名称" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.IsPanelMaterial(), "面板物料标识" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, sc.Convert( prd.DeliveryDate() ), "交货日期" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, sc.Convert( prd.PRSuggestionDate() ), "PR建议日期" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, [String]( prd.Quantity().Round( 0 ) ), "交货数量" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.MRPCalverNo(), "MRP计算版本号" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.BusinessType(), "业务类型" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.OrganCode(), "组织编码" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.IsLongLeadItem(), "是否长周期" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.IsGenericMaterial(), "是否专用料" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.MaterialMRPType(), "物料计划策略" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, [String]prd.LeadTime(), "提前期" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.ProviderCode(), "供应商代码" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.ProviderName(), "供应商名称" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.StockingPointID(), "收货库存点" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.UnitOfMeasure(), "计量单位" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.PRReleaseStatus(), "PR数据发送状态" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.CreateTimeString(), "发送时间" );
      PRData::GeneratesTheSpecifiedXMLColumn( xmlDOMDocument, tableElement, prd.CreateBy(), "发送人" );
    }
    
    xmlDOMSerializer := xmlDOMImplementation.CreateSerializer();
    xmlTableString := xmlDOMSerializer.WriteToString( xmlDOMDocument );
    
    tableHandle := TableHandle::ImportXML( BinaryValue::Construct( xmlTableString ) );
    tableGroupHandle := TableGroupHandle::Create( "PR" );
    tableGroupHandle.Add( tableHandle );
    tableBinaryData := XLS::SaveTableGroupToBinaryData( tableGroupHandle, true );
    
    return tableBinaryData.AsBinaryValue();
  *]
}

 _Main/BL/Type_PRData/StaticMethod_GeneratesTheSpecifiedXMLColumn#56.qbl

 _Main/UI/MacroPlannerWebApp/Component_Form633/Component_PanelPRDataButton.def

@@ -41,6 +41,8 @@
  ]
  Properties:
  [
    FixedSize: true
    Orientation: 'horizontal'
    Taborder: 0
  ]
}

 _Main/UI/MacroPlannerWebApp/Component_Form633/Response_DataHolderChecked_OnDataChanged#774.def

ÎļþÒÑɾ³ý

 _Main/UI/MacroPlannerWebApp/Component_Form633/Response_ListPRData_844_OnUserCheckedChanged#613.def

@@ -5,13 +5,12 @@
  #keys: '[414384.0.798051611]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebList_OnUserCheckedChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      info( "checked 0 PRs" );
      DataHolderChecked.Data().Flush();
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_Form633/Response_ListPRData_844_OnUserCheckedChanged.def

@@ -7,13 +7,12 @@
  #keys: '[414384.0.798051163]'
  CanBindMultiple: false
  DefinitionID: 'Responsedef_WebList_OnUserCheckedChanged'
  GroupServerCalls: true
  QuillAction
  {
    Body:
    [*
      info( "checked " + [String]checkeditems.Size() + " PRs" );
      DataHolderChecked.Data( checkeditems.Copy() );
    *]
    GroupServerCalls: false
  }
}

 _Main/UI/MacroPlannerWebApp/Component_Form633/Response_PanelPRDataButton_ButtonExportPR_OnClick.def

@@ -13,7 +13,7 @@
  {
    Body:
    [*
      Application.Download( "PRData.xlsx", PRData::Export( MacroPlan ) );
      Application.Download( "PRData.xlsx", PRData::ExportTheFileStream( DataHolderChecked.Data() ).AsBinaryData() );
    *]
    GroupServerCalls: false
  }

 _Main/UI/MacroPlannerWebApp/Views/PR_DATA.vw

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,204 @@
Quintiq file version 2.0
{
  viewcontents
  {
    forms
    {
      form_FormPRHistoryData
      {
        title: 'QTIANMA_JITUAN::FormPRHistoryData'
        shown: true
        componentID: 'QTIANMA_JITUAN::FormPRHistoryData'
        layout
        {
          mode: 'open'
          rowPosition: 1
          rowSpan: 15
          columnPosition: 5
          columnSpan: 8
        }
        components
        {
          FormPRHistoryData_PanelPRHistoryButton
          {
            sizeRatio: 1
          }
          FormPRHistoryData_ListPRHistoryData
          {
          }
          FormPRHistoryData_DataSetLevelPRHistoryData
          {
            groupDepth: -1
            column_BusinessType
            {
              columnId: 'BusinessType'
              dataPath: 'BusinessType'
              dataType: 'string'
              index: 0
              subtotals: ''
              width: 150
            }
            column_MRPCalverNo
            {
              columnId: 'MRPCalverNo'
              dataPath: 'MRPCalverNo'
              dataType: 'string'
              index: 1
              subtotals: ''
              width: 150
            }
            column_OrganCode
            {
              columnId: 'OrganCode'
              dataPath: 'OrganCode'
              dataType: 'string'
              index: 2
              subtotals: ''
              width: 150
            }
            column_ProductID
            {
              columnId: 'ProductID'
              dataPath: 'ProductID'
              dataType: 'string'
              index: 3
              subtotals: ''
              width: 150
            }
            column_StockingPointID
            {
              columnId: 'StockingPointID'
              dataPath: 'StockingPointID'
              dataType: 'string'
              index: 4
              subtotals: ''
              width: 150
            }
            column_Quantity
            {
              columnId: 'Quantity'
              dataPath: 'Quantity'
              dataType: 'real'
              index: 5
              subtotals: ''
              width: 150
            }
            column_SendStatus
            {
              columnId: 'SendStatus'
              dataPath: 'SendStatus'
              dataType: 'string'
              index: 6
              subtotals: ''
              width: 150
            }
            column_ReleaseBy
            {
              columnId: 'ReleaseBy'
              dataPath: 'ReleaseBy'
              dataType: 'string'
              index: 7
              subtotals: ''
              width: 150
            }
            column_ReceiveStatus
            {
              columnId: 'ReceiveStatus'
              dataPath: 'ReceiveStatus'
              dataType: 'string'
              index: 8
              subtotals: ''
              width: 150
            }
            column_ReceiveError
            {
              columnId: 'ReceiveError'
              dataPath: 'ReceiveError'
              dataType: 'string'
              index: 9
              subtotals: ''
              width: 150
            }
          }
        }
      }
      form_FormPRData
      {
        title: 'QTIANMA_JITUAN::FormPRData'
        shown: true
        componentID: 'QTIANMA_JITUAN::FormPRData'
        layout
        {
          mode: 'open'
          rowPosition: 1
          rowSpan: 15
          columnPosition: 1
          columnSpan: 4
        }
        components
        {
          FormPRData_PanelPRDataButton
          {
            sizeRatio: 1
          }
          FormPRData_ListPRData
          {
          }
          FormPRData_DataSetLevelPRData
          {
            groupDepth: -1
            column_MRPCalverNo
            {
              columnId: 'MRPCalverNo'
              dataPath: 'MRPCalverNo'
              dataType: 'string'
              index: 0
              subtotals: ''
              width: 150
            }
            column_ProductID
            {
              columnId: 'ProductID'
              dataPath: 'ProductID'
              dataType: 'string'
              index: 1
              subtotals: ''
              width: 150
            }
            column_StockingPointID
            {
              columnId: 'StockingPointID'
              dataPath: 'StockingPointID'
              dataType: 'string'
              index: 2
              subtotals: ''
              width: 150
            }
            column_Quantity
            {
              columnId: 'Quantity'
              dataPath: 'Quantity'
              dataType: 'real'
              index: 3
              subtotals: ''
              width: 150
            }
          }
        }
      }
    }
    userconfigurableinformation
    {
    }
    page: 'ActionBarPageData'
    group: ''
    index: 0
    image: 'BEAR'
    description: 'PR申请'
  }
  formatversion: 2
  id: 'PR_DATA'
  name: 'PR_DATA'
  isglobal: false
  isroot: true
}