From a6115291ba078f85d5e6ddc0bed9e9f8eb4cd817 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期一, 17 六月 2024 14:35:21 +0800
Subject: [PATCH] 热试比例设置名称有误
---
/dev/null | 16 --------
_Main/BL/Type_UnitPeriodQuantity/Function_CalcMaxCapacityPerTimeUnit.qbl | 2
_Main/BL/Type_StockingPoint_MP/_ROOT_Type_StockingPoint_MP.qbl | 6 +++
_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl | 60 ++++++++++++++++++++++++++++++
_Main/BL/Type_Unit/StaticMethod_GetThermalTrial.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def | 10 -----
6 files changed, 68 insertions(+), 28 deletions(-)
diff --git a/_Main/BL/Type_Routing/StaticMethod_Test.qbl b/_Main/BL/Type_Routing/StaticMethod_Test.qbl
deleted file mode 100644
index 12b6165..0000000
--- a/_Main/BL/Type_Routing/StaticMethod_Test.qbl
+++ /dev/null
@@ -1,29 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-StaticMethod Test (
- MacroPlan macroplan
-)
-{
- TextBody:
- [*
- // 鐢勫叞楦� Jun-13-2024 (created)
- traverse( macroplan, Unit, unit, unit.HasCapacityTypeQuantity() and unit.Operation( relsize ) < 2 ){
- info( '----------------------', unit.ID(), unit.MinCapacity(), unit.MaxCapacity(), unit.Operation( relsize ), unit.UnitPeriod( relsize ) );
- traverse( unit, UnitPeriod.astype( UnitPeriodQuantity ), upq, upq.Period_MP().TimeUnit() = Translations::MP_GlobalParameters_Day() and upq.Period_MP().Start().Year() = 2020 and upq.Period_MP().Start().Month() = 4 and upq.Period_MP().Start().Day() = 1 ){
- info( upq.MaxCapacityPerTimeUnit(), upq.MinCapacityPerTimeUnit(), upq.TotalAvailableCapacity(),upq.HasUnitCapacity(), upq.End() );
- if( upq.HasUnitCapacity() ){
- uc := upq.UnitCapacity();
- info( uc.MaxCapacity(), uc.MinCapacity(), uc.Start(), uc.TimeUnit() );
- }
- }
- // traverse( unit, Operation, operation ){
- //// info( '----------------------', operation.OperationBOM( relsize ), operation.OperationOutput( relsize ), operation.OperationInput( relsize ) );
- // traverse( operation, OperationBOM, obom ){
- // info( '----------------------', obom.OperationID(), '-------------', obom.ProductID(), '-------------', obom.StockingPointID() );
- // info( '----------------------', obom.Quantity(), obom.OutputQuantity(), obom.InputQuantity() );
- // info( '----------------------', obom.OperationLinkEdge().OperationOutput().Quantity() );
- // }
- // }
- }
- *]
-}
diff --git a/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl b/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl
new file mode 100644
index 0000000..28cea4d
--- /dev/null
+++ b/_Main/BL/Type_StockingPoint_MP/StaticMethod_FindCreateUpdate.qbl
@@ -0,0 +1,60 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod FindCreateUpdate (
+ MacroPlan owner,
+ String spid,
+ Unit sourceunit,
+ Routing routing,
+ Boolean isfromdb
+) #extension
+{
+ TextBody:
+ [*
+ stockingpoint := owner.FindStockingPoint( spid );
+ parentunit := guard( owner.FindUnit( sourceunit.ParentUnitID() ), null( Unit ) );
+ if( sourceunit.Name().FindString( Unit::GetThermalTrial(), 0 ) >= 0 ){
+ parentunit := sourceunit;
+ }
+ uom := guard( owner.FindUnitOfMeasure( sourceunit.UnitOfMeasureName() ), null( UnitOfMeasure_MP ) );
+ currency := guard( owner.FindCurrency( sourceunit.CurrencyID() ), null( Currency_MP ) );
+
+ if( isnull( stockingpoint ) )
+ {
+ stockingpoint := StockingPoint_MP::Create( spid,
+ owner,
+ parentunit,
+ spid,
+ '', //iconname
+ uom,
+ currency,
+ routing.AllowWIPInventory(),
+ sourceunit.StartDate(),
+ sourceunit.EndDate(),
+ null( Group ),
+ '', //giscountrycode
+ '', //giscity
+ '', //gispostalcode,
+ '',
+ isfromdb );
+ }
+ else
+ {
+ stockingpoint.Update( parentunit,
+ spid,
+ spid,
+ uom,
+ currency,
+ stockingpoint.IconName(),
+ routing.AllowWIPInventory(),
+ sourceunit.StartDate(),
+ sourceunit.EndDate(),
+ stockingpoint.Group(),
+ stockingpoint.GISCountryCode(),
+ stockingpoint.GISCity(),
+ stockingpoint.GISPostalCode(),
+ stockingpoint.Notes(),
+ isfromdb );
+ }
+ return stockingpoint
+ *]
+}
diff --git a/_Main/BL/Type_StockingPoint_MP/_ROOT_Type_StockingPoint_MP.qbl b/_Main/BL/Type_StockingPoint_MP/_ROOT_Type_StockingPoint_MP.qbl
new file mode 100644
index 0000000..98f0942
--- /dev/null
+++ b/_Main/BL/Type_StockingPoint_MP/_ROOT_Type_StockingPoint_MP.qbl
@@ -0,0 +1,6 @@
+Quintiq file version 2.0
+#root
+#parent: #DomainModel
+TypeSpecialization StockingPoint_MP #extension
+{
+}
diff --git a/_Main/BL/Type_Unit/StaticMethod_GetThermalTrial.qbl b/_Main/BL/Type_Unit/StaticMethod_GetThermalTrial.qbl
index 2776c17..86c6133 100644
--- a/_Main/BL/Type_Unit/StaticMethod_GetThermalTrial.qbl
+++ b/_Main/BL/Type_Unit/StaticMethod_GetThermalTrial.qbl
@@ -5,6 +5,6 @@
TextBody:
[*
// 鐢勫叞楦� Jun-14-2024 (created)
- return '鐑紡';
+ return '鐑瘯';
*]
}
diff --git a/_Main/BL/Type_UnitPeriodQuantity/Function_CalcMaxCapacityPerTimeUnit.qbl b/_Main/BL/Type_UnitPeriodQuantity/Function_CalcMaxCapacityPerTimeUnit.qbl
index 8e83a4d..26f12e4 100644
--- a/_Main/BL/Type_UnitPeriodQuantity/Function_CalcMaxCapacityPerTimeUnit.qbl
+++ b/_Main/BL/Type_UnitPeriodQuantity/Function_CalcMaxCapacityPerTimeUnit.qbl
@@ -7,7 +7,7 @@
value := ifexpr( this.HasUnitCapacity(), this.UnitCapacity().MaxCapacity(), this.MacroPlan().GlobalParameters_MP().DefaultMaxCapacityPerDayForUnit() );
if( this.Unit().Name().FindString( Unit::GetThermalTrial(), 0 ) >= 0 ){
- value := ifexpr( this.HasUnitCapacity() and this.Unit().Name().FindString( '鍓嶆壒閲忕儹寮�', 0 ) >= 0 and this.UnitCapacity().Start() = this.Start(), this.UnitCapacity().MaxCapacity(), this.MacroPlan().GlobalParameters_MP().DefaultMaxCapacityPerDayForUnit() );
+ value := ifexpr( this.HasUnitCapacity() and this.Unit().Name().FindString( '鍓嶆壒閲忕儹璇�', 0 ) >= 0 and this.UnitCapacity().Start() = this.Start(), this.UnitCapacity().MaxCapacity(), this.MacroPlan().GlobalParameters_MP().DefaultMaxCapacityPerDayForUnit() );
}
this.MaxCapacityPerTimeUnit( value );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
index e941fc9..edcc552 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Component_listContextMenuRoutings.def
@@ -35,15 +35,5 @@
Title: '璁剧疆浜у搧鐖潯宸ヨ壓璺嚎'
]
}
- Component MenuTest
- {
- #keys: '[415136.0.789811702]'
- BaseType: 'WebMenu'
- Properties:
- [
- Taborder: 14
- Title: 'Test'
- ]
- }
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_listContextMenuRoutings_MenuTest_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_listContextMenuRoutings_MenuTest_OnClick.def
deleted file mode 100644
index f616d0b..0000000
--- a/_Main/UI/MacroPlannerWebApp/Component_FormRoutings/Response_MacroPlanner_listContextMenuRoutings_MenuTest_OnClick.def
+++ /dev/null
@@ -1,16 +0,0 @@
-Quintiq file version 2.0
-#parent: listContextMenuRoutings/MenuTest
-Response OnClick () id:Response_MacroPlanner_listContextMenuRoutings_MenuTest_OnClick
-{
- #keys: '[415136.0.789811732]'
- CanBindMultiple: false
- DefinitionID: 'Responsedef_WebMenu_OnClick'
- QuillAction
- {
- Body:
- [*
- Routing::Test( MacroPlan );
- *]
- GroupServerCalls: false
- }
-}
--
Gitblit v1.9.3