Merge branch 'dev' into dev_yy

yanweiyuan3

2023-10-17 face55e7f35130d29d7f395a4b4501d57b97ef81

 _Main/BL/Type_CapacityAllocationResults/StaticMethod_CreateDate1.qbl

@@ -2,7 +2,7 @@
#parent: #root
StaticMethod CreateDate1 (
  MacroPlan macroPlan,
  GlobalOTDTable globalOTDTable,
  GlobalOTDSOP globalOTDSOP,
  DependentDemand dependentDemand,
  NewSupply newSupply,
  Supply_MP firstNewSupply,
@@ -18,25 +18,25 @@
    
    if ( capacityAllocationResultsRuleConfiguration.PanelMaterialCode() = productID ) {
      info( "找到了！！！" );
      globalOTDTable.CapacityAllocationResults( relnew,
                                                PanelBase             := panelPISP.StockingPointID(),
                                                PanelMaterialCode     := panelPISP.ProductID(),
                                                NumberOfPanels        := fulfillmentQuantity,
                                                PanelMeasurementUnit  := panelPISP.UnitOfMeasure_MP().Name(),
                                                ModuleMaterialCode    := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().ProductID(),
                                                NumberOfModules       := firstNewSupply.Quantity(),
                                                ModuleMeasurementUnit := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().UnitOfMeasureName(),
                                                ModuleBase            := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().StockingPointID(),
                                                RequirementDate       := dependentDemand.Start().Date(),
                                                // 导出外部供应字段
                                                Date                  := dependentDemand.Start().Date(),
                                                Description           := "",
                                                ID                    := OS::GenerateGUIDAsString(),
                                                ProductID             := panelPISP.ProductID(),
                                                StockingPointID       := panelPISP.StockingPointID(),
                                                UserQuantity          := fulfillmentQuantity,
                                                ManufacturedDate      := Date::MinDate()
                                               );
      globalOTDSOP.CapacityAllocationResults( relnew,
                                              PanelBase             := panelPISP.StockingPointID(),
                                              PanelMaterialCode     := panelPISP.ProductID(),
                                              NumberOfPanels        := fulfillmentQuantity,
                                              PanelMeasurementUnit  := panelPISP.UnitOfMeasure_MP().Name(),
                                              ModuleMaterialCode    := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().ProductID(),
                                              NumberOfModules       := firstNewSupply.Quantity(),
                                              ModuleMeasurementUnit := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().UnitOfMeasureName(),
                                              ModuleBase            := firstNewSupply.ProductInStockingPointInPeriodPlanning().ProductInStockingPoint_MP().StockingPointID(),
                                              RequirementDate       := dependentDemand.Start().Date(),
                                              // 导出外部供应字段
                                              Date                  := dependentDemand.Start().Date(),
                                              Description           := "",
                                              ID                    := OS::GenerateGUIDAsString(),
                                              ProductID             := panelPISP.ProductID(),
                                              StockingPointID       := panelPISP.StockingPointID(),
                                              UserQuantity          := fulfillmentQuantity,
                                              ManufacturedDate      := Date::MinDate()
                                             );
    }
  *]
}