From 9d90792ed4bc8a55a3daa4cdd24ef4154b3aa807 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 22 十一月 2024 18:08:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev-zlg
---
_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl | 2 +-
_Main/UI/MacroPlannerWebApp/Component_FormTRCForecast/Component_pHeader.def | 1 +
_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
index fc1beab..6e3196f 100644
--- a/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
+++ b/_Main/BL/Type_Archive/StaticMethod_GenerateForecast.qbl
@@ -63,7 +63,7 @@
if ( not isnull( targetProduct_MP ) and not isnull( targetStockingPoint_MP ) ) {
forcest := Forecast::Create( targetProduct_MP,
targetStockingPoint_MP,
- [String]tdd.ID(),
+ IDHolder::GetGUID(),
tdd.StartDate(),
tdd.EndDate(),
tdd.Quantity(),
diff --git a/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl b/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
index 201e2a1..9a139d3 100644
--- a/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/Method_GenerateArchiveData.qbl
@@ -35,7 +35,7 @@
InventoryPlanArchiveVersion::GenerateData( macroplan, this );
}
if( istrcdemand ){//TRC闇�姹�
- // CustomerDemandIDS::GenerateData( this, recyclebin, archive );
+ InterfaceTRCForecast::ArchivedData( this, macroplan );
}
if( istransferplan ){//璋冩嫧璁″垝
ArchiveTransferPlanCell::Archive( macroplan,archive );
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormTRCForecast/Component_pHeader.def b/_Main/UI/MacroPlannerWebApp/Component_FormTRCForecast/Component_pHeader.def
index 82c332f..39aff07 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormTRCForecast/Component_pHeader.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormTRCForecast/Component_pHeader.def
@@ -14,6 +14,7 @@
Image: 'DOCUMENT_ZIP'
Label: '瀛樻。'
Taborder: 0
+ Visible: false
]
}
]
--
Gitblit v1.9.3