From 8898c90b6b97446d47642d60f14c47bd7c4877f8 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 12 十月 2023 09:41:23 +0800
Subject: [PATCH] 填产BUG修改
---
_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_RecursiveGeneration.qbl | 2 ++
_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl | 13 +++++++++++++
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def | 2 ++
_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def | 2 +-
_Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl | 2 +-
_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def | 1 +
_Main/BL/Type_GlobalDTOTable/Method_SynchronizationAllMappingBrokerAndAPIByOption.qbl | 10 +++++-----
_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityAllocationResults.qbl | 2 +-
8 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl
new file mode 100644
index 0000000..46856be
--- /dev/null
+++ b/_Main/BL/Type_CapacityAllocationResults/StaticMethod_Test.qbl
@@ -0,0 +1,13 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Test (
+ MacroPlan macroPlan
+)
+{
+ TextBody:
+ [*
+ traverse ( macroPlan, SalesDemand, sd, sd.ProductID() = "Chassis - SUV 1" ) {
+
+ }
+ *]
+}
diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityRules.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityAllocationResults.qbl
similarity index 93%
rename from _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityRules.qbl
rename to _Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityAllocationResults.qbl
index fbdbb4d..494bfc6 100644
--- a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityRules.qbl
+++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_AutomaticallyGenerateCapacityAllocationResults.qbl
@@ -1,6 +1,6 @@
Quintiq file version 2.0
#parent: #root
-StaticMethod AutomaticallyGenerateCapacityRules (
+StaticMethod AutomaticallyGenerateCapacityAllocationResults (
GlobalOTDTable globalOTDTable,
MacroPlan macroPlan
)
diff --git a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_RecursiveGeneration.qbl b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_RecursiveGeneration.qbl
index e6f6dda..1068c7b 100644
--- a/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_RecursiveGeneration.qbl
+++ b/_Main/BL/Type_CapacityAllocationResultsRuleConfiguration/StaticMethod_RecursiveGeneration.qbl
@@ -12,6 +12,7 @@
traverse ( outputPISP, ProcessOutput.AsProcessOutput, pmp ) {
ontype( pmp ) {
+
Operation as o : {
traverse ( o, OperationInput, oi ) {
oiPISP := oi.ProductInStockingPoint_MP();
@@ -29,6 +30,7 @@
}
}
}
+
}
}
diff --git a/_Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl b/_Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl
index c40a89b..8a20d4c 100644
--- a/_Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl
+++ b/_Main/BL/Type_FillingCapacityOrder/StaticMethod_CreateCustomOrder.qbl
@@ -14,7 +14,7 @@
targetCustomerOrder := CustomerOrder::Create( targetProduct_MP,
targetStockingPoint_MP,
OS::GenerateGUIDAsString(),
- fillingCapacityOrder.OrderDate(),
+ fillingCapacityOrder.DemandDate(),
quantity,
0.0,
"Normal",
diff --git a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizationAllMappingBrokerAndAPIByOption.qbl b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizationAllMappingBrokerAndAPIByOption.qbl
index 31f8b7b..8c6686f 100644
--- a/_Main/BL/Type_GlobalDTOTable/Method_SynchronizationAllMappingBrokerAndAPIByOption.qbl
+++ b/_Main/BL/Type_GlobalDTOTable/Method_SynchronizationAllMappingBrokerAndAPIByOption.qbl
@@ -89,31 +89,31 @@
if ( isStockingPoint_MP ) {
this.Global_MappingStockingPoint_MP( relflush );
Global_BrokerExecuteLog::CreateInOperation( this, "StockingPoint_MP", executionUser );
- // this -> Global_MappingStockingPoint_MP::CreateByAPI() -> Exception() -> Global_MappingStockingPoint_MP::OnException( this );
+ this -> Global_MappingStockingPoint_MP::CreateByAPI() -> Exception() -> Global_MappingStockingPoint_MP::OnException( this );
}
if ( isCurrency_MP ) {
this.Global_MappingCurrency_MP( relflush );
Global_BrokerExecuteLog::CreateInOperation( this, "Currency_MP", executionUser );
- // this -> Global_MappingCurrency_MP::CreateByAPI() -> Exception() -> Global_MappingCurrency_MP::OnException( this );
+ this -> Global_MappingCurrency_MP::CreateByAPI() -> Exception() -> Global_MappingCurrency_MP::OnException( this );
}
if ( isCurrencyRate_MP ) {
this.Global_MappingCurrencyRate_MP( relflush );
Global_BrokerExecuteLog::CreateInOperation( this, "CurrencyRate_MP", executionUser );
- // this -> Global_MappingCurrencyRate_MP::CreateByAPI() -> Exception() -> Global_MappingCurrencyRate_MP::OnException( this );
+ this -> Global_MappingCurrencyRate_MP::CreateByAPI() -> Exception() -> Global_MappingCurrencyRate_MP::OnException( this );
}
if ( isLane ) {
this.Global_MappingLane( relflush );
Global_BrokerExecuteLog::CreateInOperation( this, "Lane", executionUser );
- // this -> Global_MappingLane::CreateByAPI() -> Exception() -> Global_MappingLane::OnException( this );
+ this -> Global_MappingLane::CreateByAPI() -> Exception() -> Global_MappingLane::OnException( this );
}
if ( isLaneLeg ) {
this.Global_MappingLaneLeg( relflush );
Global_BrokerExecuteLog::CreateInOperation( this, "LaneLeg", executionUser );
- // this -> Global_MappingLaneLeg::CreateByAPI() -> Exception() -> Global_MappingLaneLeg::OnException( this );
+ this -> Global_MappingLaneLeg::CreateByAPI() -> Exception() -> Global_MappingLaneLeg::OnException( this );
}
*]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
index f2ee867..2d639ef 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Component_pnlContent.def
@@ -277,6 +277,7 @@
BaseType: 'WebEditField'
Properties:
[
+ DataBinding: 'DataHolderFillingCapacityOrder.Data.CustomerID'
Label: 'Customer ID'
Taborder: 12
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
index bf61706..34b2cb2 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogFillingCapacityOrder/Response_pnlActions_btnOk_OnClick.def
@@ -30,6 +30,7 @@
SalesSegmentName := guard( ddlSalesSegment.Data().Name(), "null" ),
StockingPointID := guard( ddlStockingPoint_MP.Data().ID(), "null" ),
Customer := efCustomerName.Text(),
+ CustomerID := efCustomID.Text(),
Quantity := [Real]edtQuantity.Text(),
UnitOfMeasureName := ddlUnitOfMeasure_MP.Data().Name(),
ForecastDemandDate := dsForecastDemandDate.Date(),
@@ -44,6 +45,7 @@
data.SalesSegmentName( guard( ddlSalesSegment.Data().Name(), "null" ) );
data.StockingPointID( guard( ddlStockingPoint_MP.Data().ID(), "null" ) );
data.Customer( efCustomerName.Text() );
+ data.CustomerID( efCustomID.Text() );
data.Quantity( [Real]edtQuantity.Text() );
data.UnitOfMeasureName( ddlUnitOfMeasure_MP.Data().Name() );
data.ForecastDemandDate( dsForecastDemandDate.Date() );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def
index 65bad86..b8a5c2e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormCapacityAllocationResultsRuleConfiguration/Response_PanelImportAndExport_AutomaticallyGenerate_OnClick.def
@@ -10,7 +10,7 @@
{
Body:
[*
- CapacityAllocationResultsRuleConfiguration::AutomaticallyGenerateCapacityRules( GlobalOTDTable, MacroPlan );
+ CapacityAllocationResultsRuleConfiguration::AutomaticallyGenerateCapacityAllocationResults( GlobalOTDTable, MacroPlan );
*]
}
}
--
Gitblit v1.9.3