From b33c4015a8ab6438f584e06ff69938c5ff1e8c78 Mon Sep 17 00:00:00 2001
From: lihongji <3117313295@qq.com>
Date: 星期四, 28 十一月 2024 20:02:37 +0800
Subject: [PATCH] 接口优化
---
_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl | 4 ++--
_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl | 6 ++++--
_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl | 6 ++++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
index 7b8a0a8..159fa01 100644
--- a/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/Method_PublishPlanReportData.qbl
@@ -25,7 +25,7 @@
// CustomerDemandPPAIDS::GenerateData( this, macroplan, iscustomdemandcc, iscustomdemanddl, executor );
}
if ( isofflineplandl or isofflineplancc ) { // 鍚勪骇绾夸笅绾胯鍒�
- InterfaceDataset::PushOfflinePlanData( macroplan, this, executor );
+ InterfaceDataset::PushOfflinePlanData( macroplan, this, executor, isofflineplandl, isofflineplancc );
}
if( isshiftplandl or isshiftplancc ){//鐝璁″垝
DispatchShiftPlan::Dispatch(this, archive,executor );
@@ -35,7 +35,7 @@
AssemblyOnlinePlanPPPSPush::GenerateData( this, macroplan, isassembleonlineplancc, isassembleonlineplandl, executor );
}
if ( isinventoryplandl or isinventoryplancc ) { // 璁″垝搴撳瓨鏁版嵁
- InterfaceDataset::PushPlanInventoryData( macroplan, this, executor );
+ InterfaceDataset::PushPlanInventoryData( macroplan, this, executor, isinventoryplandl, isinventoryplancc );
}
*]
}
diff --git a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl
index 72ccf58..7673189 100644
--- a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushOfflinePlanData.qbl
@@ -3,7 +3,9 @@
StaticMethod PushOfflinePlanData (
const MacroPlan macroPlan,
InterfaceDataset interfaceDataset,
- String executor
+ String executor,
+ Boolean isofflineplandl,
+ Boolean isofflineplancc
)
{
Description: '鍙戦�佷笅绾胯鍒掓暟鎹帴鍙�'
@@ -16,7 +18,7 @@
jsonarray := JSON::Array();
- traverse ( table, Row, r ){
+ traverse ( table, Row, r, ifexpr( isofflineplandl, r.Unit().Regex( "DL" ), false ) or ifexpr( isofflineplancc, r.Unit().Regex( "CC" ), false ) ){
traverse ( table, Column, c ) {//, c.TimeUnit() = Translations::MP_GlobalParameters_Day()
cell := select( r, Cell, tempC, tempC.Column() = c );
diff --git a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl
index 604f0e4..663fa44 100644
--- a/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl
+++ b/_Main/BL/Type_InterfaceDataset/StaticMethod_PushPlanInventoryData.qbl
@@ -3,7 +3,9 @@
StaticMethod PushPlanInventoryData (
const MacroPlan macroPlan,
InterfaceDataset interfaceDataset,
- String executor
+ String executor,
+ Boolean isinventoryplandl,
+ Boolean isinventoryplancc
)
{
Description: '鍙戦�佽鍒掑簱瀛樻暟鎹帴鍙�'
@@ -16,7 +18,7 @@
jsonarray := JSON::Array();
- traverse ( table, Row, r ){
+ traverse ( table, Row, r, ifexpr( isinventoryplandl, r.Unit().Regex( "DL" ), false ) or ifexpr( isinventoryplancc, r.Unit().Regex( "CC" ), false ) ){
traverse ( table, Column, c ) {//, c.TimeUnit() = Translations::MP_GlobalParameters_Day()
cell := select( r, Cell, tempC, tempC.Column() = c );
--
Gitblit v1.9.3