From 866f26844a9e5d6fbcde9c7c474656b093afad3e Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期四, 02 一月 2025 20:32:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def | 1 +
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl | 6 +++---
_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def | 2 +-
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl | 6 +++---
_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw | 15 ++++++++++++---
_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl | 12 ++++++++++--
_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl | 7 +++++++
_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def | 11 +++++++++++
8 files changed, 48 insertions(+), 12 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
index 5ccc782..ad19bf9 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_GenerateDispatchData.qbl
@@ -194,9 +194,9 @@
product := tempProducts.Element( i );
productionQuantity := product.ProductionQuantity();
- if( line.Tips().LikeUserLocale( "淇濆吇" ) and productionQuantity > 0){
- product.DispatchShiftSchedulingDetail( relnew,ShiftVolume := 0 ,SingleShiftName := "鐧界彮");
- }
+ // if( line.Tips().LikeUserLocale( "淇濆吇" ) and productionQuantity > 0){
+ // product.DispatchShiftSchedulingDetail( relnew,ShiftVolume := 0 ,SingleShiftName := "鐧界彮");
+ // }
if( singleShiftVolume1 > 0 and productionQuantity > 0){
tempProductQuantity := singleShiftVolume1 - productionQuantity;
diff --git a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl
index fff6a04..d0eb8b6 100644
--- a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl
+++ b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Test.qbl
@@ -11,8 +11,8 @@
iid1 := interfaceDataset.InventoryInterfaceData( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports" );
- iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "PXSN", Quantity := 900 );
- iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "LPLE", Quantity := 800 );
- iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "3PLE", Quantity := 3100 );
+ iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "PXSN", Quantity := 900, Dtype := "APS" );
+ iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "LPLE", Quantity := 800, Dtype := "HTTP" );
+ iid1.InventoryInterfaceDataDetail( relnew, Date := Date::Construct( 2020, 1, 28 ), PartNumber := "BLEU EV2 Sports", InventoryPoint := "3PLE", Quantity := 3100, Dtype := "eee" );
*]
}
diff --git a/_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl b/_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl
index 14b07c2..7d916f6 100644
--- a/_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl
+++ b/_Main/BL/Type_InventoryInterfaceDataDetail/_ROOT_Type_InventoryInterfaceDataDetail.qbl
@@ -7,10 +7,18 @@
BaseType: Object
OnCreate:
[*
- ips := select( this, InventoryInterfaceData.InterfaceDataset.InventoryPointSelection, tempIPS, tempIPS.ProductID() = this.PartNumber() and tempIPS.InventoryPoint() = this.InventoryPoint() and this.Fac() = tempIPS.Fac() );
+ ips := select( this, InventoryInterfaceData.InterfaceDataset.InventoryPointSelection, tempIPS,
+ tempIPS.ProductID() = this.PartNumber() and
+ tempIPS.InventoryPoint() = this.InventoryPoint() and
+ this.Fac() = tempIPS.Fac() and
+ this.Dtype() = tempIPS.Dtype() );
if ( isnull( ips ) ) {
- ips := this.InventoryInterfaceData().InterfaceDataset().InventoryPointSelection( relnew, ProductID := this.PartNumber(), InventoryPoint := this.InventoryPoint(), Fac := this.Fac() );
+ ips := this.InventoryInterfaceData().InterfaceDataset().InventoryPointSelection( relnew,
+ ProductID := this.PartNumber(),
+ InventoryPoint := this.InventoryPoint(),
+ Fac := this.Fac(),
+ Dtype := this.Dtype() );
}
this.InventoryPointSelection( relset, ips );
diff --git a/_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl b/_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl
new file mode 100644
index 0000000..6261113
--- /dev/null
+++ b/_Main/BL/Type_InventoryPointSelection/Attribute_Dtype.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Dtype
+{
+ #keys: '3[416456.0.19351383][416456.0.19351382][416456.0.19351384]'
+ ValueType: String
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def b/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def
index 289ed91..5decf6e 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Component_pnlContent.def
@@ -51,6 +51,17 @@
[
DisplayField: 'Name'
Label: 'StockingPoint'
+ Taborder: 3
+ ]
+ }
+ Component eDtype
+ {
+ #keys: '[416456.0.20811940]'
+ BaseType: 'WebEditField'
+ Properties:
+ [
+ Enabled: false
+ Label: 'Dtype'
Taborder: 2
]
}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def b/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def
index 054a5b3..3d21c3c 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_DialogInventoryPointSelection/Method_InventoryPointSelection.def
@@ -11,6 +11,7 @@
efProductID.Text( dhInventoryPointSelection.Data().ProductID() );
efInventoryPoint.Text( dhInventoryPointSelection.Data().InventoryPoint() );
+ eDtype.Text( dhInventoryPointSelection.Data().Dtype() );
spmp := select( MacroPlan, StockingPoint_MP, tempSPMP, tempSPMP.ID() = inventoryPointSelection.StockpoingPoint() );
ddlStockingPoint.Data( spmp );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def
index 0c7ac6a..6cb9c14 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryPointSelection/Component_ListInventoryPointSelection.def
@@ -29,7 +29,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsIncluded","title":"ImgIsIncluded","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsIncluded"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockpoingPoint","title":"StockpoingPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockpoingPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ImgIsIncluded","title":"ImgIsIncluded","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"ImgIsIncluded"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"ProductID","title":"ProductID","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"ProductID"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"StockpoingPoint","title":"StockpoingPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"StockpoingPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Dtype","title":"Dtype","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Dtype"}}]'
ContextMenu: 'listContextMenuInventoryPointSelection'
Taborder: 2
]
diff --git a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
index 1f2c2f7..003f129 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
@@ -181,14 +181,23 @@
dataType: 'string'
index: 2
subtotals: ''
- width: 150
+ width: 114
+ }
+ column_Dtype
+ {
+ columnId: 'Dtype'
+ dataPath: 'Dtype'
+ dataType: 'string'
+ index: 3
+ subtotals: ''
+ width: 81
}
column_StockpoingPoint
{
columnId: 'StockpoingPoint'
dataPath: 'StockpoingPoint'
dataType: 'string'
- index: 3
+ index: 4
subtotals: ''
width: 150
}
@@ -197,7 +206,7 @@
columnId: 'Fac'
dataPath: 'Fac'
dataType: 'string'
- index: 4
+ index: 5
subtotals: ''
width: 89
}
--
Gitblit v1.9.3