From 289f9d09fbe1593c6439dc7be3d38b1eec722df5 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 17 十月 2023 14:46:51 +0800
Subject: [PATCH] 物料标签和工单类型数据集切换
---
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_DeleteIfExistByMatCode#526.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_ListInterfaceTest_MenuCreateShowData_OnClick.def | 1
_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_VerificationData.qbl | 6
_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDSOP_GlobalOTDSOP_MatAttrSett.qbl | 23 +++++
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_SynchronizeInventoryTargets.qbl | 4
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_CreateIfNotExist.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_ListMaterialMaterialLabelingAndPlanningStrategy#880.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormWorkOrderType/Component_ListWorkOrderType.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonMaterialExportAndImport_OnCl.def | 2
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_getExistByMatCode.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Method_NewWorkOrderType.def | 2
_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CheckThePrecedingColumn.qbl | 4
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def | 4
_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Component_listContextMenuInterfaceTest.def | 2
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Response_pnlActions_btnOk_OnClick.def | 6
_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Response_pnlContent_ddlWorkOrderType_OnCreated.def | 4
_Main/BL/Type_GlobalDTOTable/_ROOT_Type_GlobalOTDTable.qbl | 12 ---
_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDSOP_GlobalOTDSOP_WorkOrderType.qbl | 23 +++++
_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_SynchronizeData.qbl | 8 +-
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_update.qbl | 2
_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonSynchronizeInventoryTargets_.def | 2
_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/Method_saveData.qbl | 2
_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning#662.qbl | 2
/dev/null | 23 -----
_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_deleteIfExistByMatCode.qbl | 2
_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/StaticMethod_upload.qbl | 14 +-
_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/StaticMethod_export.qbl | 2
_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CreateOrUpdateData.qbl | 34 ++++----
_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDSOP_GlobalOTDSOP_.qbl | 23 +++++
29 files changed, 128 insertions(+), 93 deletions(-)
diff --git a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDSOP_GlobalOTDSOP_.qbl b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDSOP_GlobalOTDSOP_.qbl
new file mode 100644
index 0000000..e11759e
--- /dev/null
+++ b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDSOP_GlobalOTDSOP_.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation MatAttrSettingAndPlanStrategyInputSource_GlobalOTDSOP_GlobalOTDSOP_MatAttrSettingAndPlanStrategyInputSource
+{
+ #keys: '1[414702.1.128364612]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[414702.1.128364614][414702.1.128364613][414702.1.128364615]'
+ Cardinality: '0to1'
+ ObjectDefinition: MatAttrSettingAndPlanStrategyInputSource
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide MatAttrSettingAndPlanStrategyInputSource
+ {
+ #keys: '3[414702.1.128364617][414702.1.128364616][414702.1.128364618]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDTable_GlobalOTDTa.qbl b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDTable_GlobalOTDTa.qbl
deleted file mode 100644
index 970e5b3..0000000
--- a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategyInputSource_GlobalOTDTable_GlobalOTDTa.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation MatAttrSettingAndPlanStrategyInputSource_GlobalOTDTable_GlobalOTDTable_MatAttrSettingAndPlanStrategyInputSource
-{
- #keys: '1[414384.0.763764705]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[414384.0.763764707][414384.0.763764706][414384.0.763764708]'
- Cardinality: '0to1'
- ObjectDefinition: MatAttrSettingAndPlanStrategyInputSource
- OwningSide: 'Reference'
- }
- RelationSide.RightSide MatAttrSettingAndPlanStrategyInputSource
- {
- #keys: '3[414384.0.763764710][414384.0.763764709][414384.0.763764711]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDSOP_GlobalOTDSOP_MatAttrSett.qbl b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDSOP_GlobalOTDSOP_MatAttrSett.qbl
new file mode 100644
index 0000000..779034c
--- /dev/null
+++ b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDSOP_GlobalOTDSOP_MatAttrSett.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation MatAttrSettingAndPlanStrategy_GlobalOTDSOP_GlobalOTDSOP_MatAttrSettingAndPlanStrategy
+{
+ #keys: '1[414702.1.130145519]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[414702.1.130145521][414702.1.130145520][414702.1.130145522]'
+ Cardinality: '0to1'
+ ObjectDefinition: MatAttrSettingAndPlanStrategy
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide MatAttrSettingAndPlanStrategy
+ {
+ #keys: '3[414702.1.130145524][414702.1.130145523][414702.1.130145525]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDTable_GlobalOTDTable_MatAttr.qbl b/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDTable_GlobalOTDTable_MatAttr.qbl
deleted file mode 100644
index cedbcb8..0000000
--- a/_Main/BL/Relations/Relation_MatAttrSettingAndPlanStrategy_GlobalOTDTable_GlobalOTDTable_MatAttr.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation MatAttrSettingAndPlanStrategy_GlobalOTDTable_GlobalOTDTable_MatAttrSettingAndPlanStrategy
-{
- #keys: '1[414384.0.763764622]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[414384.0.763764624][414384.0.763764623][414384.0.763764625]'
- Cardinality: '0to1'
- ObjectDefinition: MatAttrSettingAndPlanStrategy
- OwningSide: 'Reference'
- }
- RelationSide.RightSide MatAttrSettingAndPlanStrategy
- {
- #keys: '3[414384.0.763764627][414384.0.763764626][414384.0.763764628]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDSOP_GlobalOTDSOP_WorkOrderType.qbl b/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDSOP_GlobalOTDSOP_WorkOrderType.qbl
new file mode 100644
index 0000000..52848ab
--- /dev/null
+++ b/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDSOP_GlobalOTDSOP_WorkOrderType.qbl
@@ -0,0 +1,23 @@
+Quintiq file version 2.0
+#parent: #root
+Relation WorkOrderType_GlobalOTDSOP_GlobalOTDSOP_WorkOrderType
+{
+ #keys: '1[414702.1.128394598]'
+ DefaultRelationStrategy
+ {
+ }
+ RelationSide.LeftSide GlobalOTDSOP
+ {
+ #keys: '3[414702.1.128394600][414702.1.128394599][414702.1.128394601]'
+ Cardinality: '0to1'
+ ObjectDefinition: WorkOrderType
+ OwningSide: 'Reference'
+ }
+ RelationSide.RightSide WorkOrderType
+ {
+ #keys: '3[414702.1.128394603][414702.1.128394602][414702.1.128394604]'
+ Cardinality: '1toN'
+ ObjectDefinition: GlobalOTDSOP
+ OwningSide: 'Owned'
+ }
+}
diff --git a/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDTable_GlobalOTDTable_WorkOrderType.qbl b/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDTable_GlobalOTDTable_WorkOrderType.qbl
deleted file mode 100644
index 2a94ff2..0000000
--- a/_Main/BL/Relations/Relation_WorkOrderType_GlobalOTDTable_GlobalOTDTable_WorkOrderType.qbl
+++ /dev/null
@@ -1,23 +0,0 @@
-Quintiq file version 2.0
-#parent: #root
-Relation WorkOrderType_GlobalOTDTable_GlobalOTDTable_WorkOrderType
-{
- #keys: '1[414702.0.144781477]'
- DefaultRelationStrategy
- {
- }
- RelationSide.LeftSide GlobalOTDTable
- {
- #keys: '3[414702.0.144781479][414702.0.144781478][414702.0.144781480]'
- Cardinality: '0to1'
- ObjectDefinition: WorkOrderType
- OwningSide: 'Reference'
- }
- RelationSide.RightSide WorkOrderType
- {
- #keys: '3[414702.0.144781482][414702.0.144781481][414702.0.144781483]'
- Cardinality: '1toN'
- ObjectDefinition: GlobalOTDTable
- OwningSide: 'Owned'
- }
-}
diff --git a/_Main/BL/Type_GlobalDTOTable/_ROOT_Type_GlobalOTDTable.qbl b/_Main/BL/Type_GlobalDTOTable/_ROOT_Type_GlobalOTDTable.qbl
index c3d49d2..0518307 100644
--- a/_Main/BL/Type_GlobalDTOTable/_ROOT_Type_GlobalOTDTable.qbl
+++ b/_Main/BL/Type_GlobalDTOTable/_ROOT_Type_GlobalOTDTable.qbl
@@ -5,17 +5,5 @@
{
#keys: '5[414702.0.83354588][414702.0.83354586][0.0.0][414702.0.83354587][414702.0.83354589]'
BaseType: Object
- OnCreate:
- [*
- this.BusinessType( relnew, BusinessTypeName := "鎵嬫満浜嬩笟閮∣LED" );
- this.BusinessType( relnew, BusinessTypeName := "涓撲笟鏄剧ず浜嬩笟閮�" );
- this.BusinessType( relnew, BusinessTypeName := "澶栧崠CELLOLED" );
- this.BusinessType( relnew, BusinessTypeName := "鎵嬫満浜嬩笟閮�" );
- this.BusinessType( relnew, BusinessTypeName := "姹借溅鐢靛瓙浜嬩笟閮�" );
- this.BusinessType( relnew, BusinessTypeName := "鐗圭鏄剧ず" );
- this.BusinessType( relnew, BusinessTypeName := "杩愬姩鍋ュ悍浜嬩笟閮�" );
- this.BusinessType( relnew, BusinessTypeName := "杞﹁浇鏄剧ず浜嬩笟閮�" );
- this.BusinessType( relnew, BusinessTypeName := "IT浜嬩笟閮�" );
- *]
StructuredName: 'GlobalOTDTables'
}
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CheckThePrecedingColumn.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CheckThePrecedingColumn.qbl
index 915e044..e35b41e 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CheckThePrecedingColumn.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CheckThePrecedingColumn.qbl
@@ -1,14 +1,14 @@
Quintiq file version 2.0
#parent: #root
Method CheckThePrecedingColumn (
- GlobalOTDTable globalOTDTable
+ GlobalOTDSOP globalOTDSOP
)
{
TextBody:
[*
traverse ( this, MatAttrSettingAndPlanStrategyDataRow, masapsdr ) {
itemCode := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "鐗╂枡缂栫爜" );
- targetMatAttrSettingAndPlanStrategy := select( globalOTDTable, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.MatCode() = itemCode.value() );
+ targetMatAttrSettingAndPlanStrategy := select( globalOTDSOP, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.MatCode() = itemCode.value() );
if ( not isnull( targetMatAttrSettingAndPlanStrategy ) ) {
businessType := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "涓氬姟绫诲瀷" ).value();
nameOfMaterial := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "鐗╂枡鍚嶇О" ).value();
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CreateOrUpdateData.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CreateOrUpdateData.qbl
index 15d22df..63c3fb3 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CreateOrUpdateData.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_CreateOrUpdateData.qbl
@@ -1,14 +1,14 @@
Quintiq file version 2.0
#parent: #root
Method CreateOrUpdateData (
- GlobalOTDTable globalOTDTable
+ GlobalOTDSOP globalOTDSOP
)
{
TextBody:
[*
traverse ( this, MatAttrSettingAndPlanStrategyDataRow, masapsdr ) {
itemCode := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "鐗╂枡缂栫爜" );
- targetMatAttrSettingAndPlanStrategy := select( globalOTDTable, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.MatCode() = itemCode.value() );
+ targetMatAttrSettingAndPlanStrategy := select( globalOTDSOP, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.MatCode() = itemCode.value() );
if ( not isnull( targetMatAttrSettingAndPlanStrategy ) ) {
minimumNumberOfDaysInStock := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "搴撳瓨鏈�灏忓ぉ鏁�" ).value();
maximumNumberOfDaysInInventory := select( masapsdr, MatAttrSettingAndPlanStrategyDataCell, tempMASAPSDC, tempMASAPSDC.MatAttrSettingAndPlanStrategyDataColumn().name() = "搴撳瓨鏈�澶уぉ鏁�" ).value();
@@ -122,24 +122,24 @@
}
}
try {
- matAttrSettingAndPlanStrategy := globalOTDTable.MatAttrSettingAndPlanStrategy( relnew,
- BusinessType := businessType,
- MatCode := createItemCode,
- MatName := nameOfMaterial,
- MatType := itemClassification,
- MatArrivalLT := [Number]LTTimeDays,
- // ProductCount := [Number]numberOfFinishedSKUs,
- // MinProdDeliverLT := [Number]finishedProductDeliveryMinLTDays,
- FlagLongTerm := longAndShortCycleLabels,
- FlagGeneric := genericSpecialLabels,
- // PlanningStrategyAuto := automaticMaterialPlanningPolicies,
- PlanningStrategyCustom := usersManuallySchedulePolicies,
- MinimumNumberOfDaysInStock := [Number]minimumNumberOfDaysInStock,
- MaximumNumberOfDaysInInventory := [Number]maximumNumberOfDaysInInventory
+ matAttrSettingAndPlanStrategy := globalOTDSOP.MatAttrSettingAndPlanStrategy( relnew,
+ BusinessType := businessType,
+ MatCode := createItemCode,
+ MatName := nameOfMaterial,
+ MatType := itemClassification,
+ MatArrivalLT := [Number]LTTimeDays,
+ // ProductCount := [Number]numberOfFinishedSKUs,
+ // MinProdDeliverLT := [Number]finishedProductDeliveryMinLTDays,
+ FlagLongTerm := longAndShortCycleLabels,
+ FlagGeneric := genericSpecialLabels,
+ // PlanningStrategyAuto := automaticMaterialPlanningPolicies,
+ PlanningStrategyCustom := usersManuallySchedulePolicies,
+ MinimumNumberOfDaysInStock := [Number]minimumNumberOfDaysInStock,
+ MaximumNumberOfDaysInInventory := [Number]maximumNumberOfDaysInInventory
);
matAttrSettingAndPlanStrategy.UpdateBy( QuintiqUser::CurrentUser().Username() );
matAttrSettingAndPlanStrategy.UpdateTime( DateTime::ActualTime() );
- matAttrSettingAndPlanStrategy.SerialNumber( maxselect( globalOTDTable, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.SerialNumber() ).SerialNumber() + 1 );
+ matAttrSettingAndPlanStrategy.SerialNumber( maxselect( globalOTDSOP, MatAttrSettingAndPlanStrategy, tempMASAPS, tempMASAPS.SerialNumber() ).SerialNumber() + 1 );
} onerror {
error( "搴撳瓨鏈�灏忓ぉ鏁版垨搴撳瓨鏈�澶уぉ鏁板繀椤讳负鏁存暟锛�", targetMatAttrSettingAndPlanStrategy.MatCode() );
}
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_SynchronizeData.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_SynchronizeData.qbl
index 624f54f..7c8ffbd 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_SynchronizeData.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_SynchronizeData.qbl
@@ -6,12 +6,12 @@
[*
this.VerifyThatTheItemCodeIsNotDuplicated();
- globalOTDTable := this.MatAttrSettingAndPlanStrategyInputSource().GlobalOTDTable();
+ globalOTDSOP := this.MatAttrSettingAndPlanStrategyInputSource().GlobalOTDSOP();
- this.CheckThePrecedingColumn( globalOTDTable );
+ this.CheckThePrecedingColumn( globalOTDSOP );
- this.CreateOrUpdateData( globalOTDTable );
+ this.CreateOrUpdateData( globalOTDSOP );
- this.VerificationData( globalOTDTable );
+ this.VerificationData( globalOTDSOP );
*]
}
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_VerificationData.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_VerificationData.qbl
index d09c337..5660ce5 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_VerificationData.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/Method_VerificationData.qbl
@@ -1,13 +1,13 @@
Quintiq file version 2.0
#parent: #root
Method VerificationData (
- GlobalOTDTable globalOTDTable
+ GlobalOTDSOP globalOTDSOP
)
{
TextBody:
[*
- info( "绛栫暐涓暟锛�", globalOTDTable.MatAttrSettingAndPlanStrategy( relsize ) );
- traverse ( globalOTDTable, MatAttrSettingAndPlanStrategy, masaps ) {
+ info( "绛栫暐涓暟锛�", globalOTDSOP.MatAttrSettingAndPlanStrategy( relsize ) );
+ traverse ( globalOTDSOP, MatAttrSettingAndPlanStrategy, masaps ) {
if ( masaps.PlanningStrategyCustom() <> "瀹夊叏搴撳瓨" and masaps.PlanningStrategyCustom() <> "JIT" and masaps.PlanningStrategyCustom() <> "M/A" and
masaps.PlanningStrategyCustom() <> "PO鎷夋枡" and masaps.PlanningStrategyCustom() <> "VMI" ) {
error( "鎵嬪姩璁剧疆绛栫暐閿欒锛�", masaps.MatCode() );
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/StaticMethod_export.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/StaticMethod_export.qbl
index 126e66e..e82f437 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/StaticMethod_export.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyDataTable/StaticMethod_export.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Export (
- GlobalOTDTable parent
+ GlobalOTDSOP parent
) as String
{
TextBody:
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/Method_saveData.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/Method_saveData.qbl
index 362f5dd..d7457d8 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/Method_saveData.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/Method_saveData.qbl
@@ -8,7 +8,7 @@
if( this.MatAttrSettingAndPlanStrategyDataTable( relsize ) > 0 ) {
traverse( this, MatAttrSettingAndPlanStrategyDataTable, table ) {
traverse( table, MatAttrSettingAndPlanStrategyDataRow, row ) {
- MatAttrSettingAndPlanStrategy::Update( this.GlobalOTDTable(), row, this.UserName() );
+ MatAttrSettingAndPlanStrategy::Update( this.GlobalOTDSOP(), row, this.UserName() );
}
}
}
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/StaticMethod_upload.qbl b/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/StaticMethod_upload.qbl
index 16be5bb..eec0641 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/StaticMethod_upload.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanStrategyInputSource/StaticMethod_upload.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Upload (
- GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP,
String filePath,
String base64Str,
String userName
@@ -9,15 +9,15 @@
{
TextBody:
[*
- globalOTDTable.MatAttrSettingAndPlanStrategyInputSource( relflush );
+ globalOTDSOP.MatAttrSettingAndPlanStrategyInputSource( relflush );
fileName := filePath.Tokenize( "\" ).Element( filePath.Tokenize( "\" ).Size() - 1 );
- inputSource := globalOTDTable.MatAttrSettingAndPlanStrategyInputSource( relnew,
- FileName := fileName,
- Base64Str := base64Str,
- IsXlsx := fileName.EndsWith( "xlsx" ),
- UserName := userName );
+ inputSource := globalOTDSOP.MatAttrSettingAndPlanStrategyInputSource( relnew,
+ FileName := fileName,
+ Base64Str := base64Str,
+ IsXlsx := fileName.EndsWith( "xlsx" ),
+ UserName := userName );
return inputSource;
*]
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_CreateIfNotExist.qbl b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_CreateIfNotExist.qbl
index 8e647b2..b318635 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_CreateIfNotExist.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_CreateIfNotExist.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod CreateIfNotExist (
- GlobalOTDTable parent,
+ GlobalOTDSOP parent,
Number serialNumber,
String businessType,
String matCode,
diff --git "a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_DeleteIfExistByMatCode\043526.qbl" "b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_DeleteIfExistByMatCode\043526.qbl"
index 7d84d24..8154540 100644
--- "a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_DeleteIfExistByMatCode\043526.qbl"
+++ "b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_DeleteIfExistByMatCode\043526.qbl"
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod DeleteIfExistByMatCode (
- GlobalOTDTable parent,
+ GlobalOTDSOP parent,
Strings matCode
)
{
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_SynchronizeInventoryTargets.qbl b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_SynchronizeInventoryTargets.qbl
index 17e144a..b11c677 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_SynchronizeInventoryTargets.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_SynchronizeInventoryTargets.qbl
@@ -1,13 +1,13 @@
Quintiq file version 2.0
#parent: #root
StaticMethod SynchronizeInventoryTargets (
- GlobalOTDTable globalOTDTable,
+ GlobalOTDSOP globalOTDSOP,
MacroPlan macroPlan
)
{
TextBody:
[*
- traverse ( globalOTDTable, MatAttrSettingAndPlanStrategy, masaps ) {
+ traverse ( globalOTDSOP, MatAttrSettingAndPlanStrategy, masaps ) {
hasMaxLevel := masaps.MaximumNumberOfDaysInInventory() <> 0;
product_MP := select( macroPlan, Product_MP, tempPMP, tempPMP.ID() = masaps.MatCode() );
if ( not isnull( product_MP ) ) {
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_deleteIfExistByMatCode.qbl b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_deleteIfExistByMatCode.qbl
index 4cd01e5..2820401 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_deleteIfExistByMatCode.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_deleteIfExistByMatCode.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod DeleteIfExistByMatCode (
- GlobalOTDTable parent,
+ GlobalOTDSOP parent,
String matCode
)
{
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_getExistByMatCode.qbl b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_getExistByMatCode.qbl
index c0e174e..4a714e6 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_getExistByMatCode.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_getExistByMatCode.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod GetExistByMatCode (
- GlobalOTDTable parent,
+ GlobalOTDSOP parent,
String matCode
) as MatAttrSettingAndPlanStrategy
{
diff --git a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_update.qbl b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_update.qbl
index 44ea303..9a8e30e 100644
--- a/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_update.qbl
+++ b/_Main/BL/Type_MatAttrSettingAndPlanningStrategy/StaticMethod_update.qbl
@@ -1,7 +1,7 @@
Quintiq file version 2.0
#parent: #root
StaticMethod Update (
- GlobalOTDTable parent,
+ GlobalOTDSOP parent,
MatAttrSettingAndPlanStrategyDataRow excelRow,
String userName
) as MatAttrSettingAndPlanStrategy
diff --git "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl" "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
index 1b30f35..8bdc755 100644
--- "a/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
+++ "b/_Main/BL/Type_PRData/StaticMethod_FromSupplyPlanning\043662.qbl"
@@ -22,7 +22,7 @@
mappingOperation := Global_MappingOperation::GetByProductId( otdTable, product.ID() );
// QID15
mappingProviderCapacity := Global_MappingProviderCapacity::GetByProductId( otdTable, product.ID() );
- matAttrSetting := MatAttrSettingAndPlanStrategy::GetExistByMatCode( otdTable, product.ID() );
+ matAttrSetting := null( MatAttrSettingAndPlanStrategy )/*MatAttrSettingAndPlanStrategy::GetExistByMatCode( otdTable, product.ID() )*/;
// 鏍规嵁pispip
result.MRPCalverNo( ifexpr( pispip.MRPCalverNo() = "", "鏆傛棤", pispip.MRPCalverNo() ) );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def
index 3a0d33a..92b9bf4 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Component_pnlContent.def
@@ -77,8 +77,8 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'GlobalOTDTable'
- Source: 'GlobalOTDTable'
+ DataType: 'GlobalOTDSOP'
+ Source: 'GlobalOTDSOP'
Taborder: 0
Transformation: 'WorkOrderType'
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Response_pnlContent_ddlWorkOrderType_OnCreated.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Response_pnlContent_ddlWorkOrderType_OnCreated.def
index 6e33df9..56b4b00 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Response_pnlContent_ddlWorkOrderType_OnCreated.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditIssueWorkOrder/Response_pnlContent_ddlWorkOrderType_OnCreated.def
@@ -10,11 +10,11 @@
Body:
[*
if ( not isnull( DataHolderDialogData.Data() ) ) {
- targetWorkOrderType := select( GlobalOTDTable, WorkOrderType, tempWOT, tempWOT.TypeName() = DataHolderDialogData.Data().WorkOrderType() );
+ targetWorkOrderType := select( GlobalOTDSOP, WorkOrderType, tempWOT, tempWOT.TypeName() = DataHolderDialogData.Data().WorkOrderType() );
if ( not isnull( targetWorkOrderType ) ) {
this.Data( targetWorkOrderType );
} else {
- this.Data( select( GlobalOTDTable, WorkOrderType, tempWOT, true ) );
+ this.Data( select( GlobalOTDSOP, WorkOrderType, tempWOT, true ) );
}
}
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Method_NewWorkOrderType.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Method_NewWorkOrderType.def
index d805656..043ce0c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Method_NewWorkOrderType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Method_NewWorkOrderType.def
@@ -7,7 +7,7 @@
#keys: '[414702.0.145493830]'
Body:
[*
- workOrderType := GlobalOTDTable.WorkOrderType( relshadow );
+ workOrderType := GlobalOTDSOP.WorkOrderType( relshadow );
DataHolderForm.Data( formWorkOrderType );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Response_pnlActions_btnOk_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Response_pnlActions_btnOk_OnClick.def
index e5f4159..2dd7136 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Response_pnlActions_btnOk_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogCreateEditWorkOrderType/Response_pnlActions_btnOk_OnClick.def
@@ -12,8 +12,8 @@
id := efID.Text();
typeName := efTypeName.Text();
- idExists := exists( GlobalOTDTable, WorkOrderType, tempWOT, tempWOT.ID() = id and tempWOT.ID() <> data.ID() );
- typeNameExists := exists( GlobalOTDTable, WorkOrderType, tempWOT, tempWOT.TypeName() = typeName and tempWOT.TypeName() <> data.TypeName() );
+ idExists := exists( GlobalOTDSOP, WorkOrderType, tempWOT, tempWOT.ID() = id and tempWOT.ID() <> data.ID() );
+ typeNameExists := exists( GlobalOTDSOP, WorkOrderType, tempWOT, tempWOT.TypeName() = typeName and tempWOT.TypeName() <> data.TypeName() );
if ( idExists or typeNameExists ) {
feedback := "ID鎴栫被鍨嬪悕绉伴噸澶�";
@@ -35,7 +35,7 @@
data := DataHolderDialogData.Data();
workOrderType := data.WrappedInstance();
if ( isnull( workOrderType ) ) {
- GlobalOTDTable.WorkOrderType( relnew, ID := data.ID(), TypeName := data.TypeName() );
+ GlobalOTDSOP.WorkOrderType( relnew, ID := data.ID(), TypeName := data.TypeName() );
} else {
workOrderType.ID( data.ID() );
workOrderType.TypeName( data.TypeName() );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Component_listContextMenuInterfaceTest.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Component_listContextMenuInterfaceTest.def
index c678ea7..7c9f529 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Component_listContextMenuInterfaceTest.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Component_listContextMenuInterfaceTest.def
@@ -13,7 +13,7 @@
[
Image: 'VIEW'
Taborder: 3
- Title: '鏄剧ず鏁版嵁'
+ Title: '娴嬭瘯'
]
}
Component MenuDelete
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_ListInterfaceTest_MenuCreateShowData_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_ListInterfaceTest_MenuCreateShowData_OnClick.def
index fbb23d2..7cee00d 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_ListInterfaceTest_MenuCreateShowData_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInterfaceTest/Response_ListInterfaceTest_MenuCreateShowData_OnClick.def
@@ -27,6 +27,7 @@
//GlobalOTDTable.Global_ShowCell( relflush );
//
//Global_ShowCell::ShowData( GlobalOTDTable, selection );
+ WebMessageBox::Information( "姝ゆ寜閽敤浜庢祴璇�", true );
*]
GroupServerCalls: false
}
diff --git "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_ListMaterialMaterialLabelingAndPlanningStrategy\043880.def" "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_ListMaterialMaterialLabelingAndPlanningStrategy\043880.def"
index 698efbd..ffc07fd 100644
--- "a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_ListMaterialMaterialLabelingAndPlanningStrategy\043880.def"
+++ "b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Component_ListMaterialMaterialLabelingAndPlanningStrategy\043880.def"
@@ -11,8 +11,8 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'GlobalOTDTable'
- Source: 'GlobalOTDTable'
+ DataType: 'GlobalOTDSOP'
+ Source: 'GlobalOTDSOP'
Taborder: 0
Transformation: 'MatAttrSettingAndPlanStrategy'
]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonMaterialExportAndImport_OnCl.def b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonMaterialExportAndImport_OnCl.def
index ce5035b..96e0a34 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonMaterialExportAndImport_OnCl.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonMaterialExportAndImport_OnCl.def
@@ -22,7 +22,7 @@
fileName := uploadJson.Get( "name" ).GetString();
base64String := uploadJson.Get( "data" ).GetString();
- matAttrSettingAndPlanStrategyInputSource := MatAttrSettingAndPlanStrategyInputSource::Upload( GlobalOTDTable, fileName, base64String, ApplicationMacroPlanner.GetUserName() );
+ matAttrSettingAndPlanStrategyInputSource := MatAttrSettingAndPlanStrategyInputSource::Upload( GlobalOTDSOP, fileName, base64String, ApplicationMacroPlanner.GetUserName() );
matAttrSettingAndPlanStrategyInputSource.ParseTable();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonSynchronizeInventoryTargets_.def b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonSynchronizeInventoryTargets_.def
index 5b1c51b..b71e7e5 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonSynchronizeInventoryTargets_.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormMaterialLabelingAndPlanningStrategy/Response_PanelMaterialExportAndImport_136_ButtonSynchronizeInventoryTargets_.def
@@ -19,7 +19,7 @@
{
Body:
[*
- MatAttrSettingAndPlanStrategy::SynchronizeInventoryTargets( GlobalOTDTable, MacroPlan );
+ MatAttrSettingAndPlanStrategy::SynchronizeInventoryTargets( GlobalOTDSOP, MacroPlan );
WebMessageBox::Success( "搴撳瓨鐩爣鍚屾鎴愬姛", true );
*]
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormWorkOrderType/Component_ListWorkOrderType.def b/_Main/UI/MacroPlannerWebApp/Component_FormWorkOrderType/Component_ListWorkOrderType.def
index 033d744..0f9fe81 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormWorkOrderType/Component_ListWorkOrderType.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormWorkOrderType/Component_ListWorkOrderType.def
@@ -11,8 +11,8 @@
BaseType: 'WebDataExtractor'
Properties:
[
- DataType: 'GlobalOTDTable'
- Source: 'GlobalOTDTable'
+ DataType: 'GlobalOTDSOP'
+ Source: 'GlobalOTDSOP'
Taborder: 0
Transformation: 'WorkOrderType'
]
--
Gitblit v1.9.3