From 3c1d2f30791126fd586d31eeed57de809766353c Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期四, 02 一月 2025 19:39:50 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev
---
_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl | 15 ++++++++-------
_Main/BL/Type_InventoryInterfaceDataDetail/Attribute_Dtype.qbl | 7 +++++++
_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceDataDetail/Component_ListInventoryInterfaceDataDetail.def | 2 +-
_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw | 9 +++++++++
_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory#575.qbl | 3 ++-
5 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl
index 6f4953b..8943020 100644
--- a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl
+++ b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_Generate.qbl
@@ -8,24 +8,25 @@
String inventory,
String fac,
Number quantitiy
-)
+) as InventoryInterfaceDataDetail
{
TextBody:
[*
// 鐢勫叞楦� Jul-26-2024 (created)
- iid := selectobject( interfaceDataset, InventoryInterfaceData, iid, iid.Date() = date and iid.PartNumber() = partno );
+ iid := selectobject( interfaceDataset, InventoryInterfaceData, iid, iid.Date() = date and iid.PartNumber() = partno );
if( isnull( iid ) ){
- iid := interfaceDataset.InventoryInterfaceData( relnew, Date := date, PartNumber := partno );
+ iid := interfaceDataset.InventoryInterfaceData( relnew, Date := date, PartNumber := partno );
}
- product := selectobject( macroplan, Product_MP, product, product.ID() = partno );
+ product := selectobject( macroplan, Product_MP, product, product.ID() = partno );
if( not isnull( product ) and exists( product.GetAllParent(), Elements, proparent, proparent.ID() = 'PL' ) ){
quantitiy := floor( [Real]quantitiy / 4 );
}
- iidl := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac );
+ iidl := selectobject( iid, InventoryInterfaceDataDetail, detail, detail.InventoryPoint() = inventory and detail.Fac() = fac );
if( isnull( iidl ) ){
- iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy );
+ iidl := iid.InventoryInterfaceDataDetail( relnew, Date := date, PartNumber := partno, InventoryPoint := inventory, Fac := fac, Quantity := quantitiy );
}else{
- iidl.Quantity( );
+ iidl.Quantity( quantitiy );
}
+ return iidl;
*]
}
diff --git "a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory\043575.qbl" "b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory\043575.qbl"
index 4f320fb..4f09d88 100644
--- "a/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory\043575.qbl"
+++ "b/_Main/BL/Type_InventoryInterfaceData/StaticMethod_SynchronizeInventory\043575.qbl"
@@ -17,7 +17,8 @@
// 鑾峰彇鎸囧畾鏃ユ湡搴撳瓨鎺ュ彛鏁版嵁
//鍙戝姩鏈烘垚鍝佸簱瀛�
traverse( inventorys, Elements, inventory ){
- InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
+ iidl := InventoryInterfaceData::Generate( macroplan, owner, inventory.DDay(), inventory.FourCode(), inventory.BIPlace(), inventory.Fac(), [Number]inventory.Total() );
+ iidl.Dtype( inventory.DType() );
}
*]
}
diff --git a/_Main/BL/Type_InventoryInterfaceDataDetail/Attribute_Dtype.qbl b/_Main/BL/Type_InventoryInterfaceDataDetail/Attribute_Dtype.qbl
new file mode 100644
index 0000000..aaeeba3
--- /dev/null
+++ b/_Main/BL/Type_InventoryInterfaceDataDetail/Attribute_Dtype.qbl
@@ -0,0 +1,7 @@
+Quintiq file version 2.0
+#parent: #root
+Attribute Dtype
+{
+ #keys: '3[416456.0.15341312][416456.0.15341311][416456.0.15341313]'
+ ValueType: String
+}
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceDataDetail/Component_ListInventoryInterfaceDataDetail.def b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceDataDetail/Component_ListInventoryInterfaceDataDetail.def
index 8423d6e..69bad60 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceDataDetail/Component_ListInventoryInterfaceDataDetail.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormInventoryInterfaceDataDetail/Component_ListInventoryInterfaceDataDetail.def
@@ -29,7 +29,7 @@
]
Properties:
[
- Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Date","title":"Date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Date"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PartNumber","title":"PartNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PartNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}}]'
+ Columns: '[{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Date","title":"Date","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Date"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"PartNumber","title":"PartNumber","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"PartNumber"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"InventoryPoint","title":"InventoryPoint","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"InventoryPoint"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Fac","title":"Fac","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Fac"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Quantity","title":"Quantity","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Quantity"}},{"attribute":{"classtype":"WebApiDefinitionAttributeDataMember","columnid":"Dtype","title":"Dtype","subtotals":"","tooltip":"","width":-1,"display":"shown","editable":false,"attribute":"Dtype"}}]'
ContextMenu: 'listContextMenuInventoryInterfaceDataDetail'
Taborder: 2
]
diff --git a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
index 31cd226..1f2c2f7 100644
--- a/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
+++ b/_Main/UI/MacroPlannerWebApp/Views/InvnetoryUpdate.vw
@@ -71,6 +71,15 @@
subtotals: ''
width: 155
}
+ column_Dtype
+ {
+ columnId: 'Dtype'
+ dataPath: 'Dtype'
+ dataType: 'string'
+ index: 5
+ subtotals: ''
+ width: 150
+ }
}
}
}
--
Gitblit v1.9.3